wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Properly quote file names in listFiles query for GDrive

Browse source
This commit is contained in:
Vincent Petry 2015-03-26 12:15:02 +01:00
parent 285f9e32e5
commit 43588fe2f7
2 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files_external/lib/google.php
View file

@ -103,7 +103,7 @@ class Google extends \OC\Files\Storage\Common {
if (isset($this->driveFiles[$path])) {
$parentId = $this->driveFiles[$path]->getId();
} else {
$q = "title='".$name."' and '".$parentId."' in parents and trashed = false";
$q = "title='".rawurlencode($name)."' and '".$parentId."' in parents and trashed = false";
$result = $this->service->files->listFiles(array('q' => $q))->getItems();
if (!empty($result)) {
// Google Drive allows files with the same name, ownCloud doesn't

34
tests/lib/files/storage/storage.php
View file

@ -104,13 +104,14 @@ abstract class Storage extends \Test\TestCase {
}
public function directoryProvider() {
return array(
array('folder'),
array(' folder'),
array('folder '),
array('folder with space'),
array('spéciäl földer'),
);
return [
['folder'],
[' folder'],
['folder '],
['folder with space'],
['spéciäl földer'],
['test single\'quote'],
];
}
function loremFileProvider() {
@ -163,15 +164,16 @@ abstract class Storage extends \Test\TestCase {
public function copyAndMoveProvider() {
return array(
array('/source.txt', '/target.txt'),
array('/source.txt', '/target with space.txt'),
array('/source with space.txt', '/target.txt'),
array('/source with space.txt', '/target with space.txt'),
array('/source.txt', '/tärgét.txt'),
array('/sòurcē.txt', '/target.txt'),
array('/sòurcē.txt', '/tärgét.txt'),
);
return [
['/source.txt', '/target.txt'],
['/source.txt', '/target with space.txt'],
['/source with space.txt', '/target.txt'],
['/source with space.txt', '/target with space.txt'],
['/source.txt', '/tärgét.txt'],
['/sòurcē.txt', '/target.txt'],
['/sòurcē.txt', '/tärgét.txt'],
['/single \' quote.txt', '/tar\'get.txt'],
];
}
public function initSourceAndTarget ($source, $target = null) {