Skip to content

Fix bug #74796: Requests through http proxy set peer name #18523

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix bug #74796: Requests through http proxy set peer name #18523

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
175 changes: 175 additions & 0 deletions ext/openssl/tests/bug74796.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
--TEST--
Bug #74796: TLS encryption fails behind HTTP proxy
--EXTENSIONS--
openssl
--SKIPIF--
<?php
if (!function_exists("proc_open")) die("skip no proc_open");
?>
--FILE--
<?php

$serverCode = <<<'CODE'
$serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
$ctx = stream_context_create(['ssl' => [
'SNI_server_certs' => [
"cs.php.net" => __DIR__ . "/sni_server_cs.pem",
"uk.php.net" => __DIR__ . "/sni_server_uk.pem",
"us.php.net" => __DIR__ . "/sni_server_us.pem"
]
]]);

$server = stream_socket_server('tls://127.0.0.1:0', $errno, $errstr, $serverFlags, $ctx);
phpt_notify_server_start($server);

for ($i=0; $i < 3; $i++) {
$conn = stream_socket_accept($server, 3);
fwrite($conn, "HTTP/1.0 200 OK\r\n\r\nHello from server $i");
fclose($conn);
}

phpt_wait();
CODE;

$proxyCode = <<<'CODE'
function parse_sni_from_client_hello($data) {
$sni = null;

if (strlen($data) < 5 || ord($data[0]) != 0x16) return null;

$session_id_len = ord($data[43]);
$ptr = 44 + $session_id_len;

// Cipher suites length
$cipher_suites_len = (ord($data[$ptr]) << 8) | ord($data[$ptr+1]);
$ptr += 2 + $cipher_suites_len;

// Compression methods length
$compression_methods_len = ord($data[$ptr]);
$ptr += 1 + $compression_methods_len;

// Extensions length
if ($ptr + 2 > strlen($data)) return null;
$extensions_len = (ord($data[$ptr]) << 8) | ord($data[$ptr+1]);
$ptr += 2;

$extensions_end = $ptr + $extensions_len;

while ($ptr + 4 <= $extensions_end) {
$ext_type = (ord($data[$ptr]) << 8) | ord($data[$ptr+1]);
$ext_len = (ord($data[$ptr+2]) << 8) | ord($data[$ptr+3]);
$ptr += 4;

if ($ext_type === 0x00) { // SNI extension
if ($ptr + 2 > strlen($data)) break;
$name_list_len = (ord($data[$ptr]) << 8) | ord($data[$ptr+1]);
$ptr += 2;

if ($ptr + 3 > strlen($data)) break;
$name_type = ord($data[$ptr]);
$name_len = (ord($data[$ptr+1]) << 8) | ord($data[$ptr+2]);
$ptr += 3;

if ($name_type === 0) { // host_name type
$sni = substr($data, $ptr, $name_len);
break;
}
}

$ptr += $ext_len;
}

return $sni;
}

$flags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
$server = stream_socket_server("tcp://127.0.0.1:0", $errornum, $errorstr, $flags);
phpt_notify_server_start($server);

for ($i=0; $i < 3; $i++) {
$upstream = stream_socket_client("tcp://{{ ADDR }}", $errornum, $errorstr, 30, STREAM_CLIENT_CONNECT);
stream_set_blocking($upstream, false);

$conn = stream_socket_accept($server);
stream_set_blocking($conn, true);

// reading CONNECT request headers
while (($line = fgets($conn)) !== false) {
if (rtrim($line) === '') break; // empty line means end of headers
}

// successful CONNECT response
fwrite($conn, "HTTP/1.0 200 Connection established\r\n\r\n");

// tunnel data
stream_set_blocking($conn, false);
$firstRead = true;
while (!feof($conn) && !feof($upstream)) {
$clientData = fread($conn, 8192);
if ($clientData !== false && $clientData !== '') {
if ($firstRead) {
$sni = parse_sni_from_client_hello($clientData);
if ($sni !== null) {
file_put_contents(__DIR__ . "/bug74796_proxy_sni.log", $sni . "\n", FILE_APPEND);
}
$firstRead = false;
}
fwrite($upstream, $clientData);
}

$serverData = fread($upstream, 8192);
if ($serverData !== false && $serverData !== '') {
fwrite($conn, $serverData);
}
}
fclose($conn);
fclose($upstream);
phpt_wait();
}
CODE;

