Skip to content

Do not coerce session keys to strings for getters/setters #523

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

Open
radar wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Do not coerce session keys to strings for getters/setters #523

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
15 changes: 3 additions & 12 deletions lib/hanami/action/request/session.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ class Session

def_delegators \
:@session,
:[],
:[]=,
:key?,
:clear,
:delete,
:empty?,
Expand All @@ -29,18 +32,6 @@ def initialize(session)
@session = session
end

def [](key)
@session[key.to_s]
end

def []=(key, value)
@session[key.to_s] = value
end

def key?(key)
@session.key?(key.to_s)
end

alias_method :has_key?, :key?
alias_method :include?, :key?

Expand Down
4 changes: 2 additions & 2 deletions spec/unit/hanami/action/csrf_protection_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

context "Existing session" do
let(:request) { super().merge("rack.session" => session) }
let(:session) { {"_csrf_token" => session_token} }
let(:session) { {_csrf_token: session_token} }
let(:session_token) { "abc123" }

context "matching CSRF token in request" do
Expand Down Expand Up @@ -130,7 +130,7 @@ def verify_csrf_token?(_req, _res)

context "Existing session" do
let(:request) { super().merge("rack.session" => session) }
let(:session) { {"_csrf_token" => session_token} }
let(:session) { {_csrf_token: session_token} }
let(:session_token) { "abc123" }

it "includes the existing CSRF token in the response session" do
Expand Down
9 changes: 8 additions & 1 deletion spec/unit/hanami/action/session_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,17 @@
expect(response.session).to eq({})
end

it "allows value access via symbols" do
it "allows value access via strings" do
action = SessionAction.new
response = action.call("rack.session" => {"foo" => "bar"})

expect(response.session["foo"]).to eq("bar")
end

it "allows value access via symbols" do
action = SessionAction.new
response = action.call("rack.session" => {foo: "bar"})

expect(response.session[:foo]).to eq("bar")
end
end
Expand Down