From 4fd1b09a600a90d37d8f0e6d7721e2a09b38f429 Mon Sep 17 00:00:00 2001 From: Tobias Assmann Date: Fri, 9 Jul 2021 09:35:12 +0200 Subject: [PATCH 1/2] draft to prevent the invalidation of pw based authn tokens on a pw less login Signed-off-by: Tobias Assmann --- .../Authentication/Listeners/UserLoggedInListener.php | 5 +++++ lib/private/Authentication/Token/PublicKeyTokenProvider.php | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/lib/private/Authentication/Listeners/UserLoggedInListener.php b/lib/private/Authentication/Listeners/UserLoggedInListener.php index 711a759fad40b..d0ad8e2e838f7 100644 --- a/lib/private/Authentication/Listeners/UserLoggedInListener.php +++ b/lib/private/Authentication/Listeners/UserLoggedInListener.php @@ -49,6 +49,11 @@ public function handle(Event $event): void { return; } + // prevent setting an empty pw as result of pw-less-login + if ($event->getPassword()==='') { + return; + } + // If this is already a token login there is nothing to do if ($event->isTokenLogin()) { return; diff --git a/lib/private/Authentication/Token/PublicKeyTokenProvider.php b/lib/private/Authentication/Token/PublicKeyTokenProvider.php index a293d2a840424..222e5cba099e4 100644 --- a/lib/private/Authentication/Token/PublicKeyTokenProvider.php +++ b/lib/private/Authentication/Token/PublicKeyTokenProvider.php @@ -414,6 +414,11 @@ public function markPasswordInvalid(IToken $token, string $tokenId) { public function updatePasswords(string $uid, string $password) { $this->cache->clear(); + // prevent setting an empty pw as result of pw-less-login + if ($password==='') { + return; + } + // Update the password for all tokens $tokens = $this->mapper->getTokenByUser($uid); foreach ($tokens as $t) { From 4a174617eb822af73b556f9330f557986c1422a7 Mon Sep 17 00:00:00 2001 From: Tobias Assmann Date: Fri, 16 Jul 2021 13:33:29 +0200 Subject: [PATCH 2/2] add spaces around operators Signed-off-by: Tobias Assmann --- lib/private/Authentication/Listeners/UserLoggedInListener.php | 2 +- lib/private/Authentication/Token/PublicKeyTokenProvider.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/private/Authentication/Listeners/UserLoggedInListener.php b/lib/private/Authentication/Listeners/UserLoggedInListener.php index d0ad8e2e838f7..15d3449427676 100644 --- a/lib/private/Authentication/Listeners/UserLoggedInListener.php +++ b/lib/private/Authentication/Listeners/UserLoggedInListener.php @@ -50,7 +50,7 @@ public function handle(Event $event): void { } // prevent setting an empty pw as result of pw-less-login - if ($event->getPassword()==='') { + if ($event->getPassword() === '') { return; } diff --git a/lib/private/Authentication/Token/PublicKeyTokenProvider.php b/lib/private/Authentication/Token/PublicKeyTokenProvider.php index 222e5cba099e4..4657a8027679c 100644 --- a/lib/private/Authentication/Token/PublicKeyTokenProvider.php +++ b/lib/private/Authentication/Token/PublicKeyTokenProvider.php @@ -415,7 +415,7 @@ public function updatePasswords(string $uid, string $password) { $this->cache->clear(); // prevent setting an empty pw as result of pw-less-login - if ($password==='') { + if ($password === '') { return; }