Skip to content

Fix GH-15395: avoid copying empty auth password for PHP_AUTH_PW. #15416

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

Closed
wants to merge 4 commits into from
Closed

Fix GH-15395: avoid copying empty auth password for PHP_AUTH_PW. #15416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f31b333
Fix GH-15395: avoid copying empty auth password for PHP_AUTH_PW.
devnexen Aug 14, 2024
71f8824
avoid dangling data during shutdown
devnexen Aug 14, 2024
36b8a2c
update the test framework for the http authentication part.
devnexen Aug 14, 2024
b88425c
fix test
devnexen Aug 14, 2024
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
3 changes: 3 additions & 0 deletions main/SAPI.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,12 +507,15 @@ SAPI_API void sapi_deactivate_module(void)
}
if (SG(request_info).auth_user) {
efree(SG(request_info).auth_user);
SG(request_info).auth_user = NULL;
}
if (SG(request_info).auth_password) {
efree(SG(request_info).auth_password);
SG(request_info).auth_password = NULL;
}
if (SG(request_info).auth_digest) {
efree(SG(request_info).auth_digest);
SG(request_info).auth_digest = NULL;
}
if (SG(request_info).content_type_dup) {
efree(SG(request_info).content_type_dup);
Expand Down
7 changes: 6 additions & 1 deletion main/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2672,7 +2672,12 @@ PHPAPI int php_handle_auth_data(const char *auth)
if (pass) {
*pass++ = '\0';
SG(request_info).auth_user = estrndup(ZSTR_VAL(user), ZSTR_LEN(user));
SG(request_info).auth_password = estrdup(pass);

if (strlen(pass) > 0) {
SG(request_info).auth_password = estrdup(pass);
} else {
SG(request_info).auth_password = NULL;
}
ret = 0;
}
zend_string_free(user);
Expand Down
72 changes: 72 additions & 0 deletions sapi/fpm/tests/gh15395.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
--TEST--
GH-15335 data logging during shutdown
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
<?php

require_once "tester.inc";

$cfg = <<<EOT
[global]
error_log = {{FILE:LOG}}
[unconfined]
listen = {{ADDR:UDS}}
pm = dynamic
pm.max_children = 2
pm.start_servers = 1
pm.min_spare_servers = 1
pm.max_spare_servers = 2
php_admin_value[cgi.fix_pathinfo] = yes
EOT;

$code = <<<EOT
<?php
echo \$_SERVER["SCRIPT_NAME"] . "\n";
echo \$_SERVER["SCRIPT_FILENAME"] . "\n";
echo \$_SERVER["PHP_SELF"];
EOT;

$tester = new FPM\Tester($cfg, $code);
[$sourceFilePath, $scriptName] = $tester->createSourceFileAndScriptName();
$tester->start();
$tester->expectLogStartNotices();
$tester
->request(
uri: $scriptName,
address: '{{ADDR:UDS}}',
scriptFilename: "/",
scriptName: "/",
headers: ["HTTP_AUTHORIZATION" => "Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==", "REQUEST_METHOD" => "GET"],
)
->expectStatus('404 Not Found');
$tester->terminate();
$tester->expectLogTerminatingNotices();
$tester->close();

$tester = new FPM\Tester($cfg, $code);
[$sourceFilePath, $scriptName] = $tester->createSourceFileAndScriptName();
$tester->start();
$tester->expectLogStartNotices();
$tester
->request(
uri: $scriptName,
address: '{{ADDR:UDS}}',
scriptFilename: $sourceFilePath,
scriptName: $scriptName,
)
->expectBody([$scriptName, $sourceFilePath, $scriptName]);
$tester->terminate();
$tester->expectLogTerminatingNotices();
$tester->close();

?>
Done
--EXPECT--
Done
--CLEAN--
<?php
require_once "tester.inc";
FPM\Tester::clean();
?>