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

Merge pull request #11446 from nextcloud/bugfix/10678/pretty-urls-dont-work 

Allow overwrite.cli.url without trailing slash
This commit is contained in:
Morris Jobke 2018-10-02 23:39:30 +02:00 committed by GitHub
parent e45248c17a 9dae927b0c
commit 8ede3f6346
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/private/Setup.php
View File

@ -451,11 +451,10 @@ class Setup {
if ($webRoot === '') { if ($webRoot === '') {
throw new InvalidArgumentException('overwrite.cli.url is empty'); throw new InvalidArgumentException('overwrite.cli.url is empty');
} }
$webRoot = parse_url($webRoot, PHP_URL_PATH); if (!filter_var($webRoot, FILTER_VALIDATE_URL)) {
if ($webRoot === null) {
throw new InvalidArgumentException('invalid value for overwrite.cli.url'); throw new InvalidArgumentException('invalid value for overwrite.cli.url');
} }
$webRoot = rtrim($webRoot, '/'); $webRoot = rtrim(parse_url($webRoot, PHP_URL_PATH), '/');
} else { } else {
$webRoot = !empty(\OC::$WEBROOT) ? \OC::$WEBROOT : '/'; $webRoot = !empty(\OC::$WEBROOT) ? \OC::$WEBROOT : '/';
} }

14
tests/lib/SetupTest.php
View File

@ -153,14 +153,24 @@ class SetupTest extends \Test\TestCase {
} }
\OC::$CLI = $cliState; \OC::$CLI = $cliState;
$this->assertEquals($webRoot, $expected); $this->assertSame($webRoot, $expected);
} }
public function findWebRootProvider(): array { public function findWebRootProvider(): array {
return [ return [
'https://www.example.com/nextcloud/' => ['https://www.example.com/nextcloud/', '/nextcloud'],
'https://www.example.com/nextcloud' => ['https://www.example.com/nextcloud', '/nextcloud'], 'https://www.example.com/nextcloud' => ['https://www.example.com/nextcloud', '/nextcloud'],
'https://www.example.com/' => ['https://www.example.com/', ''], 'https://www.example.com/' => ['https://www.example.com/', ''],
'https://www.example.com' => ['https://www.example.com', false], 'https://www.example.com' => ['https://www.example.com', ''],
'https://nctest13pgsql.lan/test123/' => ['https://nctest13pgsql.lan/test123/', '/test123'],
'https://nctest13pgsql.lan/test123' => ['https://nctest13pgsql.lan/test123', '/test123'],
'https://nctest13pgsql.lan/' => ['https://nctest13pgsql.lan/', ''],
'https://nctest13pgsql.lan' => ['https://nctest13pgsql.lan', ''],
'https://192.168.10.10/nc/' => ['https://192.168.10.10/nc/', '/nc'],
'https://192.168.10.10/nc' => ['https://192.168.10.10/nc', '/nc'],
'https://192.168.10.10/' => ['https://192.168.10.10/', ''],
'https://192.168.10.10' => ['https://192.168.10.10', ''],
'invalid' => ['invalid', false],
'empty' => ['', false], 'empty' => ['', false],
]; ];
} }