Skip to content

Fix timeout after supplemental read of non-blocking stream #22346

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

Fix timeout after supplemental read of non-blocking stream #22346

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
90 changes: 90 additions & 0 deletions ext/openssl/tests/stream_supplemental_read_timeout.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
--TEST--
Supplemental read of blocking stream does not cause timeout
--EXTENSIONS--
openssl
--SKIPIF--
<?php
if (!function_exists("proc_open")) die("skip no proc_open");
?>
--FILE--
<?php
$certFile = __DIR__ . DIRECTORY_SEPARATOR . 'crypto_supplemental_read_timeout.pem.tmp';
$peerName = 'crypto-supplemental-read-timeout';

$serverCode = <<<'CODE'
$ctx = stream_context_create(['ssl' => ['local_cert' => '%s']]);
$flags = STREAM_SERVER_BIND|STREAM_SERVER_LISTEN;
$server = stream_socket_server("tls://127.0.0.1:0", $errno, $errstr, $flags, $ctx);
phpt_notify_server_start($server);

$conn = stream_socket_accept($server, 30);

fwrite($conn, "hello\n");

phpt_wait();
fclose($conn);
CODE;
$serverCode = sprintf($serverCode, $certFile);

$clientCode = <<<'CODE'
$ctx = stream_context_create(['ssl' => [
'verify_peer' => false,
'verify_peer_name' => false,
'peer_name' => '%s',
]]);

$client = stream_socket_client("tls://{{ ADDR }}", $errno, $errstr, 30, STREAM_CLIENT_CONNECT, $ctx);
stream_set_blocking($client, true);
stream_set_timeout($client, 5);
$start = hrtime(true);

$buf = '';
$read = [$client];
$write = $except = null;
while (true) {
if (!stream_select($read, $write, $except, 5)) {
break;
}

// Initially, read only the first char, then request more than is stored
// in the buffer, triggering a supplemental read.
$chunk = fread($client, strlen($buf) === 0 ? 1 : 10);
if ($chunk === '' || $chunk === false) {
/* A non-application record (e.g. a TLS 1.3 session ticket) may arrive first. */
if (feof($client)) {
break;
}
} else {
$buf .= $chunk;
if (strlen($buf) >= 6) {
break;
}
}
$read = [$client];
$write = $except = null;
}

echo trim($buf), "\n";

$diff = (hrtime(true) - $start) / 1e9;
var_dump($diff < 4.0);

phpt_notify();
fclose($client);
CODE;
$clientCode = sprintf($clientCode, $peerName);

include 'CertificateGenerator.inc';
$certificateGenerator = new CertificateGenerator();
$certificateGenerator->saveNewCertAsFileWithKey($peerName, $certFile);

include 'ServerClientTestCase.inc';
ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
?>
--CLEAN--
<?php
@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'crypto_supplemental_read_timeout.pem.tmp');
?>
--EXPECT--
hello
bool(true)
12 changes: 8 additions & 4 deletions ext/openssl/xp_ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2069,7 +2069,11 @@ static ssize_t php_openssl_sockop_io(int read, php_stream *stream, char *buf, si

/* Only do this if SSL is active. */
if (sslsock->ssl_active) {
int retry = 1;
/* We have already returned some buffered data. Don't retry and don't
* block. We're just trying to fill the buffer more, but the stream might
* be empty, so we don't want to wait in vain. */
bool supplemental = stream->has_buffered_data;
int retry = !supplemental;
struct timeval start_time;
struct timeval *timeout = NULL;
int began_blocked = sslsock->s.is_blocked;
Expand All @@ -2082,11 +2086,11 @@ static ssize_t php_openssl_sockop_io(int read, php_stream *stream, char *buf, si
}

/* never use a timeout with non-blocking sockets */
if (began_blocked) {
if (began_blocked && !supplemental) {
timeout = &sslsock->s.timeout;
}

if (timeout) {
if (timeout || supplemental) {
php_openssl_set_blocking(sslsock, 0);
}

Expand Down Expand Up @@ -2160,7 +2164,7 @@ static ssize_t php_openssl_sockop_io(int read, php_stream *stream, char *buf, si
}

/* Don't loop indefinitely in non-blocking mode if no data is available */
if (began_blocked == 0) {
if (began_blocked == 0 || supplemental) {
break;
}

Expand Down
Loading