Added extra checks for ext storage class

diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 94dc5fb7ad877ca1243795c1fa9a30b2fcccfeb1..cd3e7f3a4a6703e48370f8413474139437ad6497 100755 (executable)
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -277,15 +277,21 @@ 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() || $class == '\OC\Files\Storage\Local') {
+                       if ($applicable !== OCP\User::getUser() || strtolower($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 941aec680bbb1be0794a1ec7579498d8d8a248df..4c61b8961f3bea722e9711f2e5c5a6081e50369e 100644 (file)
--- a/apps/files_external/tests/mountconfig.php
+++ b/apps/files_external/tests/mountconfig.php
@@ -48,4 +48,28 @@ 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));
+
+       }
 }