Auth.multi : when looking for shared users only, skip master driver.

Auth.ldap : fix users count caching per baseGroup.

Author: cdujeu

core/src/plugins/auth.ldap/LdapAuthDriver.php

@@ -26,6 +26,7 @@
 use Pydio\Core\Controller\ProgressBarCLI;
 use Pydio\Core\Services\RolesService;
 use Pydio\Core\Services\UsersService;
+use Pydio\Core\Utils\FileHelper;
 use Pydio\Core\Utils\Vars\InputFilter;
 use Pydio\Core\Utils\Vars\StringHelper;
 
@@ -343,7 +344,7 @@ public function getUserEntries($login = null, $countOnly = false, $offset = -1,
         //Update progress bar in CLI mode
         $isListAll = (($offset == -1) && ($limit == -1) && (is_null($login)) && $regexpOnSearchAttr && (php_sapi_name() == "cli"));
         if ($isListAll) {
-            $total = $this->getCountFromCache();
+            $total = $this->getCountFromCache("/");
             $progressBar = new ProgressBarCLI();
             $progressBar->init($index, $total["count"], "Get ldap users");
         }
@@ -460,10 +461,17 @@ public function listUsersPaginated($baseGroup, $regexp, $offset, $limit, $recurs
         return $persons;
     }
 
+    /**
+     * @param string $baseGroup
+     * @param string $regexp
+     * @param null $filterProperty
+     * @param null $filterValue
+     * @param bool $recursive
+     * @return mixed
+     */
     public function getUsersCount($baseGroup = "/", $regexp = "", $filterProperty = null, $filterValue = null, $recursive = true)
     {
-        $check_cache = $this->getCountFromCache();
-
+        $check_cache = $this->getCountFromCache($baseGroup);
         if ((is_array($check_cache) && $check_cache["count"] > 0)) {
             return $check_cache["count"];
         }
@@ -477,7 +485,7 @@ public function getUsersCount($baseGroup = "/", $regexp = "", $filterProperty =
         }
 
         $res = $this->getUserEntries(StringHelper::regexpToLdap($regexp), true, null);
-        $this->saveCountToCache($res);
+        $this->saveCountToCache($res, $baseGroup);
         $this->dynamicFilter = null;
         return $res["count"];
     }
@@ -988,30 +996,50 @@ public function fakeMemberOf($conn, $groupDN, $filterString, $atts, &$entry)
         }
     }
 
-    public function getCountFromCache()
+    /**
+     * @return string
+     * @throws \Exception
+     */
+    private function getCacheCountFileName(){
+        return $this->getPluginCacheDir() . DIRECTORY_SEPARATOR . "ldap.ser";
+    }
+
+    /**
+     * @param $baseGroup
+     * @return int
+     */
+    public function getCountFromCache($baseGroup)
     {
         $ttl = $this->getOption("LDAP_COUNT_CACHE_TTL");
         if (empty($ttl)) $ttl = 1;
-        $fileName = "ldap.ser";
-        if (file_exists($this->getPluginCacheDir() . DIRECTORY_SEPARATOR . $fileName)) {
-            $fileContent = unserialize(file_get_contents($this->getPluginCacheDir() . DIRECTORY_SEPARATOR . $fileName));
-            if (($fileContent) && ($fileContent["count"]) && ($fileContent["timestamp"]) && ((time() - $fileContent["timestamp"]) < 60 * 60 * $ttl)) {
-                return $fileContent;
-            }
+        $fileContent = FileHelper::loadSerialFile($this->getCacheCountFileName());
+        if (!empty($fileContent) && $fileContent[$baseGroup]["count"] && $fileContent[$baseGroup]["timestamp"] && (time() - $fileContent[$baseGroup]["timestamp"]) < 60 * 60 * $ttl ) {
+            return $fileContent[$baseGroup];
         }
         return 0;
     }
 
-    public function saveCountToCache($fileContent)
+    /**
+     * @param $fileContent
+     * @param $baseGroup
+     * @throws \Exception
+     */
+    public function saveCountToCache($fileContent, $baseGroup)
     {
-        $fileName = "ldap.ser";
         if (!is_dir($this->getPluginCacheDir(false, true))) return;
-        if (is_array($fileContent) && ($fileContent > 0)) {
+        $fileName = $this->getCacheCountFileName();
+
+        $existing = FileHelper::loadSerialFile($fileName);
+        if(!empty($existing) && is_array($existing)) {
+            $data = $existing;
+        }else{
+            $data = [];
+        }
+
+        if (is_array($fileContent) && count($fileContent) > 0) {
             $fileContent["timestamp"] = time();
-            if (file_exists($this->getPluginCacheDir() . DIRECTORY_SEPARATOR . $fileName)) {
-                unlink($this->getPluginCacheDir() . "/" . $fileName);
-            }
-            file_put_contents($this->getPluginCacheDir() . DIRECTORY_SEPARATOR . $fileName, serialize($fileContent));
+            $data[$baseGroup] = $fileContent;
+            FileHelper::saveSerialFile($fileName, $data, false);
         }
     }
 

core/src/plugins/auth.multi/MultiAuthDriver.php

@@ -266,7 +266,11 @@ public function getUsersCount($baseGroup = "/", $regexp = "", $filterProperty =
     {
         if (empty($this->baseName)) {
             if ($this->masterSlaveMode) {
-                return $this->drivers[$this->slaveName]->getUsersCount($baseGroup, $regexp, $filterProperty, $filterValue, $recursive) + $this->drivers[$this->masterName]->getUsersCount($baseGroup, $regexp, $filterProperty, $filterValue, $recursive);
+                if($filterProperty === 'parent' && $filterValue === AJXP_FILTER_NOT_EMPTY){
+                    return $this->drivers[$this->slaveName]->getUsersCount($baseGroup, $regexp, $filterProperty, $filterValue, $recursive);
+                }else{
+                    return $this->drivers[$this->slaveName]->getUsersCount($baseGroup, $regexp, $filterProperty, $filterValue, $recursive) + $this->drivers[$this->masterName]->getUsersCount($baseGroup, $regexp, $filterProperty, $filterValue, $recursive);
+                }
             } else {
                 $keys = array_keys($this->drivers);
                 return $this->drivers[$keys[0]]->getUsersCount($baseGroup, $regexp, $filterProperty, $filterValue, $recursive) + $this->drivers[$keys[1]]->getUsersCount($baseGroup, $regexp, $filterProperty, $filterValue, $recursive);