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

Remove reading PATH_INFO from server variable 

Having two code paths for this is unreliable and can lead to bugs. Also, in some cases Apache isn't setting the PATH_INFO variable when mod_rewrite is used.

Fixes https://github.com/nextcloud/server/issues/983
This commit is contained in:
Lukas Reschke 2016-08-19 14:46:20 +02:00
parent 25ed51743a
commit 4fb2810add
No known key found for this signature in database
GPG Key ID: B9F6980CF6E759B1
2 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/AppFramework/Http/Request.php
View File

@ -701,10 +701,6 @@ class Request implements \ArrayAccess, \Countable, IRequest {
* @return string|false Path info or false when not found * @return string|false Path info or false when not found
*/ */
public function getPathInfo() { public function getPathInfo() {
if(isset($this->server['PATH_INFO'])) {
return $this->server['PATH_INFO'];
}
$pathInfo = $this->getRawPathInfo(); $pathInfo = $this->getRawPathInfo();
// following is taken from \Sabre\HTTP\URLUtil::decodePathSegment // following is taken from \Sabre\HTTP\URLUtil::decodePathSegment
$pathInfo = rawurldecode($pathInfo); $pathInfo = rawurldecode($pathInfo);

16
tests/lib/AppFramework/Http/RequestTest.php
View File

@ -1063,22 +1063,6 @@ class RequestTest extends \Test\TestCase {
$this->assertSame('www.owncloud.org', self::invokePrivate($request, 'getOverwriteHost')); $this->assertSame('www.owncloud.org', self::invokePrivate($request, 'getOverwriteHost'));
} }
public function testGetPathInfoWithSetEnv() {
$request = new Request(
[
'server' => [
'PATH_INFO' => 'apps/files/',
]
],
$this->secureRandom,
$this->config,
$this->csrfTokenManager,
$this->stream
);
$this->assertSame('apps/files/', $request->getPathInfo());
}
/** /**
* @expectedException \Exception * @expectedException \Exception
* @expectedExceptionMessage The requested uri(/foo.php) cannot be processed by the script '/var/www/index.php') * @expectedExceptionMessage The requested uri(/foo.php) cannot be processed by the script '/var/www/index.php')