Skip to content

Respect RFC2616 Section 5.1.2 and allow absoluteURI #28131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PVince81 merged 3 commits into from
Aug 2, 2017
Merged

Respect RFC2616 Section 5.1.2 and allow absoluteURI #28131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b70efc
Respect RFC2616 Section 5.1.2 and allow absoluteURI
butonic Jun 14, 2017
8794ad0
Respect RFC2616 in a more general approach - this will affect all req…
DeepDiver1975 Jul 20, 2017
718b0c3
Add more tests and fix crazy php bugs - https://bugs.php.net/bug.php?…
DeepDiver1975 Jul 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions lib/private/AppFramework/Http/Request.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,20 @@ public function getRequestUri() {
$uri = isset($this->server['REQUEST_URI']) ? $this->server['REQUEST_URI'] : '';
if($this->config->getSystemValue('overwritewebroot') !== '' && $this->isOverwriteCondition()) {
$uri = $this->getScriptName() . substr($uri, strlen($this->server['SCRIPT_NAME']));
} else {
$components = parse_url($uri);
if ($components === false) {
// due to https://bugs.php.net/bug.php?id=70942 we have to add a
// fake schema and host to successfully extract path, query and fragment
$components = parse_url("http://localhost$uri");
}
$uri = $components['path'];
if (isset($components['query'])) {
$uri .= '?'.$components['query'];
}
if (isset($components['fragment'])) {
$uri .= '#'.$components['fragment'];
}
}
return $uri;
}
Expand Down
24 changes: 20 additions & 4 deletions tests/lib/AppFramework/Http/RequestTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@
use OCP\IRequest;
use OCP\Security\ISecureRandom;
use OCP\IConfig;
use Test\TestCase;

/**
* Class RequestTest
*
* @package OC\AppFramework\Http
*/
class RequestTest extends \Test\TestCase {
class RequestTest extends TestCase {
/** @var string */
protected $stream = 'fakeinput://data';
/** @var ISecureRandom | \PHPUnit_Framework_MockObject_MockObject */
Expand Down Expand Up @@ -1337,7 +1338,22 @@ public function pathInfoProvider() {
];
}

public function testGetRequestUriWithoutOverwrite() {
public function providesUri() {
return[
['/test.php', '/test.php'],
['/remote.php/dav/files/user0/test_folder:5', '/remote.php/dav/files/user0/test_folder:5'],
['/remote.php/dav/files/admin/welcome.txt', 'http://localhost:8080/remote.php/dav/files/admin/welcome.txt'],
['/path?arg=value#anchor', 'http://username:password@hostname:9090/path?arg=value#anchor'],
['/path:5?arg=value#anchor', 'http://username:password@hostname:9090/path:5?arg=value#anchor'],
['', ''],
['/test.php', '/test.php'],
];
}

/**
* @dataProvider providesUri
*/
public function testGetRequestUriWithoutOverwrite($expectedUri, $requestUri) {
$this->config
->expects($this->once())
->method('getSystemValue')
Expand All @@ -1347,7 +1363,7 @@ public function testGetRequestUriWithoutOverwrite() {
$request = new Request(
[
'server' => [
'REQUEST_URI' => '/test.php'
'REQUEST_URI' => $requestUri
]
],
$this->secureRandom,
Expand All @@ -1356,7 +1372,7 @@ public function testGetRequestUriWithoutOverwrite() {
$this->stream
);

$this->assertSame('/test.php', $request->getRequestUri());
$this->assertSame($expectedUri, $request->getRequestUri());
}

public function providesGetRequestUriWithOverwriteData() {
Expand Down