From: Björn Schießle Date: Fri, 14 Jun 2013 13:07:06 +0000 (+0200) Subject: only escape glob pattern X-Git-Tag: v6.0.0alpha2~620^2~3 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f91b02e9b68e5478e93ec059a5439b493d1a1d39;p=nextcloud-server.git only escape glob pattern --- diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index 2d1830a38f1..e06e959f8eb 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -193,10 +193,11 @@ class Trashbin { $rootView->rename($sharekeys, $user.'/files_trashbin/share-keys/' . $filename . '.d' . $timestamp); } else { // get local path to share-keys - $localShareKeysPath = $rootView->getLocalFile($sharekeys); + $localShareKeysPath = $rootView->getLocalFile($sharekeys); + $escapedLocalShareKeysPath = preg_replace('/(\*|\?|\[)/', '[$1]', $localShareKeysPath); // handle share-keys - $matches = glob(preg_quote($localShareKeysPath).'*.shareKey'); + $matches = glob($escapedLocalShareKeysPath.'*.shareKey'); foreach ($matches as $src) { // get source file parts $pathinfo = pathinfo($src); @@ -737,14 +738,15 @@ class Trashbin { */ private static function getVersionsFromTrash($filename, $timestamp) { $view = new \OC\Files\View('/'.\OCP\User::getUser().'/files_trashbin/versions'); - $versionsName = $view->getLocalFile($filename); + $versionsName = $view->getLocalFile($filename).'.v'; + $escapedVersionsName = preg_replace('/(\*|\?|\[)/', '[$1]', $versionsName); $versions = array(); if ($timestamp ) { // fetch for old versions - $matches = glob( $versionsName.'.v*.d'.$timestamp ); + $matches = glob( $escapedVersionsName.'*.d'.$timestamp ); $offset = -strlen($timestamp)-2; } else { - $matches = glob( $versionsName.'.v*' ); + $matches = glob( $escapedVersionsName.'*' ); } foreach( $matches as $ma ) { diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index 4beb9e0fe5c..757926cd77a 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -241,11 +241,12 @@ class Storage { public static function getVersions($uid, $filename, $count = 0 ) { if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) { $versions_fileview = new \OC\Files\View('/' . $uid . '/files_versions'); - $versionsName = $versions_fileview->getLocalFile($filename); - + $versionsName = \OC_Filesystem::normalizePath($versions_fileview->getLocalFile($filename).'.v'); + $escapedVersionName = preg_replace('/(\*|\?|\[)/', '[$1]', $versionsName); + $versions = array(); // fetch for old versions - $matches = glob(preg_quote($versionsName).'.v*' ); + $matches = glob($escapedVersionName.'*'); if ( !$matches ) { return $versions;