Fix admin login for non-secure cookies #4960
Open
+176
−12
Conversation
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
github-actions
bot
added
Component: Core
sreichel
changed the title
sreichel
changed the title
There was a problem hiding this comment.
Pull Request Overview
This PR fixes admin login issues when using non-secure cookies by preventing the SameSite attribute from being set to "None" for non-HTTPS connections, which is incompatible with browser security requirements.
- Adds logic to conditionally remove SameSite=None for non-secure cookies in session handling
- Introduces constants for SameSite cookie values to improve code maintainability
- Updates cookie handling to use consistent constant references instead of hardcoded strings
Reviewed Changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cookie/Samesite.php | Adds constants for SameSite values (NONE, STRICT, LAX) and updates option array to use them |
| app/code/core/Mage/Core/Model/Cookie.php | Updates cookie methods to use SameSite constants and improves type hints and documentation |
| app/code/core/Mage/Core/Model/Session/Abstract/Varien.php | Adds conditional logic to remove SameSite=None for non-secure cookies and fixes namespace references |
| tests/unit/Mage/Core/Model/CookieTest.php | Adds comprehensive unit tests for the Cookie model functionality |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
|
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.
Description (*)
Setting cookie SameSite to "None" breaks admin login for unsecured pages.
Fixed Issues (if relevant)