fix isLdapDeletedUser calls with null user

Signed-off-by: Julien Veyssier <[email protected]>
nextcloud · Dec 8, 2023 · 679c111 · 679c111
1 parent 5111947
commit 679c111
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/lib/Controller/LoginController.php b/lib/Controller/LoginController.php
@@ -489,7 +489,7 @@ public function code(string $state = '', string $code = '', string $scope = '',
 		$this->ldapService->syncUser($userId);
 		// when auto provision is disabled, we assume the user has been created by another user backend (or manually)
 		$userFromOtherBackend = $this->userManager->get($userId);
-		if ($this->ldapService->isLdapDeletedUser($userFromOtherBackend)) {
+		if ($userFromOtherBackend !== null && $this->ldapService->isLdapDeletedUser($userFromOtherBackend)) {
 			$userFromOtherBackend = null;
 		}
 

diff --git a/lib/Service/ProvisioningService.php b/lib/Service/ProvisioningService.php
@@ -10,8 +10,6 @@
 use OCP\ILogger;
 use OCP\IUser;
 use OCP\IUserManager;
-use Psr\Container\ContainerExceptionInterface;
-use Psr\Container\NotFoundExceptionInterface;
 use OCP\User\Events\UserChangedEvent;
 
 class ProvisioningService {

diff --git a/lib/User/Backend.php b/lib/User/Backend.php
@@ -268,7 +268,7 @@ public function getCurrentUserId(): string {
 								$this->ldapService->syncUser($tokenUserId);
 							}
 							$userFromOtherBackend = $this->userManager->get($tokenUserId);
-							if ($this->ldapService->isLdapDeletedUser($userFromOtherBackend)) {
+							if ($userFromOtherBackend !== null && $this->ldapService->isLdapDeletedUser($userFromOtherBackend)) {
 								$userFromOtherBackend = null;
 							}
 
@@ -314,7 +314,7 @@ public function getCurrentUserId(): string {
 							}
 
 							$user = $this->userManager->get($tokenUserId);
-							if ($this->ldapService->isLdapDeletedUser($user)) {
+							if ($user === null || $this->ldapService->isLdapDeletedUser($user)) {
 								return '';
 							}
 							$this->checkFirstLogin($tokenUserId);