Update cookie_store_test to use encrypted cookies #31146
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
|
r? @kamipo (@rails-bot has picked a reviewer for you, use r? to override) |
kaspth
reviewed
Nov 14, 2017
| Rotations = ActiveSupport::Messages::RotationConfiguration.new | ||
|
|
||
| Verifier = ActiveSupport::MessageVerifier.new(SessionSecret, digest: "SHA1") | ||
| SignedBar = Verifier.generate(foo: "bar", session_id: SecureRandom.hex(16)) | ||
| Encryptor = ActiveSupport::MessageEncryptor.new( |
There was a problem hiding this comment.
Let's skip the parens with:
Encryptor = ActiveSupport::MessageEncryptor.new \
Generator…| @@ -106,8 +120,12 @@ def test_getting_session_id | |||
|
|
|||
| def test_disregards_tampered_sessions | |||
| with_test_route_set do | |||
| cookies[SessionKey] = "BAh7BjoIZm9vIghiYXI%3D--123456780" | |||
| encryptor = ActiveSupport::MessageEncryptor.new('A' * 32, cipher: "aes-256-gcm", serializer: Marshal) | |||
There was a problem hiding this comment.
'A' needs to use double quotes.
| session_value = parse_cookie_from_header | ||
| session_data = Encryptor.decrypt_and_verify(Rack::Utils.unescape(session_value)) rescue nil | ||
|
|
||
| refute_nil session_data, "session failed to decrypt" |
There was a problem hiding this comment.
We prefer assert_not_nil over refute_* (can't remember why though).
mjc-gh
force-pushed
the
actiondispatch-cookie-store-test-updates
branch
from
7efa044
to
a774050
Compare
|
Looks like there's merge conflicts 😊 |
| Rotations = ActiveSupport::Messages::RotationConfiguration.new | ||
|
|
||
| Verifier = ActiveSupport::MessageVerifier.new(SessionSecret, digest: "SHA1") | ||
| SignedBar = Verifier.generate(foo: "bar", session_id: SecureRandom.hex(16)) | ||
| Encryptor = ActiveSupport::MessageEncryptor.new \ |
There was a problem hiding this comment.
Can we use parentheses here instead of \?
This now modernizes these tests to use encrypted cookies instead of using secret_token HMACs. This commit also adds a tests to ensure session cookies with :expires_after set are invalidated and no longer accepted when the time has elapsed.
mjc-gh
force-pushed
the
actiondispatch-cookie-store-test-updates
branch
from
a774050
to
68b2573
Compare
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.
Summary
This now modernizes these tests to use encrypted cookies instead of using secret_token HMACs. This commit also adds a test to ensure session cookies with
:expires_afterset are invalidated and no longer accepted when the time has elapsed./cc @assain @kaspth