]> source.dussan.org Git - nextcloud-server.git/commitdiff
[LDAP] throw exception only against prov api
authorArthur Schiwon <blizzz@arthur-schiwon.de>
Tue, 18 Oct 2022 21:26:16 +0000 (23:26 +0200)
committerCôme Chilliet <come.chilliet@nextcloud.com>
Mon, 24 Oct 2022 08:06:39 +0000 (10:06 +0200)
- unbreaks functionality for end users when on demand mapping takes
  place

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
apps/user_ldap/lib/Mapping/UserMapping.php

index df39f00f58b6660c5b0898df11fdb207495ab56d..ade9c67213a5fdb73bb6fa02cc267ee725b2c60b 100644 (file)
@@ -24,6 +24,8 @@ namespace OCA\User_LDAP\Mapping;
 
 use OCP\HintException;
 use OCP\IDBConnection;
+use OCP\IRequest;
+use OCP\Server;
 use OCP\Support\Subscription\IAssertion;
 
 /**
@@ -34,6 +36,7 @@ use OCP\Support\Subscription\IAssertion;
 class UserMapping extends AbstractMapping {
 
        private IAssertion $assertion;
+       protected const PROV_API_REGEX = '/\/ocs\/v[1-9].php\/cloud\/(groups|users)/';
 
        public function __construct(IDBConnection $dbc, IAssertion $assertion) {
                $this->assertion = $assertion;
@@ -44,7 +47,23 @@ class UserMapping extends AbstractMapping {
         * @throws HintException
         */
        public function map($fdn, $name, $uuid): bool {
-               $this->assertion->createUserIsLegit();
+               try {
+                       $this->assertion->createUserIsLegit();
+               } catch (HintException $e) {
+                       static $isProvisioningApi = null;
+
+                       if ($isProvisioningApi === null) {
+                               $request = Server::get(IRequest::class);
+                               $isProvisioningApi = \preg_match(self::PROV_API_REGEX, $request->getRequestUri()) === 1;
+                       }
+                       if ($isProvisioningApi) {
+                               // only throw when prov API is being used, since functionality
+                               // should not break for end users (e.g. when sharing).
+                               // On direct API usage, e.g. on users page, this is desired.
+                               throw $e;
+                       }
+                       return false;
+               }
                return parent::map($fdn, $name, $uuid);
        }