Skip to content

ext/uri: Fixes empty url credentials #23816

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

Open
NickSdot wants to merge 3 commits into
base: PHP-8.6
Choose a base branch
from
+373 −4
Open

ext/uri: Fixes empty url credentials #23816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98fe5c5
ext/uri: fixed empty url credentials
NickSdot Sep 21, 2026
b16a7e3
review: removed helpers
NickSdot Sep 30, 2026
fc542e5
review: updated tests
NickSdot Sep 30, 2026
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
38 changes: 38 additions & 0 deletions ext/uri/tests/whatwg/builder/basic_success_empty_reference_with_credentials_in_base.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
--TEST--
Test Uri\WhatWg\UrlBuilder::build() - success - empty reference with credentials in base URL
--FILE--
<?php

$base = new Uri\WhatWg\Url('https://user:pass@example.com:123/base/path?oldQuery#oldFragment');

$url = new Uri\WhatWg\UrlBuilder()
->build($base);

var_dump($url->toAsciiString());
var_dump($url);
var_dump($url->equals(new Uri\WhatWg\Url($url->toAsciiString())));
var_dump($url->equals(new Uri\WhatWg\Url('', $base), Uri\UriComparisonMode::IncludeFragment));

?>
--EXPECTF--
string(52) "https://user:pass@example.com:123/base/path?oldQuery"
object(Uri\WhatWg\Url)#%d (%d) {
["scheme"]=>
string(5) "https"
["username"]=>
string(4) "user"
["password"]=>
string(4) "pass"
["host"]=>
string(11) "example.com"
["port"]=>
int(123)
["path"]=>
string(10) "/base/path"
["query"]=>
string(8) "oldQuery"
["fragment"]=>
NULL
}
bool(true)
bool(true)
39 changes: 39 additions & 0 deletions ext/uri/tests/whatwg/builder/password_success_empty_string_with_base.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
--TEST--
Test Uri\WhatWg\UrlBuilder::setPassword() - success - empty string with credentials in base URL
--FILE--
<?php

$base = new Uri\WhatWg\Url('https://user:pass@example.com/base/path?oldQuery#oldFragment');

$url = new Uri\WhatWg\UrlBuilder()
->setPassword('')
->build($base);

var_dump($url->toAsciiString());
var_dump($url);
var_dump($url->equals(new Uri\WhatWg\Url($url->toAsciiString())));
var_dump($url->equals(new Uri\WhatWg\Url('', $base), Uri\UriComparisonMode::IncludeFragment));

?>
--EXPECTF--
string(48) "https://user:pass@example.com/base/path?oldQuery"
object(Uri\WhatWg\Url)#%d (%d) {
["scheme"]=>
string(5) "https"
["username"]=>
string(4) "user"
["password"]=>
string(4) "pass"
["host"]=>
string(11) "example.com"
["port"]=>
NULL
["path"]=>
string(10) "/base/path"
["query"]=>
string(8) "oldQuery"
["fragment"]=>
NULL
}
bool(true)
bool(true)
37 changes: 37 additions & 0 deletions ext/uri/tests/whatwg/builder/password_success_empty_string_with_file_scheme.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
--TEST--
Test Uri\WhatWg\UrlBuilder::setPassword() - success - empty string with file scheme
--FILE--
<?php

$url = new Uri\WhatWg\UrlBuilder()
->setScheme('file')
->setPassword('')
->setHost('example.net')
->build();

var_dump($url->toAsciiString());
var_dump($url);
var_dump($url->equals(new Uri\WhatWg\Url($url->toAsciiString())));

?>
--EXPECTF--
string(19) "file://example.net/"
object(Uri\WhatWg\Url)#%d (%d) {
["scheme"]=>
string(4) "file"
["username"]=>
NULL
["password"]=>
NULL
["host"]=>
string(11) "example.net"
["port"]=>
NULL
["path"]=>
string(1) "/"
["query"]=>
NULL
["fragment"]=>
NULL
}
bool(true)
50 changes: 50 additions & 0 deletions ext/uri/tests/whatwg/builder/password_success_empty_string_with_localhost_and_file_base.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
--TEST--
Test Uri\WhatWg\UrlBuilder::setPassword() - success - empty string with localhost and file base URL
--FILE--
<?php

$base = new Uri\WhatWg\Url('file:///base/path');

$errors = [];
$referenceErrors = [];

$reference = new Uri\WhatWg\Url('//localhost', $base, $referenceErrors);

$url = new Uri\WhatWg\UrlBuilder()
->setHost('localhost')
->setPassword('')
->build($base, $errors);

var_dump($url->toAsciiString());
var_dump($url);
var_dump($errors);
var_dump($errors == $referenceErrors);
var_dump($url->equals(new Uri\WhatWg\Url($url->toAsciiString())));
var_dump($url->equals($reference, Uri\UriComparisonMode::IncludeFragment));

?>
--EXPECTF--
string(8) "file:///"
object(Uri\WhatWg\Url)#%d (%d) {
["scheme"]=>
string(4) "file"
["username"]=>
NULL
["password"]=>
NULL
["host"]=>
string(0) ""
["port"]=>
NULL
["path"]=>
string(1) "/"
["query"]=>
NULL
["fragment"]=>
NULL
}
array(0) {
}
bool(true)
bool(true)
bool(true)
59 changes: 59 additions & 0 deletions ...hatwg/builder/password_success_empty_string_with_normalized_empty_host_and_file_base.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
--TEST--
Test Uri\WhatWg\UrlBuilder::setPassword() - success - empty string with host normalised to empty and file base URL
--FILE--
<?php

$base = new Uri\WhatWg\Url('file:///base/path');

