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

Merge pull request #6060 from owncloud/fix-6050-oc6 

fixing getRawPathInfo() once more
This commit is contained in:
Björn Schießle 2013-11-26 10:13:58 -08:00
parent e2ca88af5e 52941341fd
commit 1fef97f6a5
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/private/request.php
View File

@ -142,17 +142,30 @@ class OC_Request {
$requestUri = '/' . ltrim($requestUri, '/');
}
$scriptName = $_SERVER['SCRIPT_NAME'];
// in case uri and script name don't match we better throw an exception
if (strpos($requestUri, $scriptName) !== 0) {
throw new Exception("REQUEST_URI($requestUri) does not start with the SCRIPT_NAME($scriptName)");
}
$path_info = substr($requestUri, strlen($scriptName));
// Remove the query string from REQUEST_URI
if ($pos = strpos($path_info, '?')) {
$path_info = substr($path_info, 0, $pos);
if ($pos = strpos($requestUri, '?')) {
$requestUri = substr($requestUri, 0, $pos);
}
return $path_info;
$scriptName = $_SERVER['SCRIPT_NAME'];
$path_info = $requestUri;
// strip off the script name's dir and file name
list($path, $name) = \Sabre_DAV_URLUtil::splitPath($scriptName);
if (!empty($path)) {
if( $path === $path_info || strpos($path_info, $path.'/') === 0) {
$path_info = substr($path_info, strlen($path));
} else {
throw new Exception("The requested uri($requestUri) cannot be processed by the script '$scriptName')");
}
}
if (strpos($path_info, '/'.$name) === 0) {
$path_info = substr($path_info, strlen($name) + 1);
}
if (strpos($path_info, $name) === 0) {
$path_info = substr($path_info, strlen($name));
}
return rtrim($path_info, '/');
}
/**

11
tests/lib/request.php
View File

@ -42,6 +42,13 @@ class Test_Request extends PHPUnit_Framework_TestCase {
array('/core/ajax/translations.php', 'index.php/core/ajax/translations.php', 'index.php'),
array('/core/ajax/translations.php', '/index.php/core/ajax/translations.php', '/index.php'),
array('/core/ajax/translations.php', '//index.php/core/ajax/translations.php', '/index.php'),
array('', '/oc/core', '/oc/core/index.php'),
array('', '/oc/core/', '/oc/core/index.php'),
array('', '/oc/core/index.php', '/oc/core/index.php'),
array('/core/ajax/translations.php', '/core/ajax/translations.php', 'index.php'),
array('/core/ajax/translations.php', '//core/ajax/translations.php', '/index.php'),
array('/core/ajax/translations.php', '/oc/core/ajax/translations.php', '/oc/index.php'),
array('/1', '/oc/core/1', '/oc/core/index.php'),
);
}
@ -60,9 +67,7 @@ class Test_Request extends PHPUnit_Framework_TestCase {
function rawPathInfoThrowsExceptionProvider() {
return array(
array('core/ajax/translations.php', '/index.php'),
array('/core/ajax/translations.php', '/index.php'),
array('//core/ajax/translations.php', '/index.php'),
array('/oc/core1', '/oc/core/index.php'),
);
}
}