$clientCode = <<<'CODE'
$clientCtx = stream_context_create([
'ssl' => [
'cafile' => __DIR__ . '/sni_server_ca.pem',
'verify_peer' => true,
'verify_peer_name' => true,
],
"http" => [
"proxy" => "tcp://{{ ADDR }}"
],
]);

// servers
$hosts = ["cs.php.net", "uk.php.net", "us.php.net"];
foreach ($hosts as $host) {
var_dump(file_get_contents("https://$host/", false, $clientCtx));
var_dump(stream_context_get_options($clientCtx)['ssl']['peer_name'] ?? null);
phpt_notify('proxy');
}

echo file_get_contents(__DIR__ . "/bug74796_proxy_sni.log");

phpt_notify('server');
CODE;

include 'ServerClientTestCase.inc';
ServerClientTestCase::getInstance()->run($clientCode, [
'server' => $serverCode,
'proxy' => $proxyCode,
]);
?>
--CLEAN--
<?php
@unlink(__DIR__ . "/bug74796_proxy_sni.log");
?>
--EXPECT--
string(19) "Hello from server 0"
NULL
string(19) "Hello from server 1"
NULL
string(19) "Hello from server 2"
NULL
cs.php.net
uk.php.net
us.php.net
6 changes: 6 additions & 0 deletions ext/standard/http_fopen_wrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,12 +470,14 @@ static php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper,

if (stream && use_proxy && use_ssl) {
smart_str header = {0};
bool reset_ssl_peer_name = false;

/* Set peer_name or name verification will try to use the proxy server name */
if (!context || (tmpzval = php_stream_context_get_option(context, "ssl", "peer_name")) == NULL) {
ZVAL_STR_COPY(&ssl_proxy_peer_name, resource->host);
php_stream_context_set_option(PHP_STREAM_CONTEXT(stream), "ssl", "peer_name", &ssl_proxy_peer_name);
zval_ptr_dtor(&ssl_proxy_peer_name);
reset_ssl_peer_name = true;
}

smart_str_appendl(&header, "CONNECT ", sizeof("CONNECT ")-1);
Expand Down Expand Up @@ -572,6 +574,10 @@ static php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper,
stream = NULL;
}
}

if (reset_ssl_peer_name) {
php_stream_context_unset_option(PHP_STREAM_CONTEXT(stream), "ssl", "peer_name");
}
}

php_stream_http_response_header_info_init(&header_info);
Expand Down
3 changes: 2 additions & 1 deletion main/streams/php_stream_context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ PHPAPI zval *php_stream_context_get_option(php_stream_context *context,
const char *wrappername, const char *optionname);
PHPAPI void php_stream_context_set_option(php_stream_context *context,
const char *wrappername, const char *optionname, zval *optionvalue);

void php_stream_context_unset_option(php_stream_context *context,
const char *wrappername, const char *optionname);
PHPAPI php_stream_notifier *php_stream_notification_alloc(void);
PHPAPI void php_stream_notification_free(php_stream_notifier *notifier);
END_EXTERN_C()
Expand Down
14 changes: 14 additions & 0 deletions main/streams/streams.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2432,6 +2432,20 @@ PHPAPI void php_stream_context_set_option(php_stream_context *context,
SEPARATE_ARRAY(wrapperhash);
zend_hash_str_update(Z_ARRVAL_P(wrapperhash), optionname, strlen(optionname), optionvalue);
}

void php_stream_context_unset_option(php_stream_context *context,
const char *wrappername, const char *optionname)
{
zval *wrapperhash;

wrapperhash = zend_hash_str_find(Z_ARRVAL(context->options), wrappername, strlen(wrappername));
if (NULL == wrapperhash) {
return;
}
SEPARATE_ARRAY(&context->options);
SEPARATE_ARRAY(wrapperhash);
zend_hash_str_del(Z_ARRVAL_P(wrapperhash), optionname, strlen(optionname));
}
/* }}} */

/* {{{ php_stream_dirent_alphasort */
Expand Down
Loading