Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
59 changes: 41 additions & 18 deletions ext/openssl/tests/gh9310.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,21 @@ $certificateGenerator->saveNewCertAndKey('gh9310', $certFile, $pkFile);

copy($certFile, $baseDirCertFile);
copy($pkFile, $baseDirPkFile);
copy(__DIR__ . '/sni_server_uk_cert.pem', $baseDir . '/sni_server_uk_cert.pem');

$sniCaFile = __DIR__ . '/gh9310_sni_ca.pem.tmp';
$sniCsFile = __DIR__ . '/gh9310_sni_cs.pem.tmp';
$sniUkCertFile = __DIR__ . '/gh9310_sni_uk_cert.pem.tmp';
$sniUkKeyFile = __DIR__ . '/gh9310_sni_uk_key.pem.tmp';
$sniUsCertFile = __DIR__ . '/gh9310_sni_us_cert.pem.tmp';
$sniUsKeyFile = __DIR__ . '/gh9310_sni_us_key.pem.tmp';
$baseDirSniUkCertFile = $baseDir . '/sni_uk_cert.pem';

$certificateGenerator->saveCaCert($sniCaFile);
$certificateGenerator->saveNewCertAsFileWithKey('cs.php.net', $sniCsFile);
$certificateGenerator->saveNewCertAndKey('uk.php.net', $sniUkCertFile, $sniUkKeyFile);
$certificateGenerator->saveNewCertAndKey('us.php.net', $sniUsCertFile, $sniUsKeyFile);

copy($sniUkCertFile, $baseDirSniUkCertFile);


$serverCodeTemplate = <<<'CODE'
Expand Down Expand Up @@ -60,7 +74,7 @@ $sniServerCodeV1 = <<<'CODE'
$flags = STREAM_SERVER_BIND|STREAM_SERVER_LISTEN;
$ctx = stream_context_create(['ssl' => [
'SNI_server_certs' => [
"cs.php.net" => __DIR__ . "/sni_server_cs.pem",
"cs.php.net" => '%s',
]
]]);

Expand All @@ -69,6 +83,7 @@ $sniServerCodeV1 = <<<'CODE'

stream_socket_accept($server);
CODE;
$sniServerCodeV1 = sprintf($sniServerCodeV1, $sniCsFile);

$sniServerCodeV2 = <<<'CODE'
ini_set('log_errors', 'On');
Expand All @@ -77,8 +92,8 @@ $sniServerCodeV2 = <<<'CODE'
$ctx = stream_context_create(['ssl' => [
'SNI_server_certs' => [
"uk.php.net" => [
'local_cert' => __DIR__ . '/gh9310/sni_server_uk_cert.pem',
'local_pk' => __DIR__ . '/sni_server_uk_key.pem',
'local_cert' => '%s',
'local_pk' => '%s',
]
]
]]);
Expand All @@ -88,6 +103,7 @@ $sniServerCodeV2 = <<<'CODE'

stream_socket_accept($server);
CODE;
$sniServerCodeV2 = sprintf($sniServerCodeV2, $baseDirSniUkCertFile, $sniUkKeyFile);

$sniServerCodeV3 = <<<'CODE'
ini_set('log_errors', 'On');
Expand All @@ -96,8 +112,8 @@ $sniServerCodeV3 = <<<'CODE'
$ctx = stream_context_create(['ssl' => [
'SNI_server_certs' => [
"us.php.net" => [
'local_cert' => __DIR__ . '/sni_server_us_cert.pem',
'local_pk' => __DIR__ . '/sni_server_us_key.pem',
'local_cert' => '%s',
'local_pk' => '%s',
]
]
]]);
Expand All @@ -107,14 +123,15 @@ $sniServerCodeV3 = <<<'CODE'

stream_socket_accept($server);
CODE;
$sniServerCodeV3 = sprintf($sniServerCodeV3, $sniUsCertFile, $sniUsKeyFile);

$sniClientCodeTemplate = <<<'CODE'
$flags = STREAM_CLIENT_CONNECT;
$ctxArr = [
'cafile' => __DIR__ . '/sni_server_ca.pem',
'cafile' => '%s',
'peer_name' => '%s',
];

