summaryrefslogtreecommitdiffstats
path: root/apps/files_external
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-02-20 10:01:49 +0100
committerVincent Petry <pvince81@owncloud.com>2014-02-20 10:01:49 +0100
commit49f2014e0c131a07bc0139ce437cb8c170ad518d (patch)
tree5f6b5446a655665ccf2d182856bcf77dcbf75b07 /apps/files_external
parent8f22535e754d1ace31c8592c5998925fae4b2890 (diff)
downloadnextcloud-server-49f2014e0c131a07bc0139ce437cb8c170ad518d.tar.gz
nextcloud-server-49f2014e0c131a07bc0139ce437cb8c170ad518d.zip
Revert "Added extra checks for ext storage class"
This reverts commit 9e9a5b9ea1f9b4699cf2d0c621f3f911f3639df9. Unit tests weren't ready, need further tweaking.
Diffstat (limited to 'apps/files_external')
-rwxr-xr-xapps/files_external/lib/config.php8
-rw-r--r--apps/files_external/tests/mountconfig.php24
2 files changed, 1 insertions, 31 deletions
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index cd3e7f3a4a6..94dc5fb7ad8 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -277,21 +277,15 @@ class OC_Mount_Config {
$mountType,
$applicable,
$isPersonal = false) {
- $backends = self::getBackends();
$mountPoint = OC\Files\Filesystem::normalizePath($mountPoint);
if ($mountPoint === '' || $mountPoint === '/' || $mountPoint == '/Shared') {
// can't mount at root or "Shared" folder
return false;
}
-
- if (!isset($backends[$class])) {
- // invalid backend
- return false;
- }
if ($isPersonal) {
// Verify that the mount point applies for the current user
// Prevent non-admin users from mounting local storage
- if ($applicable !== OCP\User::getUser() || strtolower($class) === '\oc\files\storage\local') {
+ if ($applicable != OCP\User::getUser() || $class == '\OC\Files\Storage\Local') {
return false;
}
$mountPoint = '/'.$applicable.'/files/'.ltrim($mountPoint, '/');
diff --git a/apps/files_external/tests/mountconfig.php b/apps/files_external/tests/mountconfig.php
index 4c61b8961f3..941aec680bb 100644
--- a/apps/files_external/tests/mountconfig.php
+++ b/apps/files_external/tests/mountconfig.php
@@ -48,28 +48,4 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
$this->assertEquals(false, OC_Mount_Config::addMountPoint('/Shared', $storageClass, array(), $mountType, $applicable, $isPersonal));
}
-
- public function testAddMountPointSingleUser() {
- \OC_User::setUserId('test');
- $mountType = 'user';
- $applicable = 'test';
- $isPersonal = true;
- // local
- $this->assertEquals(false, OC_Mount_Config::addMountPoint('/ext', '\OC\Files\storage\local', array(), $mountType, $applicable, $isPersonal));
- // non-local
- $this->assertEquals(true, OC_Mount_Config::addMountPoint('/ext', '\OC\Files\Storage\SFTP', array(), $mountType, $applicable, $isPersonal));
-
- }
-
- public function testAddMountPointUnexistClass() {
- \OC_User::setUserId('test');
- $storageClass = 'Unexist_Storage';
- $mountType = 'user';
- $applicable = 'test';
- $isPersonal = true;
- // local
- // non-local
- $this->assertEquals(false, OC_Mount_Config::addMountPoint('/ext', $storageClass, array(), $mountType, $applicable, $isPersonal));
-
- }
}