Fix parsing bug with uri scheme/user (#232)

* test: isolate bug #231

* fix: better uri parsing of user/scheme
closes #231

* test: improve test coverage - authority related

Author: g105b

src/Uri.php

@@ -23,13 +23,98 @@ public function __construct(?string $uri = null) {
 			return;
 		}
 
-		$parts = parse_url($uri);
+		$parts = $this->parseUri($uri);
 		if($parts === false) {
 			throw new UriParseErrorException($uri);
 		}
 		$this->applyParts($parts);
 	}
 
+	/** @return false|array<string, int|string> */
+	protected function parseUri(string $uri):false|array {
+		$parts = parse_url($uri);
+		if($parts === false) {
+			return false;
+		}
+
+		$authorityStyleParts = $this->parseAuthorityStyleParts($uri, $parts);
+		if(!is_null($authorityStyleParts)) {
+			return $authorityStyleParts;
+		}
+
+		return $parts;
+	}
+
+	/**
+	 * @param array<string, int|string> $parts
+	 * @return null|array<string, int|string>
+	 */
+	protected function parseAuthorityStyleParts(
+		string $uri,
+		array $parts
+	):?array {
+		if(!$this->canBeAuthorityStyleUri($uri, $parts)) {
+			return null;
+		}
+
+		$authorityParts = parse_url("//" . $uri);
+		if($authorityParts === false) {
+			return null;
+		}
+
+		if(!$this->hasRequiredAuthorityParts($authorityParts)) {
+			return null;
+		}
+
+		if(!$this->isAuthorityPathValid($authorityParts)) {
+			return null;
+		}
+
+		if(!$this->isAuthorityHostLike($authorityParts)) {
+			return null;
+		}
+
+		return $authorityParts;
+	}
+
+	/** @param array<string, int|string> $parts */
+	protected function canBeAuthorityStyleUri(string $uri, array $parts):bool {
+		if(str_contains($uri, "://")) {
+			return false;
+		}
+
+		if(!isset($parts["scheme"]) || isset($parts["host"])) {
+			return false;
+		}
+
+		$path = (string)($parts["path"] ?? "");
+		return str_contains($path, "@");
+	}
+
+	/** @param array<string, int|string> $authorityParts */
+	protected function hasRequiredAuthorityParts(array $authorityParts):bool {
+		return isset($authorityParts["user"], $authorityParts["pass"], $authorityParts["host"]);
+	}
+
+	/** @param array<string, int|string> $authorityParts */
+	protected function isAuthorityPathValid(array $authorityParts):bool {
+		$authorityPath = (string)($authorityParts["path"] ?? "");
+		return strlen($authorityPath) === 0 || str_starts_with($authorityPath, "/");
+	}
+
+	/** @param array<string, int|string> $authorityParts */
+	protected function isAuthorityHostLike(array $authorityParts):bool {
+		$host = (string)$authorityParts["host"];
+		if(filter_var($host, FILTER_VALIDATE_IP) !== false) {
+			return true;
+		}
+
+		return str_contains($host, ".")
+			|| str_contains($host, ":")
+			|| str_starts_with($host, "[")
+			|| $host === self::DEFAULT_HOST_HTTP;
+	}
+
 	/** @inheritDoc */
 	public function __toString():string {
 		$uri = "";

test/phpunit/UriTest.php

@@ -169,6 +169,57 @@ public function testCanConstructFalseyUriParts() {
 		$this->assertSame('0://0:0@0/0?0#0', (string)$uri);
 	}
 
+	public function testParsesAuthorityStyleCredentialsWithoutScheme() {
+		$uri = new Uri('admin:admin@10.10.0.8/status.xml');
+		$this->assertSame('', $uri->getScheme());
+		$this->assertSame('admin:admin', $uri->getUserInfo());
+		$this->assertSame('10.10.0.8', $uri->getHost());
+		$this->assertSame('/status.xml', $uri->getPath());
+	}
+
+	public function testBuildsAuthorityFromCredentialsWithoutScheme() {
+		$uri = new Uri('admin:admin@10.10.0.8/status.xml');
+		$this->assertSame('admin:admin@10.10.0.8', $uri->getAuthority());
+	}
+
+	public function testKeepsOriginalParseWhenAuthorityFallbackCannotParseDoubleSlash() {
+		$uri = new Uri('admin:admin@?/x');
+		$this->assertSame('admin', $uri->getScheme());
+		$this->assertSame('admin@', $uri->getPath());
+		$this->assertSame('/x', $uri->getQuery());
+	}
+
+	public function testKeepsOriginalParseWhenAuthorityHostIsNotHostLike() {
+		$uri = new Uri('admin:admin@example/status.xml');
+		$this->assertSame('admin', $uri->getScheme());
+		$this->assertSame('', $uri->getAuthority());
+		$this->assertSame('admin@example/status.xml', $uri->getPath());
+	}
+
+	public function testCanRejectAuthorityFallbackWhenRequiredAuthorityPartsAreMissing() {
+		$uri = new class('admin:admin@10.10.0.8/status.xml') extends Uri {
+			protected function hasRequiredAuthorityParts(array $authorityParts):bool {
+				return false;
+			}
+		};
+
+		$this->assertSame('admin', $uri->getScheme());
+		$this->assertSame('', $uri->getAuthority());
+		$this->assertSame('admin@10.10.0.8/status.xml', $uri->getPath());
+	}
+
+	public function testCanRejectAuthorityFallbackWhenAuthorityPathIsInvalid() {
+		$uri = new class('admin:admin@10.10.0.8/status.xml') extends Uri {
+			protected function isAuthorityPathValid(array $authorityParts):bool {
+				return false;
+			}
+		};
+
+		$this->assertSame('admin', $uri->getScheme());
+		$this->assertSame('', $uri->getAuthority());
+		$this->assertSame('admin@10.10.0.8/status.xml', $uri->getPath());
+	}
+
 	/**
 	 * @dataProvider getPortTestCases
 	 */