Mega-merge from deprototype branch

Author: cdujeu

core/src/.gitignore

@@ -1,8 +1,13 @@
-.idea/*
+.idea/
 data/cache/*
 data/files/*
 data/logs/*
 data/personal/*
 data/plugins/*
 data/public/*
-data/tmp
+data/tmp
+node_modules/
+.DS_Store
+.jshintignore
+.jshintrc
+.validate.json

core/src/conf/bootstrap_context.php

@@ -77,6 +77,9 @@
 define("AJXP_SERVER_DEBUG"  ,	false);
 define("AJXP_SKIP_CACHE"    ,   false);
 
+// KEY-VALUE-CACHE
+define("AJXP_KVCACHE_PREFIX", "pydio-unique-id");
+define("AJXP_KVCACHE_IGNORE", true );
 
 // PBKDF2 CONSTANTS FOR A SECURE STORAGE OF PASSWORDS
 // These constants may be changed without breaking existing hashes.

core/src/core/classes/class.AJXP_Controller.php

@@ -45,15 +45,13 @@ class AJXP_Controller
     /**
      * Initialize the queryable xPath object
      * @static
+     * @param bool $useCache Whether to cache the registry version in a memory cache.
      * @return DOMXPath
      */
-    private static function initXPath()
+    private static function initXPath($useCache = false)
     {
         if (!isSet(self::$xPath)) {
-
-            $registry = AJXP_PluginsService::getXmlRegistry( false );
-            $changes = self::filterRegistryFromRole($registry);
-            if($changes) AJXP_PluginsService::updateXmlRegistry($registry);
+            $registry = ConfService::getFilteredXMLRegistry(false, false, $useCache);
             self::$xPath = new DOMXPath($registry);
         }
         return self::$xPath;
@@ -64,65 +62,14 @@ public static function registryReset(){
         self::$hooksCache = array();
     }
 
-    /**
-     * Check the current user "specificActionsRights" and filter the full registry actions with these.
-     * @static
-     * @param DOMDocument $registry
-     * @return bool
-     */
-    public static function filterRegistryFromRole(&$registry)
-    {
-        if(!AuthService::usersEnabled()) return false ;
-        $loggedUser = AuthService::getLoggedUser();
-        if($loggedUser == null) return false;
-        $crtRepo = ConfService::getRepository();
-        $crtRepoId = AJXP_REPO_SCOPE_ALL; // "ajxp.all";
-        if ($crtRepo != null && is_a($crtRepo, "Repository")) {
-            $crtRepoId = $crtRepo->getId();
-        }
-        $actionRights = $loggedUser->mergedRole->listActionsStatesFor($crtRepo);
-        $changes = false;
-        $xPath = new DOMXPath($registry);
-        foreach ($actionRights as $pluginName => $actions) {
-            foreach ($actions as $actionName => $enabled) {
-                if($enabled !== false) continue;
-                $actions = $xPath->query("actions/action[@name='$actionName']");
-                if (!$actions->length) {
-                    continue;
-                }
-                $action = $actions->item(0);
-                $action->parentNode->removeChild($action);
-                $changes = true;
-            }
-        }
-        $parameters = $loggedUser->mergedRole->listParameters();
-        foreach ($parameters as $scope => $paramsPlugs) {
-            if ($scope == AJXP_REPO_SCOPE_ALL || $scope == $crtRepoId || ($crtRepo!=null && $crtRepo->hasParent() && $scope == AJXP_REPO_SCOPE_SHARED)) {
-                foreach ($paramsPlugs as $plugId => $params) {
-                    foreach ($params as $name => $value) {
-                        // Search exposed plugin_configs, replace if necessary.
-                        $searchparams = $xPath->query("plugins/*[@id='$plugId']/plugin_configs/property[@name='$name']");
-                        if(!$searchparams->length) continue;
-                        $param = $searchparams->item(0);
-                        $newCdata = $registry->createCDATASection(json_encode($value));
-                        $param->removeChild($param->firstChild);
-                        $param->appendChild($newCdata);
-                    }
-                }
-            }
-        }
-        return $changes;
-    }
-
-
     /**
      * @param $actionName
      * @param $path
      * @return bool
      */
     public static function findRestActionAndApply($actionName, $path)
     {
-        $xPath = self::initXPath();
+        $xPath = self::initXPath(true);
         $actions = $xPath->query("actions/action[@name='$actionName']");
         if (!$actions->length) {
             self::$lastActionNeedsAuth = true;

core/src/core/classes/class.AJXP_KeyValueCache.php

@@ -0,0 +1,107 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <http://pyd.io/>.
+ */
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+
+/**
+ * Class AJXP_KeyValueCache
+ *
+ * Simple Key/Value cache stored in memory, independant of the implementation.
+ * Currently APC only, we should replace with the Doctrine/cache library (see https://github.com/doctrine/cache )
+ * We do implement their Cache Interface for future migration.
+ */
+class AJXP_KeyValueCache {
+
+    protected function makeId($id){
+        if(defined('AJXP_KVCACHE_PREFIX')){
+            return AJXP_KVCACHE_PREFIX . " - ".$id;
+        }
+        return $id;
+    }
+
+    /**
+     * Fetches an entry from the cache.
+     *
+     * @param string $id The id of the cache entry to fetch.
+     *
+     * @return mixed The cached data or FALSE, if no cache entry exists for the given id.
+     */
+    public function fetch($id){
+        if(!function_exists('apc_fetch')) return FALSE;
+        if(defined('AJXP_KVCACHE_IGNORE') && AJXP_KVCACHE_IGNORE) return FALSE;
+        $result = apc_fetch($this->makeId($id), $success);
+        if($success) return $result;
+        else return false;
+    }
+    /**
+     * Tests if an entry exists in the cache.
+     *
+     * @param string $id The cache id of the entry to check for.
+     *
+     * @return boolean TRUE if a cache entry exists for the given cache id, FALSE otherwise.
+     */
+    public function contains($id){
+        if(!function_exists('apc_fetch')) return FALSE;
+        if(defined('AJXP_KVCACHE_IGNORE') && AJXP_KVCACHE_IGNORE) return FALSE;
+        apc_fetch($this->makeId($id), $success);
+        return $success;
+    }
+    /**
+     * Puts data into the cache.
+     *
+     * @param string $id       The cache id.
+     * @param mixed  $data     The cache entry/data.
+     * @param int    $lifeTime The cache lifetime.
+     *                         If != 0, sets a specific lifetime for this cache entry (0 => infinite lifeTime).
+     *
+     * @return boolean TRUE if the entry was successfully stored in the cache, FALSE otherwise.
+     */
+    public function save($id, $data, $lifeTime = 0){
+        if(!function_exists('apc_store')) return false;
+        if(defined("AJXP_KVCACHE_IGNORE") && AJXP_KVCACHE_IGNORE) return false;
+        $res = apc_store($this->makeId($id), $data, $lifeTime);
+        if($res !== false) return true;
+        return false;
+    }
+
+    /**
+     * Deletes a cache entry.
+     *
+     * @param string $id The cache id.
+     *
+     * @return boolean TRUE if the cache entry was successfully deleted, FALSE otherwise.
+     */
+    public function delete($id){
+        if(!function_exists('apc_delete')) return true;
+        return apc_delete($this->makeId($id));
+    }
+
+    /**
+     * Flush a whole cache
+     */
+    public function deleteAll(){
+        if(function_exists('apc_clear_cache')){
+            apc_clear_cache('user');
+        }
+    }
+
+
+}