upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 08:44:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

[LDAP] throw exception only against prov api

Browse source 
- unbreaks functionality for end users when on demand mapping takes
  place

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
Arthur Schiwon 2022-10-18 23:26:16 +02:00 committed by backportbot-nextcloud[bot]
parent 0fd9d8b132
commit 6a3f2ff022
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
apps/user_ldap/lib/Mapping/UserMapping.php
View 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);
}