Skip to content

Allow overwrite.cli.url without trailing slash #11446

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
MorrisJobke merged 2 commits into from
Oct 2, 2018
Merged

Allow overwrite.cli.url without trailing slash #11446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c275bee
Allow url without / for overwrite.cli.url
kesselb Sep 28, 2018
9dae927
Add more test cases
kesselb Sep 30, 2018
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
5 changes: 2 additions & 3 deletions lib/private/Setup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,11 +445,10 @@ private static function findWebRoot(SystemConfig $config): string {
if ($webRoot === '') {
throw new InvalidArgumentException('overwrite.cli.url is empty');
}
$webRoot = parse_url($webRoot, PHP_URL_PATH);
if ($webRoot === null) {
if (!filter_var($webRoot, FILTER_VALIDATE_URL)) {
throw new InvalidArgumentException('invalid value for overwrite.cli.url');
}
$webRoot = rtrim($webRoot, '/');
$webRoot = rtrim(parse_url($webRoot, PHP_URL_PATH), '/');
} else {
$webRoot = !empty(\OC::$WEBROOT) ? \OC::$WEBROOT : '/';
}
Expand Down
14 changes: 12 additions & 2 deletions tests/lib/SetupTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,14 +153,24 @@ public function testFindWebRootCli($url, $expected) {
}

\OC::$CLI = $cliState;
$this->assertEquals($webRoot, $expected);
$this->assertSame($webRoot, $expected);
}

public function findWebRootProvider(): array {
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/' => ['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],
];
}
Expand Down