Skip to content

ext/session: check the created ID before validating it #22924

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
+55 −0
Open

ext/session: check the created ID before validating it #22924

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
6 changes: 6 additions & 0 deletions ext/session/session.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2505,6 +2505,9 @@ PHP_FUNCTION(session_create_id)
int limit = 3;
while (limit--) {
new_id = PS(mod)->s_create_sid(&PS(mod_data));
if (!new_id) {
break;
}
if (!PS(mod)->s_validate_sid || (PS(mod_user_implemented) && Z_ISUNDEF(PS(mod_user_names).ps_validate_sid))) {
break;
} else {
Expand All @@ -2526,6 +2529,9 @@ PHP_FUNCTION(session_create_id)
zend_string_release_ex(new_id, 0);
} else {
smart_str_free(&id);
if (EG(exception)) {
RETURN_THROWS();
}
php_error_docref(NULL, E_WARNING, "Failed to create new ID");
RETURN_FALSE;
}
Expand Down
49 changes: 49 additions & 0 deletions ext/session/tests/user_session_module/session_create_id_create_sid_throws.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
--TEST--
session_create_id() when the create_sid handler throws
--INI--
session.save_handler=files
session.name=PHPSESSID
session.gc_probability=0
--EXTENSIONS--
session
--FILE--
<?php

ob_start();

class MySessionHandler extends SessionHandler
{
public int $calls = 0;

public function create_sid(): string
{
if ($this->calls++ > 0) {
throw new Exception('create_sid failed');
}
return parent::create_sid();
}

public function validateId(string $id): bool
{
return false;
}
}

session_set_save_handler(new MySessionHandler(), true);
session_start();

try {
session_create_id();
} catch (Throwable $e) {
echo $e::class, ": ", $e->getMessage(), PHP_EOL;
$previous = $e->getPrevious();
echo $previous::class, ": ", $previous->getMessage(), PHP_EOL;
}

var_dump(session_status() === PHP_SESSION_ACTIVE);

?>
--EXPECT--
Error: Session id must be a string
Exception: create_sid failed
bool(true)
Loading