mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #19626 from nextcloud/backport/19549/stable16 

[stable16] remove noise from detectUuid and cache results
This commit is contained in:
blizzz 2020-02-25 23:21:02 +01:00 committed by GitHub
parent 22a4e780bc 3200eedc4c
commit 8a0800fa6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
apps/user_ldap/lib/Access.php
View File

@ -1676,13 +1676,19 @@ class Access extends LDAPUtility {
$uuidOverride = $this->connection->ldapExpertUUIDGroupAttr;
}
if(($this->connection->$uuidAttr !== 'auto') && !$force) {
return true;
}
if(!$force) {
if($this->connection->$uuidAttr !== 'auto') {
return true;
} else if (is_string($uuidOverride) && trim($uuidOverride) !== '') {
$this->connection->$uuidAttr = $uuidOverride;
return true;
}
if (is_string($uuidOverride) && trim($uuidOverride) !== '' && !$force) {
$this->connection->$uuidAttr = $uuidOverride;
return true;
$attribute = $this->connection->getFromCache($uuidAttr);
if(!$attribute === null) {
$this->connection->$uuidAttr = $attribute;
return true;
}
}
foreach(self::UUID_ATTRIBUTES as $attribute) {
@ -1691,27 +1697,29 @@ class Access extends LDAPUtility {
if(isset($ldapRecord[$attribute])) {
$this->connection->$uuidAttr = $attribute;
return true;
} else {
continue;
}
continue;
}
$value = $this->readAttribute($dn, $attribute);
if(is_array($value) && isset($value[0]) && !empty($value[0])) {
\OCP\Util::writeLog(
'user_ldap',
'Setting '.$attribute.' as '.$uuidAttr,
ILogger::DEBUG
\OC::$server->getLogger()->debug(
'Setting {attribute} as {subject}',
[
'app' => 'user_ldap',
'attribute' => $attribute,
'subject' => $uuidAttr
]
);
$this->connection->$uuidAttr = $attribute;
$this->connection->writeToCache($uuidAttr, $attribute);
return true;
} elseif ($value === false) {
// record not available
return false;
}
}
\OCP\Util::writeLog(
'user_ldap',
'Could not autodetect the UUID attribute',
ILogger::ERROR
);
\OC::$server->getLogger()->debug('Could not autodetect the UUID attribute', ['app' => 'user_ldap']);
return false;
}