From 003a686c1b362b76d3c08d9566cc187ceff0ecd7 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 29 Feb 2016 17:43:23 +0100 Subject: [PATCH] ignore encryption keys for propagation --- lib/private/files/cache/homepropagator.php | 50 ++++++++++++++++++++++ lib/private/files/storage/home.php | 18 ++++++++ 2 files changed, 68 insertions(+) create mode 100644 lib/private/files/cache/homepropagator.php diff --git a/lib/private/files/cache/homepropagator.php b/lib/private/files/cache/homepropagator.php new file mode 100644 index 0000000000..8edca9c0c8 --- /dev/null +++ b/lib/private/files/cache/homepropagator.php @@ -0,0 +1,50 @@ + + * + * @copyright Copyright (c) 2016, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program 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, version 3, + * along with this program. If not, see + * + */ + +namespace OC\Files\Cache; + +class HomePropagator extends Propagator { + private $ignoredBaseFolders; + + /** + * @param \OC\Files\Storage\Storage $storage + */ + public function __construct(\OC\Files\Storage\Storage $storage) { + parent::__construct($storage); + $this->ignoredBaseFolders = ['files_encryption']; + } + + + /** + * @param string $internalPath + * @param int $time + * @param int $sizeDifference number of bytes the file has grown + * @return array[] all propagated entries + */ + public function propagateChange($internalPath, $time, $sizeDifference = 0) { + list($baseFolder) = explode('/', $internalPath, 2); + if (in_array($baseFolder, $this->ignoredBaseFolders)) { + return []; + } else { + return parent::propagateChange($internalPath, $time, $sizeDifference); + } + } +} diff --git a/lib/private/files/storage/home.php b/lib/private/files/storage/home.php index 35a7e8360f..9b98f2f7e1 100644 --- a/lib/private/files/storage/home.php +++ b/lib/private/files/storage/home.php @@ -24,6 +24,7 @@ */ namespace OC\Files\Storage; +use OC\Files\Cache\HomePropagator; /** * Specialized version of Local storage for home directory usage @@ -76,6 +77,23 @@ class Home extends Local implements \OCP\Files\IHomeStorage { return $this->cache; } + /** + * get a propagator instance for the cache + * + * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher + * @return \OC\Files\Cache\Propagator + */ + public function getPropagator($storage = null) { + if (!$storage) { + $storage = $this; + } + if (!isset($this->propagator)) { + $this->propagator = new HomePropagator($storage); + } + return $this->propagator; + } + + /** * Returns the owner of this home storage * @return \OC\User\User owner of this home storage