From 80026e3019615769e41095a857354d016f5e887c Mon Sep 17 00:00:00 2001 From: Jorg Sowa Date: Thu, 12 Nov 2026 18:41:42 +0100 Subject: [PATCH] Fix new empty sessions never being stored with lazy_write and strict mode With lazy_write, an empty new session triggered updateTimestamp() instead of write(). Handlers whose updateTimestamp() does not create records never stored it, so strict mode rejected the ID and issued a new one on every request. --- ext/session/session.c | 6 ++- .../lazy_write_new_session_id_no_id.phpt | 41 +++++++++++++++++ .../lazy_write_new_session_id_rejected.phpt | 44 +++++++++++++++++++ 3 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 ext/session/tests/user_session_module/lazy_write_new_session_id_no_id.phpt create mode 100644 ext/session/tests/user_session_module/lazy_write_new_session_id_rejected.phpt diff --git a/ext/session/session.c b/ext/session/session.c index 81c4455808bf..054d99458033 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -428,6 +428,7 @@ static zend_long php_session_gc(bool immediate) static zend_result php_session_initialize(void) { zend_string *val = NULL; + bool is_new_id = false; PS(session_status) = php_session_active; @@ -462,6 +463,7 @@ static zend_result php_session_initialize(void) } return FAILURE; } + is_new_id = true; if (PS(use_cookies)) { PS(send_cookie) = true; } @@ -478,6 +480,7 @@ static zend_result php_session_initialize(void) } return FAILURE; } + is_new_id = true; if (PS(use_cookies)) { PS(send_cookie) = true; } @@ -507,7 +510,8 @@ static zend_result php_session_initialize(void) PS(session_vars) = NULL; } if (val) { - if (PS(lazy_write)) { + /* A new ID has no stored record yet, so lazy_write must not skip the write */ + if (PS(lazy_write) && !is_new_id) { PS(session_vars) = zend_string_copy(val); } php_session_decode(val); diff --git a/ext/session/tests/user_session_module/lazy_write_new_session_id_no_id.phpt b/ext/session/tests/user_session_module/lazy_write_new_session_id_no_id.phpt new file mode 100644 index 000000000000..6d87c88a6911 --- /dev/null +++ b/ext/session/tests/user_session_module/lazy_write_new_session_id_no_id.phpt @@ -0,0 +1,41 @@ +--TEST-- +lazy_write stores a new empty session when no ID is given +--EXTENSIONS-- +session +--INI-- +session.use_strict_mode=1 +session.lazy_write=1 +session.use_cookies=0 +session.cache_limiter= +--FILE-- +storage[$id] ?? ''; } + public function write($id, $data): bool { echo "write\n"; $this->storage[$id] = $data; return true; } + public function destroy($id): bool { return true; } + public function gc($max_lifetime): int|false { return 0; } + public function create_sid(): string { return bin2hex(random_bytes(16)); } + public function validateId($id): bool { return isset($this->storage[$id]); } + public function updateTimestamp($id, $data): bool { echo "updateTimestamp\n"; return true; } +} + +session_set_save_handler(new Handler()); + +session_start(); +$id = session_id(); +session_commit(); + +session_id($id); +session_start(); +var_dump(session_id() === $id); +session_commit(); +?> +--EXPECT-- +write +bool(true) +updateTimestamp diff --git a/ext/session/tests/user_session_module/lazy_write_new_session_id_rejected.phpt b/ext/session/tests/user_session_module/lazy_write_new_session_id_rejected.phpt new file mode 100644 index 000000000000..df0b22637106 --- /dev/null +++ b/ext/session/tests/user_session_module/lazy_write_new_session_id_rejected.phpt @@ -0,0 +1,44 @@ +--TEST-- +lazy_write stores a new empty session when strict mode rejects the ID +--EXTENSIONS-- +session +--INI-- +session.use_strict_mode=1 +session.lazy_write=1 +session.use_cookies=0 +session.cache_limiter= +--FILE-- +storage[$id] ?? ''; } + public function write($id, $data): bool { echo "write\n"; $this->storage[$id] = $data; return true; } + public function destroy($id): bool { return true; } + public function gc($max_lifetime): int|false { return 0; } + public function create_sid(): string { return bin2hex(random_bytes(16)); } + public function validateId($id): bool { return isset($this->storage[$id]); } + public function updateTimestamp($id, $data): bool { echo "updateTimestamp\n"; return true; } +} + +session_set_save_handler(new Handler()); + +session_id('unknown'); +session_start(); +var_dump(session_id() !== 'unknown'); +$id = session_id(); +session_commit(); + +session_id($id); +session_start(); +var_dump(session_id() === $id); +session_commit(); +?> +--EXPECT-- +bool(true) +write +bool(true) +updateTimestamp