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

Merge pull request #14197 from owncloud/ensure-that-passed-file-path-is-always-a-string 

Ensure that passed argument is always a string
This commit is contained in:
Lukas Reschke 2015-02-13 13:30:54 +01:00
parent 95860d8113 9904b30070
commit 276bfe5f33
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files/ajax/list.php
View File

@ -5,7 +5,7 @@ OCP\JSON::checkLoggedIn();
$l = \OC::$server->getL10N('files'); $l = \OC::$server->getL10N('files');
// Load the files // Load the files
$dir = isset($_GET['dir']) ? $_GET['dir'] : ''; $dir = isset($_GET['dir']) ? (string)$_GET['dir'] : '';
$dir = \OC\Files\Filesystem::normalizePath($dir); $dir = \OC\Files\Filesystem::normalizePath($dir);
try { try {

9
lib/private/files/filesystem.php
View File

@ -723,9 +723,18 @@ class Filesystem {
* Fix common problems with a file path * Fix common problems with a file path
* @param string $path * @param string $path
* @param bool $stripTrailingSlash * @param bool $stripTrailingSlash
* @param bool $isAbsolutePath
* @return string * @return string
*/ */
public static function normalizePath($path, $stripTrailingSlash = true, $isAbsolutePath = false) { public static function normalizePath($path, $stripTrailingSlash = true, $isAbsolutePath = false) {
/**
* FIXME: This is a workaround for existing classes and files which call
* this function with another type than a valid string. This
* conversion should get removed as soon as all existing
* function calls have been fixed.
*/
$path = (string)$path;
$cacheKey = json_encode([$path, $stripTrailingSlash, $isAbsolutePath]); $cacheKey = json_encode([$path, $stripTrailingSlash, $isAbsolutePath]);
if(isset(self::$normalizedPathCache[$cacheKey])) { if(isset(self::$normalizedPathCache[$cacheKey])) {