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

Merge pull request #9205 from owncloud/remoteshare-fixurlpath 

Fix parsing of remote URL when mounting remote shares
This commit is contained in:
Vincent Petry 2014-06-25 19:59:39 +02:00
parent 7c362ab55e d22559200c
commit 93a6792da7
2 changed files with 93 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files_sharing/lib/external/storage.php vendored
View File

@ -37,9 +37,9 @@ class Storage extends DAV implements ISharedStorage {
$this->remote = $options['remote']; $this->remote = $options['remote'];
$this->remoteUser = $options['owner']; $this->remoteUser = $options['owner'];
list($protocol, $remote) = explode('://', $this->remote); list($protocol, $remote) = explode('://', $this->remote);
list($host, $root) = explode('/', $remote); list($host, $root) = explode('/', $remote, 2);
$secure = $protocol === 'https'; $secure = $protocol === 'https';
$root .= '/public.php/webdav'; $root = rtrim($root, '/') . '/public.php/webdav';
$this->mountPoint = $options['mountpoint']; $this->mountPoint = $options['mountpoint'];
$this->token = $options['token']; $this->token = $options['token'];
parent::__construct(array( parent::__construct(array(

91
apps/files_sharing/tests/externalstorage.php Normal file
View File

@ -0,0 +1,91 @@
<?php
/**
* ownCloud
*
* @author Vincent Petry
* @copyright 2014 Vincent Petry <pvince81@owncloud.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
* License as published by the Free Software Foundation; either
* version 3 of the License, or any later version.
*
* This library 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 library. If not, see <http://www.gnu.org/licenses/>.
*
*/
require_once __DIR__ . '/base.php';
require_once __DIR__ . '/../../files_external/lib/webdav.php';
/**
* Tests for the external Storage class for remote shares.
*/
class Test_Files_Sharing_External_Storage extends \PHPUnit_Framework_TestCase {
function optionsProvider() {
return array(
array(
'http://remoteserver:8080/owncloud',
'http://remoteserver:8080/owncloud/public.php/webdav/',
),
// extra slash
array(
'http://remoteserver:8080/owncloud/',
'http://remoteserver:8080/owncloud/public.php/webdav/',
),
// extra path
array(
'http://remoteserver:8080/myservices/owncloud/',
'http://remoteserver:8080/myservices/owncloud/public.php/webdav/',
),
// root path
array(
'http://remoteserver:8080/',
'http://remoteserver:8080/public.php/webdav/',
),
// without port
array(
'http://remoteserver/oc.test',
'http://remoteserver/oc.test/public.php/webdav/',
),
// https
array(
'https://remoteserver/',
'https://remoteserver/public.php/webdav/',
),
);
}
/**
* @dataProvider optionsProvider
*/
public function testStorageMountOptions($inputUri, $baseUri) {
$storage = new TestSharingExternalStorage(
array(
'remote' => $inputUri,
'owner' => 'testOwner',
'mountpoint' => 'remoteshare',
'token' => 'abcdef',
'password' => '',
)
);
$this->assertEquals($baseUri, $storage->getBaseUri());
}
}
/**
* Dummy subclass to make it possible to access private members
*/
class TestSharingExternalStorage extends \OCA\Files_Sharing\External\Storage {
public function getBaseUri() {
return $this->createBaseUri();
}
}