Skip to content

ext/openssl: Match IPv6 IPADDR SAN when connecting to bracketed URI #22038

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
iliaal wants to merge 1 commit into
base: PHP-8.4
Choose a base branch
from
+76 −0
Open

ext/openssl: Match IPv6 IPADDR SAN when connecting to bracketed URI #22038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
64 changes: 64 additions & 0 deletions ext/openssl/tests/peer_verification_ipv6_san.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
--TEST--
Peer verification matches an IPADDR SAN when connecting to a bracketed IPv6 URI
--EXTENSIONS--
openssl
--SKIPIF--
<?php
if (!function_exists("proc_open")) die("skip no proc_open");
$probe = @stream_socket_server("tcp://[::1]:0", $errno, $errstr);
if (!$probe) die("skip IPv6 loopback not available");
fclose($probe);
?>
--FILE--
<?php
$certFile = __DIR__ . DIRECTORY_SEPARATOR . 'peer_verification_ipv6_san.pem.tmp';
$cacertFile = __DIR__ . DIRECTORY_SEPARATOR . 'peer_verification_ipv6_san-ca.pem.tmp';

$serverCode = <<<'CODE'
$serverUri = "ssl://[::1]:0";
$serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
$serverCtx = stream_context_create(['ssl' => [
'local_cert' => '%s'
]]);

$server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
phpt_notify_server_start($server);

$client = @stream_socket_accept($server, 3);
if ($client) {
fwrite($client, "HELLO\n");
}
CODE;
$serverCode = sprintf($serverCode, $certFile);

$clientCode = <<<'CODE'
$serverUri = "ssl://{{ ADDR }}";
$clientFlags = STREAM_CLIENT_CONNECT;
$clientCtx = stream_context_create(['ssl' => [
'cafile' => '%s',
]]);

$client = @stream_socket_client($serverUri, $errno, $errstr, 3, $clientFlags, $clientCtx);
if (!$client) {
echo "connect failed: $errstr\n";
return;
}
echo trim(fread($client, 16)), "\n";
CODE;
$clientCode = sprintf($clientCode, $cacertFile);

include 'CertificateGenerator.inc';
$certificateGenerator = new CertificateGenerator();
$certificateGenerator->saveCaCert($cacertFile);
$certificateGenerator->saveNewCertAsFileWithKey('ipv6-san', $certFile, null, 'IP:::1');

include 'ServerClientTestCase.inc';
ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
?>
--CLEAN--
<?php
@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'peer_verification_ipv6_san.pem.tmp');
@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'peer_verification_ipv6_san-ca.pem.tmp');
?>
--EXPECT--
HELLO
12 changes: 12 additions & 0 deletions ext/openssl/xp_ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2760,6 +2760,13 @@ static char *php_openssl_get_url_name(const char *resourcename,
return NULL;
}

if (resourcenamelen >= 2 && resourcename[0] == '[') {
const char *end = memchr(resourcename, ']', resourcenamelen);
if (end != NULL && end > resourcename + 1) {
return pestrndup(resourcename + 1, end - resourcename - 1, is_persistent);
}
}

url = php_url_parse_ex(resourcename, resourcenamelen);
if (!url) {
return NULL;
Expand All @@ -2775,6 +2782,11 @@ static char *php_openssl_get_url_name(const char *resourcename,
--len;
}

if (len >= 2 && host[0] == '[' && host[len-1] == ']') {
host += 1;
len -= 2;
}

if (len) {
url_name = pestrndup(host, len, is_persistent);
}
Expand Down
Loading