From: Côme Chilliet <come.chilliet@nextcloud.com>
Date: Mon, 13 Mar 2023 15:05:41 +0000 (+0100)
Subject: Do not send a pagination control with size = 0 if cookie is empty
X-Git-Tag: v27.0.0beta1~332^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F37197%2Fhead;p=nextcloud-server.git

Do not send a pagination control with size = 0 if cookie is empty

It only makes sense to send a pagination control with size 0 with a
 cookie to abandon a paged search.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
---

diff --git a/apps/user_ldap/lib/LDAP.php b/apps/user_ldap/lib/LDAP.php
index 5730907b653..41a6f651f3b 100644
--- a/apps/user_ldap/lib/LDAP.php
+++ b/apps/user_ldap/lib/LDAP.php
@@ -190,14 +190,18 @@ class LDAP implements ILDAPWrapper {
 	 * {@inheritDoc}
 	 */
 	public function search($link, $baseDN, $filter, $attr, $attrsOnly = 0, $limit = 0, int $pageSize = 0, string $cookie = '') {
-		$serverControls = [[
-			'oid' => LDAP_CONTROL_PAGEDRESULTS,
-			'value' => [
-				'size' => $pageSize,
-				'cookie' => $cookie,
-			],
-			'iscritical' => false,
-		]];
+		if ($pageSize > 0 || $cookie !== '') {
+			$serverControls = [[
+				'oid' => LDAP_CONTROL_PAGEDRESULTS,
+				'value' => [
+					'size' => $pageSize,
+					'cookie' => $cookie,
+				],
+				'iscritical' => false,
+			]];
+		} else {
+			$serverControls = [];
+		}
 
 		$oldHandler = set_error_handler(function ($no, $message, $file, $line) use (&$oldHandler) {
 			if (strpos($message, 'Partial search results returned: Sizelimit exceeded') !== false) {
@@ -387,7 +391,7 @@ class LDAP implements ILDAPWrapper {
 		if ($this->isResource($this->curArgs[0])) {
 			$resource = $this->curArgs[0];
 		} elseif (
-			   $functionName === 'ldap_search'
+			$functionName === 'ldap_search'
 			&& is_array($this->curArgs[0])
 			&& $this->isResource($this->curArgs[0][0])
 		) {