Merge pull request #48388 from nextcloud/backport/48359/stable30

[stable30] fix: Use placeholder for external storage password
nextcloud · Sep 26, 2024 · 84d060f · 84d060f
2 parents 673d85b + 9668f48
commit 84d060f
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/apps/files_external/lib/Lib/Auth/Password/GlobalAuth.php b/apps/files_external/lib/Lib/Auth/Password/GlobalAuth.php
@@ -19,6 +19,7 @@
  */
 class GlobalAuth extends AuthMechanism {
 	public const CREDENTIALS_IDENTIFIER = 'password::global';
+	private const PWD_PLACEHOLDER = '************************';
 
 	/** @var ICredentialsManager */
 	protected $credentialsManager;
@@ -41,11 +42,18 @@ public function getAuth($uid) {
 				'password' => ''
 			];
 		} else {
+			$auth['password'] = self::PWD_PLACEHOLDER;
 			return $auth;
 		}
 	}
 
 	public function saveAuth($uid, $user, $password) {
+		// Use old password if it has not changed.
+		if ($password === self::PWD_PLACEHOLDER) {
+			$auth = $this->credentialsManager->retrieve($uid, self::CREDENTIALS_IDENTIFIER);
+			$password = $auth['password'];
+		}
+
 		$this->credentialsManager->store($uid, self::CREDENTIALS_IDENTIFIER, [
 			'user' => $user,
 			'password' => $password