Adding local cache per instance to MemorySafe and removing time limit…

… on nodes cache
pydio · Jan 18, 2017 · 52cf15c · 52cf15c
1 parent 5908f02
commit 52cf15c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/core/src/plugins/core.auth/MemorySafe.php b/core/src/plugins/core.auth/MemorySafe.php
@@ -24,8 +24,7 @@
 use Pydio\Core\Services\SessionService;
 use Pydio\Core\Utils\Crypto;
 use Pydio\Core\Utils\Vars\OptionsHelper;
-
-
+use Doctrine\Common\Cache\ArrayCache;
 
 defined('AJXP_EXEC') or die( 'Access not allowed');
 
@@ -40,6 +39,7 @@ class MemorySafe
     const SAFE_CREDENTIALS_KEY = "PYDIO_SAFE_CREDENTIALS";
 
     private static $instances;
+    private static $cache;
 
     private $instanceId = "";
     private $user;
@@ -239,6 +239,14 @@ public static function tryLoadingCredentialsFromSources($ctx)
         $user = $password = "";
         $optionsPrefix = "";
         $repository = $ctx->getRepository();
+        $instanceId = self::getInstanceId($ctx);
+        $instanceId = empty($instanceId) ? "__DEFAULT__" : $instanceId;
+
+    	$cache = self::$cache;
+        if (isset($cache[$instanceId])) {
+            return $cache[$instanceId];
+        }
+
         if ($repository->getAccessType() == "ftp") {
             $optionsPrefix = "FTP_";
         }
@@ -275,16 +283,18 @@ public static function tryLoadingCredentialsFromSources($ctx)
             }
         }
         if ($user=="" && ( $repository->getContextOption($ctx, "USE_SESSION_CREDENTIALS") || $storeCreds || self::getInstance()->forceSessionCredentials )) {
-            $instanceId = $instanceId = self::getInstanceId($ctx);
-            $instanceId = empty($instanceId) ? "" : $instanceId;
             $safeCred = MemorySafe::loadCredentials($instanceId);
             if ($safeCred !== false) {
                 $user = $safeCred["user"];
                 $password = $safeCred["password"];
             }
         }
-        return array("user" => $user, "password" => $password);
 
+        $res = ["user" => $user, "password" => $password];
+
+        self::$cache[$instanceId] = $res;
+
+        return $res;
     }
 
     /*******************/

diff --git a/core/src/plugins/core.cache/AbstractCacheDriver.php b/core/src/plugins/core.cache/AbstractCacheDriver.php
@@ -109,7 +109,7 @@ public static function getOptionsForNode($node, $cacheType, $details = ''){
 
         $options = [
             "id"        => $cacheType."://".$repo->getId().$subPath.$node->getPath().($details?"##$details":""),
-            "timelimit" => $repo->getContextOption($ctx, "CACHE_TIMELIMIT", 5)
+            "timelimit" => $repo->getContextOption($ctx, "CACHE_TIMELIMIT", 0)
         ];
         return $options;
     }
@@ -405,4 +405,4 @@ public function __destruct()
         }
     }
 
-}
+}