$ctxArr['peer_name'] = '%s';
$ctx = stream_context_create(['ssl' => $ctxArr]);
@stream_socket_client("tls://{{ ADDR }}", $errno, $errstr, 1, $flags, $ctx);
CODE;
Expand All @@ -131,13 +148,13 @@ ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
$serverCode = sprintf($serverCodeTemplate, $baseDirCertFile, $pkFile);
ServerClientTestCase::getInstance()->run($clientCode, $serverCode);

$sniClientCode = sprintf($sniClientCodeTemplate, 'cs.php.net');
$sniClientCode = sprintf($sniClientCodeTemplate, $sniCaFile, 'cs.php.net');
ServerClientTestCase::getInstance()->run($sniClientCode, $sniServerCodeV1);

$sniClientCode = sprintf($sniClientCodeTemplate, 'uk.php.net');
$sniClientCode = sprintf($sniClientCodeTemplate, $sniCaFile, 'uk.php.net');
ServerClientTestCase::getInstance()->run($sniClientCode, $sniServerCodeV2);

$sniClientCode = sprintf($sniClientCodeTemplate, 'us.php.net');
$sniClientCode = sprintf($sniClientCodeTemplate, $sniCaFile, 'us.php.net');
ServerClientTestCase::getInstance()->run($sniClientCode, $sniServerCodeV3);

