Skip to content

[ext/session] Validate session.cookie_samesite against allowed values #21647

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
jorgsowa wants to merge 1 commit into from
+49 −1
Closed

[ext/session] Validate session.cookie_samesite against allowed values #21647

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
19 changes: 18 additions & 1 deletion ext/session/session.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,6 +733,23 @@ static PHP_INI_MH(OnUpdateSessionStr)
return OnUpdateStr(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
}

static PHP_INI_MH(OnUpdateSessionSameSite)
{
SESSION_CHECK_ACTIVE_STATE;
SESSION_CHECK_OUTPUT_STATE;

if (new_value && ZSTR_LEN(new_value) > 0
&& !zend_string_equals_literal_ci(new_value, "Strict")
&& !zend_string_equals_literal_ci(new_value, "Lax")
&& !zend_string_equals_literal_ci(new_value, "None")) {
php_error_docref(NULL, E_WARNING,
"session.cookie_samesite must be \"Strict\", \"Lax\", \"None\", or \"\"");
return FAILURE;
}

return OnUpdateStr(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
}

static PHP_INI_MH(OnUpdateSessionBool)
{
SESSION_CHECK_ACTIVE_STATE;
Expand Down Expand Up @@ -904,7 +921,7 @@ PHP_INI_BEGIN()
STD_PHP_INI_BOOLEAN("session.cookie_secure", "0", PHP_INI_ALL, OnUpdateSessionBool, cookie_secure, php_ps_globals, ps_globals)
STD_PHP_INI_BOOLEAN("session.cookie_partitioned", "0", PHP_INI_ALL, OnUpdateSessionBool, cookie_partitioned, php_ps_globals, ps_globals)
STD_PHP_INI_BOOLEAN("session.cookie_httponly", "0", PHP_INI_ALL, OnUpdateSessionBool, cookie_httponly, php_ps_globals, ps_globals)
STD_PHP_INI_ENTRY("session.cookie_samesite", "", PHP_INI_ALL, OnUpdateSessionStr, cookie_samesite, php_ps_globals, ps_globals)
STD_PHP_INI_ENTRY("session.cookie_samesite", "", PHP_INI_ALL, OnUpdateSessionSameSite, cookie_samesite, php_ps_globals, ps_globals)
STD_PHP_INI_BOOLEAN("session.use_cookies", "1", PHP_INI_ALL, OnUpdateSessionBool, use_cookies, php_ps_globals, ps_globals)
STD_PHP_INI_BOOLEAN("session.use_only_cookies", "1", PHP_INI_ALL, OnUpdateUseOnlyCookies, use_only_cookies, php_ps_globals, ps_globals)
STD_PHP_INI_BOOLEAN("session.use_strict_mode", "0", PHP_INI_ALL, OnUpdateSessionBool, use_strict_mode, php_ps_globals, ps_globals)
Expand Down
31 changes: 31 additions & 0 deletions ext/session/tests/session_cookie_samesite_validation.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
--TEST--
session.cookie_samesite only accepts Strict, Lax, None, or empty string
--EXTENSIONS--
session
--SKIPIF--
<?php include('skipif.inc'); ?>
--FILE--
<?php
ob_start();
ini_set('session.cookie_samesite', 'Invalid');
ini_set('session.cookie_samesite', "Strict\r\nX-Injected: evil");
$after_invalid = ini_get('session.cookie_samesite');

$r_strict = ini_set('session.cookie_samesite', 'Strict') !== false;
$r_lax = ini_set('session.cookie_samesite', 'Lax') !== false;
$r_none = ini_set('session.cookie_samesite', 'None') !== false;
$r_empty = ini_set('session.cookie_samesite', '') !== false;
echo ob_get_clean();

var_dump($after_invalid);
var_dump($r_strict, $r_lax, $r_none, $r_empty);
?>
--EXPECTF--
Warning: ini_set(): session.cookie_samesite must be "Strict", "Lax", "None", or "" in %s on line %d

Warning: ini_set(): session.cookie_samesite must be "Strict", "Lax", "None", or "" in %s on line %d
string(0) ""
bool(true)
bool(true)
bool(true)
bool(true)
Loading