wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #19624 from nextcloud/backport/19549/stable18

Browse source 
[stable18] remove noise from detectUuid and cache results
This commit is contained in:
Roeland Jago Douma 2020-02-28 09:43:46 +01:00 committed by GitHub
commit 86fa14694a
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

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