$errors = [];
$referenceErrors = [];

$reference = new Uri\WhatWg\Url("//\t\n", $base, $referenceErrors);

$url = new Uri\WhatWg\UrlBuilder()
->setHost("\t\n")
->setPassword('')
->build($base, $errors);

var_dump($url->toAsciiString());
var_dump($url);
var_dump($errors);
var_dump($errors == $referenceErrors);
var_dump($url->equals(new Uri\WhatWg\Url($url->toAsciiString())));
var_dump($url->equals($reference, Uri\UriComparisonMode::IncludeFragment));

?>
--EXPECTF--
string(8) "file:///"
object(Uri\WhatWg\Url)#%d (%d) {
["scheme"]=>
string(4) "file"
["username"]=>
NULL
["password"]=>
NULL
["host"]=>
string(0) ""
["port"]=>
NULL
["path"]=>
string(1) "/"
["query"]=>
NULL
["fragment"]=>
NULL
}
array(1) {
[0]=>
object(Uri\WhatWg\UrlValidationError)#%d (%d) {
["context"]=>
string(2) "%r\x09\x0A%r"
["type"]=>
enum(Uri\WhatWg\UrlValidationErrorType::InvalidUrlUnit)
["failure"]=>
bool(false)
}
}
bool(true)
bool(true)
bool(true)
39 changes: 39 additions & 0 deletions ext/uri/tests/whatwg/builder/username_success_empty_string_with_base.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
--TEST--
Test Uri\WhatWg\UrlBuilder::setUsername() - success - empty string with credentials in base URL
--FILE--
<?php

$base = new Uri\WhatWg\Url('https://user:pass@example.com/base/path?oldQuery#oldFragment');

$url = new Uri\WhatWg\UrlBuilder()
->setUsername('')
->build($base);

var_dump($url->toAsciiString());
var_dump($url);
var_dump($url->equals(new Uri\WhatWg\Url($url->toAsciiString())));
var_dump($url->equals(new Uri\WhatWg\Url('', $base), Uri\UriComparisonMode::IncludeFragment));

?>
--EXPECTF--
string(48) "https://user:pass@example.com/base/path?oldQuery"
object(Uri\WhatWg\Url)#%d (%d) {
["scheme"]=>
string(5) "https"
["username"]=>
string(4) "user"
["password"]=>
string(4) "pass"
["host"]=>
string(11) "example.com"
["port"]=>
NULL
["path"]=>
string(10) "/base/path"
["query"]=>
string(8) "oldQuery"
["fragment"]=>
NULL
}
bool(true)
bool(true)
50 changes: 50 additions & 0 deletions ...uri/tests/whatwg/builder/username_success_empty_string_with_empty_host_and_file_base.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
--TEST--
Test Uri\WhatWg\UrlBuilder::setUsername() - success - empty string with empty host and file base URL
--FILE--
<?php

$base = new Uri\WhatWg\Url('file:///base/path');

$errors = [];
$referenceErrors = [];

$reference = new Uri\WhatWg\Url('//', $base, $referenceErrors);

$url = new Uri\WhatWg\UrlBuilder()
->setHost('')
->setUsername('')
->build($base, $errors);

var_dump($url->toAsciiString());
var_dump($url);
var_dump($errors);
var_dump($errors == $referenceErrors);
var_dump($url->equals(new Uri\WhatWg\Url($url->toAsciiString())));
var_dump($url->equals($reference, Uri\UriComparisonMode::IncludeFragment));

?>
--EXPECTF--
string(8) "file:///"
object(Uri\WhatWg\Url)#%d (%d) {
["scheme"]=>
string(4) "file"
["username"]=>
NULL
["password"]=>
NULL
["host"]=>
string(0) ""
["port"]=>
NULL
["path"]=>
string(1) "/"
["query"]=>
NULL
["fragment"]=>
NULL
}
array(0) {
}
bool(true)
bool(true)
bool(true)
40 changes: 40 additions & 0 deletions ext/uri/tests/whatwg/builder/username_success_empty_string_with_file_base.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
--TEST--
Test Uri\WhatWg\UrlBuilder::setUsername() - success - empty string with file base URL
--FILE--
<?php

$base = new Uri\WhatWg\Url('file:///base/path?oldQuery#oldFragment');

$url = new Uri\WhatWg\UrlBuilder()
->setUsername('')
->setHost('example.net')
->build($base);

var_dump($url->toAsciiString());
var_dump($url);
var_dump($url->equals(new Uri\WhatWg\Url($url->toAsciiString())));
var_dump($url->equals(new Uri\WhatWg\Url('//example.net', $base), Uri\UriComparisonMode::IncludeFragment));

?>
--EXPECTF--
string(19) "file://example.net/"
object(Uri\WhatWg\Url)#%d (8) {
["scheme"]=>
string(4) "file"
["username"]=>
NULL
["password"]=>
NULL
["host"]=>
string(11) "example.net"
["port"]=>
NULL
["path"]=>
string(1) "/"
["query"]=>
NULL
["fragment"]=>
NULL
}
bool(true)
bool(true)
17 changes: 17 additions & 0 deletions ext/uri/tests/whatwg/modification/password_success_empty_string_with_existing_password.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
--TEST--
Test Uri\WhatWg\Url::withPassword() - success - empty string removes existing password
--FILE--
<?php

$url1 = new Uri\WhatWg\Url('https://user:pass@example.com/path');
$url2 = $url1->withPassword('');

var_dump($url1->getPassword());
var_dump($url2->getPassword());
var_dump($url2->toAsciiString());

?>
--EXPECT--
string(4) "pass"
string(0) ""
string(29) "https://user@example.com/path"
Loading
Loading