mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22736 from owncloud/propagation-ignore-encryption 

ignore encryption keys for propagation
This commit is contained in:
Thomas Müller 2016-03-01 08:19:42 +01:00
parent f3050b3adb 003a686c1b
commit caf6c43187
2 changed files with 68 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
lib/private/files/cache/homepropagator.php vendored Normal file
View File

@ -0,0 +1,50 @@
<?php
/**
* @author Robin Appelman <icewind@owncloud.com>
*
* @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 <http://www.gnu.org/licenses/>
*
*/
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);
}
}
}

18
lib/private/files/storage/home.php
View File

@ -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