fix: detect host-like parts

closes #236

Author: g105b

composer.json

@@ -38,7 +38,7 @@
 
 	"scripts": {
 		"phpunit": "vendor/bin/phpunit --configuration phpunit.xml",
-		"phpstan": "vendor/bin/phpstan analyse --level 6 src",
+		"phpstan": "vendor/bin/phpstan analyse --memory-limit=512M --level 6 src",
 		"phpcs": "vendor/bin/phpcs src --standard=phpcs.xml",
 		"phpmd": "vendor/bin/phpmd src/ text phpmd.xml",
 		"test": [

src/Uri.php

@@ -42,6 +42,11 @@ protected function parseUri(string $uri):false|array {
 			return $authorityStyleParts;
 		}
 
+		$hostLikeParts = $this->parseHostLikeParts($uri, $parts);
+		if(!is_null($hostLikeParts)) {
+			return $hostLikeParts;
+		}
+
 		return $parts;
 	}
 
@@ -77,6 +82,34 @@ protected function parseAuthorityStyleParts(
 		return $authorityParts;
 	}
 
+	/**
+	 * @param array<string, int|string> $parts
+	 * @return null|array<string, int|string>
+	 */
+	protected function parseHostLikeParts(
+		string $uri,
+		array $parts
+	):?array {
+		if(!$this->canBeHostLikeUri($uri, $parts)) {
+			return null;
+		}
+
+		$hostLikeParts = parse_url("//" . $uri);
+		if($hostLikeParts === false || !isset($hostLikeParts["host"])) {
+			return null;
+		}
+
+		if(!$this->isAuthorityPathValid($hostLikeParts)) {
+			return null;
+		}
+
+		if(!$this->isAuthorityHostLike($hostLikeParts)) {
+			return null;
+		}
+
+		return $hostLikeParts;
+	}
+
 	/** @param array<string, int|string> $parts */
 	protected function canBeAuthorityStyleUri(string $uri, array $parts):bool {
 		if(str_contains($uri, "://")) {
@@ -91,6 +124,29 @@ protected function canBeAuthorityStyleUri(string $uri, array $parts):bool {
 		return str_contains($path, "@");
 	}
 
+	/** @param array<string, int|string> $parts */
+	protected function canBeHostLikeUri(string $uri, array $parts):bool {
+		if(str_contains($uri, "://")) {
+			return false;
+		}
+
+		if(isset($parts["host"]) || !isset($parts["path"])) {
+			return false;
+		}
+
+		if(isset($parts["scheme"])) {
+			return false;
+		}
+
+		$path = (string)$parts["path"];
+		if($path === "" || str_starts_with($path, "/")) {
+			return false;
+		}
+
+		$firstSegment = explode("/", $path, 2)[0];
+		return $this->isHostLikeString($firstSegment);
+	}
+
 	/** @param array<string, int|string> $authorityParts */
 	protected function hasRequiredAuthorityParts(array $authorityParts):bool {
 		return isset($authorityParts["user"], $authorityParts["pass"], $authorityParts["host"]);
@@ -104,7 +160,16 @@ protected function isAuthorityPathValid(array $authorityParts):bool {
 
 	/** @param array<string, int|string> $authorityParts */
 	protected function isAuthorityHostLike(array $authorityParts):bool {
-		$host = (string)$authorityParts["host"];
+		return $this->isHostLikeString((string)$authorityParts["host"]);
+	}
+
+	protected function isHostLikeString(string $host):bool {
+		if($host === "."
+			|| $host === ".."
+			|| str_starts_with($host, ".")) {
+			return false;
+		}
+
 		if(filter_var($host, FILTER_VALIDATE_IP) !== false) {
 			return true;
 		}

test/phpunit/UriTest.php

@@ -638,4 +638,29 @@ public function testGetQueryValue() {
 		self::assertSame("orange", $uri->getQueryValue("colour"));
 		self::assertNull($uri->getQueryValue("age"));
 	}
+
+	public function testConstruct_noPathJustHost():void {
+		$uri = new Uri("10.0.0.1");
+		self::assertSame("10.0.0.1", $uri->getHost());
+	}
+
+	public function testConstruct_pathAndHost():void {
+		$uri = new Uri("10.0.0.1/tagbatch");
+		self::assertSame("10.0.0.1", $uri->getHost());
+		self::assertSame("/tagbatch", $uri->getPath());
+	}
+
+	public function testConstruct_pathWithQueryAndHost():void {
+		$uri = new Uri("10.0.0.1/tagbatch?id=123");
+		self::assertSame("10.0.0.1", $uri->getHost());
+		self::assertSame("/tagbatch", $uri->getPath());
+		self::assertSame("id=123", $uri->getQuery());
+		self::assertSame("123", $uri->getQueryValue("id"));
+	}
+
+	public function testConstruct_pathWithQueryAndHostAndPort():void {
+		$uri = new Uri("10.0.0.1:4321/tagbatch?id=123");
+		self::assertSame("10.0.0.1", $uri->getHost());
+		self::assertSame(4321, $uri->getPort());
+	}
 }