Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d19071ed authored by Ronak Patel's avatar Ronak Patel
Browse files

Verification Token patch to add expiry date as arugment

parent 6c0069fc
Loading
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -211,6 +211,8 @@ RUN patch -u ${BASE_DIR}/lib/private/User/Manager.php -i ${TMP_PATCH_DIR}/025-op
RUN patch -u ${BASE_DIR}/apps/dav/lib/Connector/Sabre/Principal.php -i ${TMP_PATCH_DIR}/027-displayname-user-leak-dav.patch
RUN patch -u ${BASE_DIR}/apps/dav/lib/HookManager.php -i ${TMP_PATCH_DIR}/028-default-task-calendar.patch
RUN patch -u ${BASE_DIR}/apps/provisioning_api/lib/Controller/UsersController.php -i ${TMP_PATCH_DIR}/029-restrict-user-to-change-primary-email.patch
RUN patch -u ${BASE_DIR}/lib/public/Security/VerificationToken/IVerificationToken.php -i ${TMP_PATCH_DIR}/033-verification-token-public.patch
RUN patch -u ${BASE_DIR}/lib/private/Security/VerificationToken/VerificationToken.php -i ${TMP_PATCH_DIR}/034-verification-token-private.patch
RUN rm -rf ${TMP_PATCH_DIR}

RUN curl -fsSL -o ldap_write_support.tar.gz \
+11 −0
Original line number Diff line number Diff line
--- lib/public/Security/VerificationToken/IVerificationToken.php	2023-05-17 00:32:43
+++ lib/public/Security/VerificationToken/IVerificationToken-new.php	2023-12-10 22:14:17
@@ -51,7 +51,7 @@
 	/**
 	 * @since 23.0.0
 	 */
-	public function create(IUser $user, string $subject, string $passwordPrefix = ''): string;
+	public function create(IUser $user, string $subject, string $passwordPrefix = '', string $expiryToken = ''): string;
 
 	/**
 	 * Deletes the token identified by the provided parameters
+20 −0
Original line number Diff line number Diff line
--- lib/private/Security/VerificationToken/VerificationToken.php	2023-12-10 23:05:06
+++ lib/private/Security/VerificationToken/VerificationToken-new.php	2023-12-10 23:11:32
@@ -107,7 +107,7 @@
 		}
 	}
 
-	public function create(IUser $user, string $subject, string $passwordPrefix = ''): string {
+	public function create(IUser $user, string $subject, string $passwordPrefix = '', string $expiryToken = ''): string {
 		$token = $this->secureRandom->generate(
 			21,
 			ISecureRandom::CHAR_DIGITS.
@@ -121,7 +121,7 @@
 			'userId' => $user->getUID(),
 			'subject' => $subject,
 			'pp' => $passwordPrefix,
-			'notBefore' => $this->timeFactory->getTime() + self::TOKEN_LIFETIME * 2, // multiply to provide a grace period
+			'notBefore' => ($expiryToken !== '') ? $expiryToken : $this->timeFactory->getTime() + self::TOKEN_LIFETIME * 2, // multiply to provide a grace period
 		]);
 		$this->jobList->add(CleanUpJob::class, $jobArgs);