sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7796 from nextcloud/ldap-sync-fixes 

LDAP Sync fixes: revert recursion resolution, fixed handling of pagingsize of 0
pull/7764/head
Morris Jobke 2018-01-11 17:22:00 +07:00 committed by GitHub
parent 33b82f34be f84ec92563
commit 9898ec95c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/user_ldap/lib/Access.php
Unescape Escape View File

@ -52,6 +52,7 @@ use OCA\User_LDAP\Mapping\AbstractMapping;
use OC\ServerNotAvailableException;
use OCP\IConfig;
use OCP\Util;
/**
* Class Access
@ -1913,11 +1914,8 @@ class Access extends LDAPUtility implements IUserTools {
// no cookie known from a potential previous search. We need
// to start from 0 to come to the desired page. cookie value
// of '0' is valid, because 389ds
$reOffset = 0;
while($reOffset < $offset) {
$this->search($filter, array($base), $attr, $limit, $reOffset, true);
$reOffset += $limit;
}
$reOffset = ($offset - $limit) < 0 ? 0 : $offset - $limit;
$this->search($filter, array($base), $attr, $limit, $reOffset, true);
$cookie = $this->getPagedResultCookie($base, $filter, $limit, $offset);
//still no cookie? obviously, the server does not like us. Let's skip paging efforts.
// '0' is valid, because 389ds
@ -1937,9 +1935,8 @@ class Access extends LDAPUtility implements IUserTools {
}
\OCP\Util::writeLog('user_ldap', 'Ready for a paged search', \OCP\Util::DEBUG);
} else {
\OCP\Util::writeLog('user_ldap',
'No paged search for us, Cpt., Limit '.$limit.' Offset '.$offset,
\OCP\Util::INFO);
$e = new \Exception('No paged search possible, Limit '.$limit.' Offset '.$offset);
\OC::$server->getLogger()->logException($e, ['level' => Util::DEBUG]);
}
}

6
apps/user_ldap/lib/Jobs/Sync.php
Unescape Escape View File

@ -176,10 +176,10 @@ class Sync extends TimedJob {
true
);
if($connection->ldapPagingSize === 0) {
return true;
if((int)$connection->ldapPagingSize === 0) {
return false;
}
return count($results) >= $connection->ldapPagingSize;
return count($results) >= (int)$connection->ldapPagingSize;
}
/**

4
apps/user_ldap/tests/Jobs/SyncTest.php
Unescape Escape View File

@ -158,7 +158,9 @@ class SyncTest extends TestCase {
return [
[ 3, 3, true ],
[ 3, 5, true ],
[ 3, 2, false]
[ 3, 2, false],
[ 0, 4, false],
[ null, 4, false]
];
}