Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion lib/rack/session/cookie.rb
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ def initialize(app, options = {})
secrets = [*(options[:secrets] || options[:secret])]

encryptor_opts = {
purpose: options[:key], serialize_json: options[:serialize_json]
purpose: options[:key] != RACK_SESSION ? options[:key] : nil, serialize_json: options[:serialize_json]
}

# For each secret, create an Encryptor. We have iterate this Array at
Expand Down
8 changes: 6 additions & 2 deletions test/spec_session_cookie.rb
Original file line number Diff line number Diff line change
Expand Up @@ -366,15 +366,19 @@ def decode(str); @calls << :decode; JSON.parse(str); end
end

it 'rejects session cookie with different purpose' do
app = [incrementor, { secrets: @secrets }]
other_app = [incrementor, { secrets: @secrets, key: 'other' }]
app = [incrementor, { secrets: @secret }] # key defaults to 'rack.session'
other_app = [incrementor, { secrets: @secret, key: 'other' }]
explicit_default_app = [incrementor, { secrets: @secret, key: 'rack.session' }]

response = response_for(app: app)
response.body.must_equal ({"counter"=>1}.to_s)

response = response_for(app: app, cookie: response)
response.body.must_equal ({"counter"=>2}.to_s)

response = response_for(app: explicit_default_app, cookie: response)
response.body.must_equal ({"counter"=>3}.to_s)

response = response_for(app: other_app, cookie: response)
response.body.must_equal ({"counter"=>1}.to_s)
end
Expand Down