Use appropriate SameSite values for cookies #15185
Merged
Conversation
This file contains 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
tsteur
reviewed
Nov 24, 2019
|
@Findus23 @MichaelHeerklotz any chance you could give this PR a test as well? |
tsteur
requested changes
Dec 10, 2019
core/Cookie.php
Outdated
| */ | ||
| private static function getSameSiteValueForBrowser($default) | ||
| { | ||
| $sameSite = ucfirst($default); |
There was a problem hiding this comment.
just fyi might be good to use ucfirst(strtolower($default))? Just in case...
core/Cookie.php
Outdated
| @@ -153,7 +156,8 @@ protected function setCookie($Name, $Value, $Expires, $Path = '', $Domain = '', | |||
| . (empty($Path) ? '' : '; path=' . $Path) | |||
| . (empty($Domain) ? '' : '; domain=' . $Domain) | |||
| . (!$Secure ? '' : '; secure') | |||
| . (!$HTTPOnly ? '' : '; HttpOnly'); | |||
| . (!$HTTPOnly ? '' : '; HttpOnly') | |||
| . (!$sameSite ? '' : '; SameSite=' . $sameSite); | |||
There was a problem hiding this comment.
just to be safe we maybe want to rawurlencode the samesite value... and just to be safe maybe also domain and path even though they are values coming from our system?
core/Tracker/IgnoreCookie.php
Outdated
| @@ -61,7 +61,7 @@ public static function setIgnoreCookie() | |||
| $ignoreCookie->delete(); | |||
| } else { | |||
| $ignoreCookie->set('ignore', '*'); | |||
| $ignoreCookie->save(); | |||
| $ignoreCookie->save('None'); | |||
There was a problem hiding this comment.
should we move this for now into this PR that handles the opt out? https://github.com/matomo-org/matomo/pull/15184/files
jonasgrilleres
pushed a commit
to 1024pix/pix-analytics
that referenced
this pull request
Sep 22, 2020
jbuget
pushed a commit
to 1024pix/pix-analytics
that referenced
this pull request
Sep 26, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Part of #14395