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 #10527 from owncloud/fix-10526 

properly cancel a Paginated Results operation in order to avoid protocol...
remotes/origin/fix-10825
blizzz 2014-10-09 12:40:13 +07:00
parent 0474a20ab9 6c502e11f8
commit cc717c27d6
2 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
apps/user_ldap/lib/access.php
Unescape Escape View File

@ -36,8 +36,16 @@ class Access extends LDAPUtility implements user\IUserTools {
//never ever check this var directly, always use getPagedSearchResultState
protected $pagedSearchedSuccessful;
/**
* @var string[] $cookies an array of returned Paged Result cookies
*/
protected $cookies = array();
/**
* @var string $lastCookie the last cookie returned from a Paged Results
* operation, defaults to an empty string
*/
protected $lastCookie = '';
public function __construct(Connection $connection, ILDAPWrapper $ldap,
user\Manager $userManager) {
@ -84,7 +92,12 @@ class Access extends LDAPUtility implements user\IUserTools {
\OCP\Util::writeLog('user_ldap', 'LDAP resource not available.', \OCP\Util::DEBUG);
return false;
}
//all or nothing! otherwise we get in trouble with.
//Cancel possibly running Paged Results operation, otherwise we run in
//LDAP protocol errors
$this->abandonPagedSearch();
// openLDAP requires that we init a new Paged Search. Not needed by AD,
// but does not hurt either.
$this->initPagedSearch($filter, array($dn), array($attr), 1, 0);
$dn = $this->DNasBaseParameter($dn);
$rr = @$this->ldap->read($cr, $dn, $filter, array($attr));
if(!$this->ldap->isResource($rr)) {
@ -805,9 +818,6 @@ class Access extends LDAPUtility implements user\IUserTools {
$linkResources = array_pad(array(), count($base), $cr);
$sr = $this->ldap->search($linkResources, $base, $filter, $attr);
$error = $this->ldap->errno($cr);
if ($pagedSearchOK) {
$this->ldap->controlPagedResult($cr, 999999, false, "");
}
if(!is_array($sr) || $error !== 0) {
\OCP\Util::writeLog('user_ldap',
'Error when searching: '.$this->ldap->error($cr).
@ -1365,6 +1375,19 @@ class Access extends LDAPUtility implements user\IUserTools {
return $belongsToBase;
}
/**
* resets a running Paged Search operation
*/
private function abandonPagedSearch() {
if($this->connection->hasPagedResultSupport) {
$cr = $this->connection->getConnectionResource();
$this->ldap->controlPagedResult($cr, 0, false, $this->lastCookie);
$this->getPagedSearchResultState();
$this->lastCookie = '';
$this->cookies = array();
}
}
/**
* get a cookie for the next LDAP paged search
* @param string $base a string with the base DN for the search
@ -1403,6 +1426,7 @@ class Access extends LDAPUtility implements user\IUserTools {
if(!empty($cookie)) {
$cacheKey = 'lc' . crc32($base) . '-' . crc32($filter) . '-' .intval($limit) . '-' . intval($offset);
$this->cookies[$cacheKey] = $cookie;
$this->lastCookie = $cookie;
}
}
@ -1454,9 +1478,8 @@ class Access extends LDAPUtility implements user\IUserTools {
}
}
if(!is_null($cookie)) {
if($offset > 0) {
\OCP\Util::writeLog('user_ldap', 'Cookie '.CRC32($cookie), \OCP\Util::INFO);
}
//since offset = 0, this is a new search. We abandon other searches that might be ongoing.
$this->abandonPagedSearch();
$pagedSearchOK = $this->ldap->controlPagedResult(
$this->connection->getConnectionResource(), $limit,
false, $cookie);

2
apps/user_ldap/lib/ildapwrapper.php
Unescape Escape View File

@ -51,7 +51,7 @@ interface ILDAPWrapper {
* @param resource $link LDAP link resource
* @param int $pageSize number of results per page
* @param bool $isCritical Indicates whether the pagination is critical of not.
* @param array $cookie structure sent by LDAP server
* @param string $cookie structure sent by LDAP server
* @return bool true on success, false otherwise
*/
public function controlPagedResult($link, $pageSize, $isCritical, $cookie);