Merge pull request #365 from nextcloud/backport/363/stable23

[stable23] Shuffle before validating
nextcloud · Jun 30, 2022 · 74665d5 · 74665d5
2 parents 0bfb0a2 + 87dfe5e
commit 74665d5
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/Generator.php b/lib/Generator.php
@@ -85,6 +85,9 @@ public function generate(): string {
 
 			$password .= $chars = $this->random->generate($length, $chars);
 
+			// Shuffle string so the order is random
+			$password = str_shuffle($password);
+
 			try {
 				$this->validator->validate($password);
 
@@ -108,9 +111,6 @@ public function generate(): string {
 			throw new HintException('Could not generate a valid password');
 		}
 
-		// Shuffle string so the order is random
-		$password = str_shuffle($password);
-
 		return $password;
 	}
 }