diff --git a/Gemfile.lock b/Gemfile.lock index e40497cbf..902df52f6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -655,7 +655,7 @@ GEM redis-actionpack (>= 5.0, < 6) redis-activesupport (>= 5.0, < 6) redis-store (>= 1.2, < 2) - redis-store (1.8.1) + redis-store (1.9.0) redis (>= 4, < 5) regexp_parser (1.7.1) request_store (1.5.0) diff --git a/config/routes.rb b/config/routes.rb index 02fa49fd1..8dafef9e7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -23,7 +23,7 @@ Rails.application.routes.draw do Sidekiq::Web.set :session_secret, Rails.application.secrets[:secret_key_base] Sidekiq::Web.set :sessions, Rails.application.config.session_options Sidekiq::Web.class_eval do - use Rack::Protection, origin_whitelist: ["https://dev.to"] # resolve Rack Protection HttpOrigin + use Rack::Protection, origin_whitelist: [URL.url] # resolve Rack Protection HttpOrigin end mount Sidekiq::Web => "/sidekiq" mount FieldTest::Engine, at: "abtests" @@ -43,7 +43,14 @@ Rails.application.routes.draw do authenticate :user, ->(user) { user.has_role?(:tech_admin) } do mount Blazer::Engine, at: "blazer" - mount Flipper::UI.app(Flipper, { rack_protection: {} }), at: "feature_flags" + + flipper_ui = Flipper::UI.app(Flipper) do |builder| + builder.use Rack::Protection, origin_whitelist: [URL.url] + # Requires redis-store > 1.9: https://github.com/redis-store/redis-store/pull/333 + builder.use Rack::Session::Cookie, + secret: Rails.application.secrets[:secret_key_base] + end + mount flipper_ui, at: "feature_flags" end resources :articles, only: %i[index show update] diff --git a/vendor/cache/redis-store-1.8.1.gem b/vendor/cache/redis-store-1.8.1.gem deleted file mode 100644 index 89dd877c4..000000000 Binary files a/vendor/cache/redis-store-1.8.1.gem and /dev/null differ diff --git a/vendor/cache/redis-store-1.9.0.gem b/vendor/cache/redis-store-1.9.0.gem new file mode 100644 index 000000000..474f7f24e Binary files /dev/null and b/vendor/cache/redis-store-1.9.0.gem differ