Merge pull request #32690 from owncloud/fix-previousexception-withset…

…password-stable10 [stable10] Backport of Fix the token exception classes to avoid infin…
owncloud · Sep 13, 2018 · ecb918c · ecb918c
2 parents 84c3764 + 58f0790
commit ecb918c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/lib/public/InvalidUserTokenException.php b/lib/public/InvalidUserTokenException.php
@@ -28,14 +28,15 @@
  * @since 10.0.10
  */
 class InvalidUserTokenException extends UserTokenException {
+
 	/**
 	 * InvalidUserTokenException constructor.
 	 *
 	 * @param string $message
 	 * @param int $code
 	 * @since 10.0.10
 	 */
-	public function __construct($message = "", $code = 0) {
-		parent::__construct($message, $code, $this);
+	public function __construct($message = "", $code = 0, \Exception $previous = null) {
+		parent::__construct($message, $code, $previous);
 	}
 }
diff --git a/lib/public/UserTokenExpiredException.php b/lib/public/UserTokenExpiredException.php
@@ -28,14 +28,17 @@
  * @since 10.0.10
  */
 class UserTokenExpiredException extends UserTokenException {
+	/** @var UserTokenExpiredException */
+	private $previousException;
+
 	/**
 	 * UserTokenExpiredException constructor.
 	 *
 	 * @param string $message
 	 * @param int $code
 	 * @since 10.0.10
 	 */
-	public function __construct($message = "", $code = 0) {
-		parent::__construct($message, $code, $this);
+	public function __construct($message = "", $code = 0, \Exception $previous = null) {
+		parent::__construct($message, $code, $previous);
 	}
 }
diff --git a/lib/public/UserTokenMismatchException.php b/lib/public/UserTokenMismatchException.php
@@ -35,7 +35,7 @@ class UserTokenMismatchException extends UserTokenException {
 	 * @param int $code
 	 * @since 10.0.10
 	 */
-	public function __construct($message = "", $code = 0) {
-		parent::__construct($message, $code, $this);
+	public function __construct($message = "", $code = 0, \Exception $previous = null) {
+		parent::__construct($message, $code, $previous);
 	}
 }
diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php
@@ -522,7 +522,7 @@ public function setPasswordForm($token, $userId) {
 		try {
 			$this->checkPasswordSetToken($token, $userId);
 		} catch (UserTokenException $e) {
-			if ($e->getPrevious() instanceof UserTokenExpiredException) {
+			if ($e instanceof UserTokenExpiredException) {
 				return new TemplateResponse(
 					'settings', 'resendtokenbymail',
 					[