Merge pull request #11446 from nextcloud/bugfix/10678/pretty-urls-don…

…t-work Allow overwrite.cli.url without trailing slash
nextcloud · Oct 2, 2018 · 8ede3f6 · 8ede3f6
2 parents e45248c + 9dae927
commit 8ede3f6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/lib/private/Setup.php b/lib/private/Setup.php
@@ -451,11 +451,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 : '/';
 		}

diff --git a/tests/lib/SetupTest.php b/tests/lib/SetupTest.php
@@ -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],
 		];
 	}