mirror of https://github.com/nextcloud/server.git
prevent the root storage from accidentally scanning user folders
while this scan *should* never be triggered, it's good to have some failsafe to ensure that the users home contents don't end up getting scanned in the root storage Signed-off-by: Robin Appelman <robin@icewind.nl>pull/21360/head
parent
83303ef9df
commit
e9b5514186
@ -0,0 +1,47 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
/**
|
||||
* @copyright Copyright (c) 2020 Robin Appelman <robin@icewind.nl>
|
||||
*
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
* This program 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.
|
||||
*
|
||||
* 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
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
namespace OC\Files\Cache;
|
||||
|
||||
class LocalRootScanner extends Scanner {
|
||||
public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData = null, $lock = true, $data = null) {
|
||||
if ($this->shouldScanPath($file)) {
|
||||
return parent::scanFile($file, $reuseExisting, $parentId, $cacheData, $lock, $data);
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $lock = true) {
|
||||
if ($this->shouldScanPath($path)) {
|
||||
return parent::scan($path, $recursive, $reuse, $lock);
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private function shouldScanPath(string $path): bool {
|
||||
$path = trim($path, '/');
|
||||
return $path === '' || strpos($path, 'appdata_') === 0 || strpos($path, '__groupfolders') === 0;
|
||||
}
|
||||
}
|
@ -0,0 +1,38 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
/**
|
||||
* @copyright Copyright (c) 2020 Robin Appelman <robin@icewind.nl>
|
||||
*
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
* This program 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.
|
||||
*
|
||||
* 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
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
namespace OC\Files\Storage;
|
||||
|
||||
use OC\Files\Cache\LocalRootScanner;
|
||||
|
||||
class LocalRootStorage extends Local {
|
||||
public function getScanner($path = '', $storage = null) {
|
||||
if (!$storage) {
|
||||
$storage = $this;
|
||||
}
|
||||
if (!isset($storage->scanner)) {
|
||||
$storage->scanner = new LocalRootScanner($storage);
|
||||
}
|
||||
return $storage->scanner;
|
||||
}
|
||||
}
|
@ -0,0 +1,59 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
/**
|
||||
* @copyright Copyright (c) 2020 Robin Appelman <robin@icewind.nl>
|
||||
*
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
* This program 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.
|
||||
*
|
||||
* 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
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
namespace Test\Files\Cache;
|
||||
|
||||
use OC\Files\Storage\LocalRootStorage;
|
||||
use Test\TestCase;
|
||||
|
||||
/**
|
||||
* @group DB
|
||||
*/
|
||||
class LocalRootScannerTest extends TestCase {
|
||||
/** @var LocalRootStorage */
|
||||
private $storage;
|
||||
|
||||
protected function setUp(): void {
|
||||
parent::setUp();
|
||||
|
||||
$folder = \OC::$server->getTempManager()->getTemporaryFolder();
|
||||
$this->storage = new LocalRootStorage(['datadir' => $folder]);
|
||||
}
|
||||
|
||||
public function testDontScanUsers() {
|
||||
$this->storage->mkdir('foo');
|
||||
$this->storage->mkdir('foo/bar');
|
||||
|
||||
$this->storage->getScanner()->scan('');
|
||||
$this->assertFalse($this->storage->getCache()->inCache('foo'));
|
||||
}
|
||||
|
||||
public function testDoScanAppData() {
|
||||
$this->storage->mkdir('appdata_foo');
|
||||
$this->storage->mkdir('appdata_foo/bar');
|
||||
|
||||
$this->storage->getScanner()->scan('');
|
||||
$this->assertTrue($this->storage->getCache()->inCache('appdata_foo'));
|
||||
$this->assertTrue($this->storage->getCache()->inCache('appdata_foo/bar'));
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue