Skip to content
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

Jump to bottom

Start reworking the Rack Session specs #921

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Start reworking the Rack Session specs #921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80dd94e
Start reworking the Rack Session specs
petergoldstein Jun 16, 2022
dc34a5a
Shift test file into integration directory
petergoldstein Jun 16, 2022
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
4 changes: 1 addition & 3 deletions lib/rack/session/dalli.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,9 @@ class Dalli < Abstract::PersistedSecure
attr_reader :data

# Don't freeze this until we fix the specs/implementation
# rubocop:disable Style/MutableConstant
DEFAULT_DALLI_OPTIONS = {
namespace: 'rack:session'
}
# rubocop:enable Style/MutableConstant
}.freeze

# Brings in a new Rack::Session::Dalli middleware with the given
# `:memcache_server`. The server is either a hostname, or a
Expand Down
50 changes: 26 additions & 24 deletions test/test_rack_session.rb → test/integration/test_rack_session.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
# frozen_string_literal: true

require_relative 'helper'
require_relative '../helper'

require 'json'
require 'rack/session/dalli'
require 'rack/lint'
require 'rack/mock'
describe Rack::Session::Dalli do
let(:port) { 19_129 }
let(:memcache_server) { "localhost:#{port}" }

before do
@port = 19_129
memcached_persistent(:binary, @port)
Rack::Session::Dalli::DEFAULT_DALLI_OPTIONS[:memcache_server] = "localhost:#{@port}"
memcached_persistent(:binary, port)

# test memcache connection
Rack::Session::Dalli.new(incrementor)
Rack::Session::Dalli.new(incrementor, memcache_server: memcache_server)
end

let(:session_key) { Rack::Session::Dalli::DEFAULT_OPTIONS[:key] }
let(:session_key) { Rack::RACK_SESSION }
let(:session_match) do
/#{session_key}=([0-9a-fA-F]+);/
end
Expand Down Expand Up @@ -62,13 +63,14 @@

it 'connects to existing server' do
assert_silent do
rsd = Rack::Session::Dalli.new(incrementor, namespace: 'test:rack:session')
rsd = Rack::Session::Dalli.new(incrementor, memcache_server: memcache_server, namespace: 'test:rack:session')
rsd.data.with { |c| c.set('ping', '') }
end
end

it 'passes options to MemCache' do
opts = {
memcache_server: memcache_server,
namespace: 'test:rack:session',
compression_min_size: 1234
}
Expand All @@ -79,20 +81,20 @@
end

it 'rejects a :cache option' do
server = Rack::Session::Dalli::DEFAULT_DALLI_OPTIONS[:memcache_server]
cache = Dalli::Client.new(server, namespace: 'test:rack:session')
cache = Dalli::Client.new(memcache_server, namespace: 'test:rack:session')
assert_raises RuntimeError do
Rack::Session::Dalli.new(incrementor, cache: cache, namespace: 'foobar')
end
end

it 'generates sids without an existing Dalli::Client' do
rsd = Rack::Session::Dalli.new(incrementor)
rsd = Rack::Session::Dalli.new(incrementor, memcache_server: memcache_server)
assert rsd.send :generate_sid
end

it 'upgrades to a connection pool' do
opts = {
memcache_server: memcache_server,
namespace: 'test:rack:session',
pool_size: 10
}
Expand All @@ -107,14 +109,14 @@
end

it 'creates a new cookie' do
rsd = Rack::Session::Dalli.new(incrementor)
rsd = Rack::Session::Dalli.new(incrementor, memcache_server: memcache_server)
res = Rack::MockRequest.new(rsd).get('/')
assert_includes res['Set-Cookie'], "#{session_key}="
assert_equal '{"counter"=>1}', res.body
end

it 'determines session from a cookie' do
rsd = Rack::Session::Dalli.new(incrementor)
rsd = Rack::Session::Dalli.new(incrementor, memcache_server: memcache_server)
req = Rack::MockRequest.new(rsd)
res = req.get('/')
cookie = res['Set-Cookie']
Expand All @@ -123,7 +125,7 @@
end

it 'determines session only from a cookie by default' do
rsd = Rack::Session::Dalli.new(incrementor)
rsd = Rack::Session::Dalli.new(incrementor, memcache_server: memcache_server)
req = Rack::MockRequest.new(rsd)
res = req.get('/')
sid = res['Set-Cookie'][session_match, 1]
Expand All @@ -132,7 +134,7 @@
end

it 'determines session from params' do
rsd = Rack::Session::Dalli.new(incrementor, cookie_only: false)
rsd = Rack::Session::Dalli.new(incrementor, memcache_server: memcache_server, cookie_only: false)
req = Rack::MockRequest.new(rsd)
res = req.get('/')
sid = res['Set-Cookie'][session_match, 1]
Expand All @@ -142,7 +144,7 @@

it 'survives nonexistant cookies' do
bad_cookie = 'rack.session=blarghfasel'
rsd = Rack::Session::Dalli.new(incrementor)
rsd = Rack::Session::Dalli.new(incrementor, memcache_server: memcache_server)
res = Rack::MockRequest.new(rsd)
.get('/', 'HTTP_COOKIE' => bad_cookie)
assert_equal '{"counter"=>1}', res.body
Expand All @@ -152,15 +154,15 @@

it 'survives nonexistant blank cookies' do
bad_cookie = 'rack.session='
rsd = Rack::Session::Dalli.new(incrementor)
rsd = Rack::Session::Dalli.new(incrementor, memcache_server: memcache_server)
res = Rack::MockRequest.new(rsd)
.get('/', 'HTTP_COOKIE' => bad_cookie)
cookie = res['Set-Cookie'][session_match]
refute_match(/#{bad_cookie}$/, cookie)
end

it 'sets an expiration on new sessions' do
rsd = Rack::Session::Dalli.new(incrementor, expire_after: 3)
rsd = Rack::Session::Dalli.new(incrementor, memcache_server: memcache_server, expire_after: 3)
res = Rack::MockRequest.new(rsd).get('/')
assert_includes res.body, '"counter"=>1'
cookie = res['Set-Cookie']
Expand All @@ -172,7 +174,7 @@
end

it 'maintains freshness of existing sessions' do
rsd = Rack::Session::Dalli.new(incrementor, expire_after: 3)
rsd = Rack::Session::Dalli.new(incrementor, memcache_server: memcache_server, expire_after: 3)
res = Rack::MockRequest.new(rsd).get('/')
assert_includes res.body, '"counter"=>1'
cookie = res['Set-Cookie']
Expand All @@ -187,7 +189,7 @@
end

it 'does not send the same session id if it did not change' do
rsd = Rack::Session::Dalli.new(incrementor)
rsd = Rack::Session::Dalli.new(incrementor, memcache_server: memcache_server)
req = Rack::MockRequest.new(rsd)

res0 = req.get('/')
Expand All @@ -204,7 +206,7 @@
end

it 'deletes cookies with :drop option' do
rsd = Rack::Session::Dalli.new(incrementor)
rsd = Rack::Session::Dalli.new(incrementor, memcache_server: memcache_server)
req = Rack::MockRequest.new(rsd)
drop = Rack::Utils::Context.new(rsd, drop_session)
dreq = Rack::MockRequest.new(drop)
Expand All @@ -223,7 +225,7 @@
end

it 'provides new session id with :renew option' do
rsd = Rack::Session::Dalli.new(incrementor)
rsd = Rack::Session::Dalli.new(incrementor, memcache_server: memcache_server)
req = Rack::MockRequest.new(rsd)
renew = Rack::Utils::Context.new(rsd, renew_session)
rreq = Rack::MockRequest.new(renew)
Expand All @@ -247,7 +249,7 @@
end

it 'omits cookie with :defer option but still updates the state' do
rsd = Rack::Session::Dalli.new(incrementor)
rsd = Rack::Session::Dalli.new(incrementor, memcache_server: memcache_server)
count = Rack::Utils::Context.new(rsd, incrementor)
defer = Rack::Utils::Context.new(rsd, defer_session)
dreq = Rack::MockRequest.new(defer)
Expand All @@ -265,7 +267,7 @@
end

it 'omits cookie and state update with :skip option' do
rsd = Rack::Session::Dalli.new(incrementor)
rsd = Rack::Session::Dalli.new(incrementor, memcache_server: memcache_server)
count = Rack::Utils::Context.new(rsd, incrementor)
skip = Rack::Utils::Context.new(rsd, skip_session)
sreq = Rack::MockRequest.new(skip)
Expand Down Expand Up @@ -293,7 +295,7 @@
end
[200, {}, [session.to_h.to_json]]
end
rsd = Rack::Session::Dalli.new(hash_check)
rsd = Rack::Session::Dalli.new(hash_check, memcache_server: memcache_server)
req = Rack::MockRequest.new(rsd)

res0 = req.get('/')
Expand Down