Skip to content

Commit

Permalink
Allow undescore character in Uri host
Browse files Browse the repository at this point in the history
I don't understand why this validity check has be added.
Has per rfc 2181 (https://datatracker.ietf.org/doc/html/rfc2181#section-11), underscore are valid character to use in an uri host.

For my specific usage, it broke for requests using docker internal hostnames.

added test to prevent regression on URI containing underscore in host
  • Loading branch information
lulhum committed Aug 18, 2024
1 parent 8111281 commit a65d400
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/Message/Uri.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public function __construct($uri)
}
// @codeCoverageIgnoreEnd

if ($parts === false || (isset($parts['scheme']) && !\preg_match('#^[a-z]+$#i', $parts['scheme'])) || (isset($parts['host']) && \preg_match('#[\s_%+]#', $parts['host']))) {
if ($parts === false || (isset($parts['scheme']) && !\preg_match('#^[a-z]+$#i', $parts['scheme'])) || (isset($parts['host']) && \preg_match('#[\s%+]#', $parts['host']))) {
throw new \InvalidArgumentException('Invalid URI given');
}

Expand Down Expand Up @@ -173,7 +173,7 @@ public function withHost($host)
return $this;
}

if (\preg_match('#[\s_%+]#', $host) || ($host !== '' && \parse_url('http://' . $host, \PHP_URL_HOST) !== $host)) {
if (\preg_match('#[\s%+]#', $host) || ($host !== '' && \parse_url('http://' . $host, \PHP_URL_HOST) !== $host)) {
throw new \InvalidArgumentException('Invalid URI host given');
}

Expand Down
5 changes: 4 additions & 1 deletion tests/Message/UriTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,10 @@ public static function provideValidUris()
),
array(
'http://user%20name:pass%20word@localhost/path%20name?query%20name#frag%20ment'
)
),
array(
'http://docker_container/'
),
);
}

Expand Down

0 comments on commit a65d400

Please sign in to comment.