Skip to content

Use a connection pool for redis-session-store (forked gem) #7290

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

Closed
zachmargolis wants to merge 8 commits into from
Closed

Use a connection pool for redis-session-store (forked gem) #7290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7055fa4
Use a connection pool for redis-session-store
zachmargolis Nov 3, 2022
7f1fc01
Use forked redis-session-store gem that can accept a connection pool
zachmargolis Nov 3, 2022
555fd43
Update private API usage :see_no_evil:
zachmargolis Nov 3, 2022
7ae9f78
Refactor X509::SessionStore to use OutOfBandSessionStore
zachmargolis Nov 4, 2022
2dd1e1e
Remove reference to X509::Cacher class that does not exist
zachmargolis Nov 4, 2022
62dc63f
Revert "Refactor X509::SessionStore to use OutOfBandSessionStore"
zachmargolis Nov 4, 2022
42e8312
Fix private API again
zachmargolis Nov 4, 2022
e111baa
Merge remote-tracking branch 'origin/main' into margolis-pool-session…
zachmargolis Nov 4, 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
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ gem 'rack-timeout', require: false
gem 'redacted_struct'
gem 'redis', '>= 3.2.0'
gem 'redis-namespace'
gem 'redis-session-store', '>= 0.11.4'
gem 'redis-session-store', github: '18f/redis-session-store', ref: 'margolis-use-connection-pool'
gem 'retries'
gem 'rotp', '~> 6.1'
gem 'rqrcode'
Expand Down
14 changes: 10 additions & 4 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@ GIT
pkcs11
uuid

GIT
remote: https://github.com/18f/redis-session-store.git
revision: 1e97057f3d860c4dce758c61e7de66b8450b5f94
ref: margolis-use-connection-pool
specs:
redis-session-store (0.12.pre.18f)
actionpack (>= 6, < 8)
redis (>= 3, < 5)

GIT
remote: https://github.com/hashrocket/capybara-webmock.git
revision: 63d790a0b6c779b9700634bfc153e25ccdeb3688
Expand Down Expand Up @@ -533,9 +542,6 @@ GEM
redis (4.7.1)
redis-namespace (1.8.1)
redis (>= 3.0.4)
redis-session-store (0.11.4)
actionpack (>= 3, < 8)
redis (>= 3, < 5)
regexp_parser (2.6.0)
reline (0.2.7)
io-console (~> 0.5)
Expand Down Expand Up @@ -802,7 +808,7 @@ DEPENDENCIES
redacted_struct
redis (>= 3.2.0)
redis-namespace
redis-session-store (>= 0.11.4)
redis-session-store!
retries
rotp (~> 6.1)
rqrcode
Expand Down
2 changes: 1 addition & 1 deletion app/services/out_of_band_session_accessor.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def initialize(session_uuid)

def ttl
uuid = session_uuid
session_store.instance_eval { redis.ttl(prefixed(uuid)) }
session_store.instance_eval { with_redis { |redis| redis.ttl(prefixed(uuid)) } }
end

def load
Expand Down
3 changes: 1 addition & 2 deletions app/services/x509/session_store.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# in an out-of-band fashion (using only the session UUID) instead of having access
# to the user_session from Devise/Warden
# Should only be used outside of a normal browser session (such as the OpenID Connect API)
# See X509::Cacher for accessing PII inside of a normal browser session
module X509
class SessionStore
attr_reader :session_uuid
Expand All @@ -13,7 +12,7 @@ def initialize(session_uuid)

def ttl
uuid = session_uuid
session_store.instance_eval { redis.ttl(prefixed(uuid)) }
session_store.instance_eval { with_redis { |redis| redis.ttl(prefixed(uuid)) } }
end

def load
Expand Down
4 changes: 1 addition & 3 deletions config/initializers/redis.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@
)
end

REDIS_SESSION_POOL_WRAPPER = ConnectionPool::Wrapper.new(
size: IdentityConfig.store.redis_session_pool_size,
) do
REDIS_SESSION_POOL = ConnectionPool.new(size: IdentityConfig.store.redis_session_pool_size) do
# redis-session-store does its own namespacing in session_store.rb
Redis.new(url: IdentityConfig.store.redis_url)
end
2 changes: 1 addition & 1 deletion config/initializers/session_store.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
ttl: IdentityConfig.store.session_timeout_in_minutes.minutes,

key_prefix: "#{IdentityConfig.store.domain_name}:session:",
client: REDIS_SESSION_POOL_WRAPPER,
client_pool: REDIS_SESSION_POOL,
},
on_session_load_error: SessionEncryptorErrorHandler,
serializer: SessionEncryptor.new,
Expand Down