?>
Expand All @@ -149,7 +166,13 @@ $baseDir = __DIR__ . '/gh9310';
@unlink(__DIR__ . '/gh9310.key');
@unlink($baseDir . '/cert.crt');
@unlink($baseDir . '/private.key');
@unlink($baseDir . '/sni_server_uk_cert.pem');
@unlink($baseDir . '/sni_uk_cert.pem');
@unlink(__DIR__ . '/gh9310_sni_ca.pem.tmp');
@unlink(__DIR__ . '/gh9310_sni_cs.pem.tmp');
@unlink(__DIR__ . '/gh9310_sni_uk_cert.pem.tmp');
@unlink(__DIR__ . '/gh9310_sni_uk_key.pem.tmp');
@unlink(__DIR__ . '/gh9310_sni_us_cert.pem.tmp');
@unlink(__DIR__ . '/gh9310_sni_us_key.pem.tmp');
@rmdir($baseDir);
?>
--EXPECTF--
Expand All @@ -169,15 +192,15 @@ PHP Warning: stream_socket_accept(): open_basedir restriction in effect. File(%
PHP Warning: stream_socket_accept(): Unable to get real path of private key file `%sgh9310.key' in %s
PHP Warning: stream_socket_accept(): Failed to enable crypto in %s
PHP Warning: stream_socket_accept(): Accept failed: %s
PHP Warning: stream_socket_accept(): open_basedir restriction in effect. File(%ssni_server_cs.pem) is not within the allowed path(s): (%sgh9310) in %s
PHP Warning: stream_socket_accept(): Failed setting local cert chain file `%ssni_server_cs.pem'; file not found in %s
PHP Warning: stream_socket_accept(): open_basedir restriction in effect. File(%sgh9310_sni_cs.pem.tmp) is not within the allowed path(s): (%sgh9310) in %s
PHP Warning: stream_socket_accept(): Failed setting local cert chain file `%sgh9310_sni_cs.pem.tmp'; file not found in %s
PHP Warning: stream_socket_accept(): Failed to enable crypto in %s
PHP Warning: stream_socket_accept(): Accept failed: %s
PHP Warning: stream_socket_accept(): open_basedir restriction in effect. File(%ssni_server_uk_key.pem) is not within the allowed path(s): (%sgh9310) in %s
PHP Warning: stream_socket_accept(): Failed setting local private key file `%ssni_server_uk_key.pem'; could not open file in %s
PHP Warning: stream_socket_accept(): open_basedir restriction in effect. File(%sgh9310_sni_uk_key.pem.tmp) is not within the allowed path(s): (%sgh9310) in %s
PHP Warning: stream_socket_accept(): Failed setting local private key file `%sgh9310_sni_uk_key.pem.tmp'; could not open file in %s
PHP Warning: stream_socket_accept(): Failed to enable crypto in %s
PHP Warning: stream_socket_accept(): Accept failed: %s
PHP Warning: stream_socket_accept(): open_basedir restriction in effect. File(%ssni_server_us_cert.pem) is not within the allowed path(s): (%sgh9310) in %s
PHP Warning: stream_socket_accept(): Failed setting local cert chain file `%ssni_server_us_cert.pem'; could not open file in %s
PHP Warning: stream_socket_accept(): open_basedir restriction in effect. File(%sgh9310_sni_us_cert.pem.tmp) is not within the allowed path(s): (%sgh9310) in %s
PHP Warning: stream_socket_accept(): Failed setting local cert chain file `%sgh9310_sni_us_cert.pem.tmp'; could not open file in %s
PHP Warning: stream_socket_accept(): Failed to enable crypto in %s
PHP Warning: stream_socket_accept(): Accept failed: %s
2 changes: 1 addition & 1 deletion ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ $cert = "file://" . __DIR__ . "/cert.crt";
$bert = "file://" . __DIR__ . "/bug41033.pem";
$sert = "file://" . __DIR__ . "/san-cert.pem";
$cpca = __DIR__ . "/san-cert.pem";
$utfl = __DIR__ . "/sni_server_uk.pem";
$utfl = __DIR__ . "/sni_server.pem";
$rcrt = openssl_x509_read($cert);

/* int openssl_x509_checkpurpose ( mixed $x509cert , int $purpose); */
Expand Down
2 changes: 1 addition & 1 deletion ext/openssl/tests/openssl_x509_export_to_file_leak.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ openssl
--FILE--
<?php

$path = "file://" . __DIR__ . "/sni_server_ca.pem";
$path = "file://" . __DIR__ . "/cert.crt";
var_dump(openssl_x509_export_to_file($path, str_repeat("a", 10000)));

?>
Expand Down
29 changes: 25 additions & 4 deletions ext/openssl/tests/sni_server.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,25 @@ if (!function_exists("proc_open")) die("skip no proc_open");
?>
--FILE--
<?php
$caFile = __DIR__ . DIRECTORY_SEPARATOR . 'sni_server_ca.pem.tmp';
$csFile = __DIR__ . DIRECTORY_SEPARATOR . 'sni_server_cs.pem.tmp';
$ukFile = __DIR__ . DIRECTORY_SEPARATOR . 'sni_server_uk.pem.tmp';
$usFile = __DIR__ . DIRECTORY_SEPARATOR . 'sni_server_us.pem.tmp';

include 'CertificateGenerator.inc';
$certificateGenerator = new CertificateGenerator();
$certificateGenerator->saveCaCert($caFile);
$certificateGenerator->saveNewCertAsFileWithKey('cs.php.net', $csFile);
$certificateGenerator->saveNewCertAsFileWithKey('uk.php.net', $ukFile);
$certificateGenerator->saveNewCertAsFileWithKey('us.php.net', $usFile);

$serverCode = <<<'CODE'
$flags = 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"
"cs.php.net" => '%s',
"uk.php.net" => '%s',
"us.php.net" => '%s',
]
]]);

Expand All @@ -25,11 +37,12 @@ $serverCode = <<<'CODE'
@stream_socket_accept($server, 3);
}
CODE;
$serverCode = sprintf($serverCode, $csFile, $ukFile, $usFile);

$clientCode = <<<'CODE'
$flags = STREAM_CLIENT_CONNECT;
$ctxArr = [
'cafile' => __DIR__ . '/sni_server_ca.pem',
'cafile' => '%s',
'capture_peer_cert' => true
];

Expand All @@ -51,10 +64,18 @@ $clientCode = <<<'CODE'
$cert = stream_context_get_options($ctx)['ssl']['peer_certificate'];
var_dump(openssl_x509_parse($cert)['subject']['CN']);
CODE;
$clientCode = sprintf($clientCode, $caFile);

include 'ServerClientTestCase.inc';
ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
?>
--CLEAN--
<?php
@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'sni_server_ca.pem.tmp');
@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'sni_server_cs.pem.tmp');
@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'sni_server_uk.pem.tmp');
@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'sni_server_us.pem.tmp');
?>
--EXPECTF--
string(%d) "cs.php.net"
string(%d) "uk.php.net"
Expand Down
63 changes: 0 additions & 63 deletions ext/openssl/tests/sni_server_ca.pem

This file was deleted.

57 changes: 0 additions & 57 deletions ext/openssl/tests/sni_server_cs.pem

This file was deleted.

30 changes: 0 additions & 30 deletions ext/openssl/tests/sni_server_cs_cert.pem

This file was deleted.

Loading
Loading