ext/session: Validate SameSite cookie attribute against allowed values#21670
Open
jorgsowa wants to merge 1 commit intophp:masterfrom
Open
ext/session: Validate SameSite cookie attribute against allowed values#21670jorgsowa wants to merge 1 commit intophp:masterfrom
jorgsowa wants to merge 1 commit intophp:masterfrom
Conversation
Extract php_is_valid_samesite_value() in ext/standard/head.c as a shared validation function that enforces the SameSite whitelist (Strict, Lax, None, or empty string) with case-insensitive matching. Apply validation in both setcookie()/setrawcookie() (replacing the existing TODO comment) and the session.cookie_samesite INI handler. Previously arbitrary strings including CRLF sequences were accepted and appended verbatim into the Set-Cookie header.
jorgsowa
force-pushed
the
fix/session-samesite-validation
branch
from
4bcb52d to
d1d79ac
Compare
Girgias
reviewed
Apr 8, 2026
Comment on lines
1
to
5
| --TEST-- | ||
| Test session_set_cookie_params() function : variation | ||
| Test session_set_cookie_params() samesite validation | ||
| --INI-- | ||
| session.cookie_samesite=test | ||
| session.cookie_samesite=Lax | ||
| --EXTENSIONS-- |
Member
There was a problem hiding this comment.
Could you add a test where the INI setting has an invalid value? :)
|
|
||
| var_dump(ini_get("session.cookie_samesite")); | ||
| var_dump(session_set_cookie_params(["samesite" => "nothing"])); | ||
| // Valid values |
Member
There was a problem hiding this comment.
Please have these comments be an echo to delimitate the output more easily.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Applied validation of samesite option in
ini,setcookie(),session_set_cookie_params(). Four values are allowedStrict, Lax, None, or empty string. Doc: https://developer.mozilla.org/en-US/docs/Web/HTTP/Reference/Headers/Set-Cookie#samesitesamesite-valueWe can apply similar validation to other values, as a few values are vulnerable to CRLF Injection. I'm not sure it's a security issue, so I will just publish it in the next PRs.