From 81b8a98a133a0f0b87c0616b5d0c40d2a0d49f40 Mon Sep 17 00:00:00 2001 From: Greg Luis Ramirez Date: Tue, 30 Jun 2020 18:52:52 -0700 Subject: [PATCH 1/6] hyrax-migrator update 6-30-2020 --- Gemfile.lock | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 66844f3d9..9b029fd69 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/OregonDigital/hyrax-migrator.git - revision: aac90717c56afe41e5080e2f8d9894bcbf49e1e8 + revision: 6a77da6f6054c517c2913ca3e058bb3fdcec6cb0 branch: master specs: hyrax-migrator (0.1.0) @@ -167,7 +167,7 @@ GEM awesome_nested_set (3.2.0) activerecord (>= 4.0.0, < 7.0) aws-eventstream (1.1.0) - aws-partitions (1.336.0) + aws-partitions (1.337.0) aws-sdk-core (3.102.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) @@ -655,8 +655,6 @@ GEM rack (2.2.3) rack-honeycomb (0.5.0) libhoney (>= 1.5.0) - rack-protection (2.0.8.1) - rack rack-test (1.1.0) rack (>= 1.0, < 3) rails (5.1.7) @@ -850,11 +848,10 @@ GEM sxp (~> 1.0) shoulda-matchers (4.3.0) activesupport (>= 4.2.0) - sidekiq (6.0.7) + sidekiq (6.1.0) connection_pool (>= 2.2.2) rack (~> 2.0) - rack-protection (>= 2.0.0) - redis (>= 4.1.0) + redis (>= 4.2.0) signet (0.12.0) addressable (~> 2.3) faraday (~> 0.9) From ce66c3939d34e76a616c2176b69125ee99f9e4fa Mon Sep 17 00:00:00 2001 From: Greg Luis Ramirez Date: Wed, 1 Jul 2020 08:45:57 -0700 Subject: [PATCH 2/6] reset Gemfile.lock to resolve conflicts --- Gemfile.lock | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9b029fd69..66844f3d9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/OregonDigital/hyrax-migrator.git - revision: 6a77da6f6054c517c2913ca3e058bb3fdcec6cb0 + revision: aac90717c56afe41e5080e2f8d9894bcbf49e1e8 branch: master specs: hyrax-migrator (0.1.0) @@ -167,7 +167,7 @@ GEM awesome_nested_set (3.2.0) activerecord (>= 4.0.0, < 7.0) aws-eventstream (1.1.0) - aws-partitions (1.337.0) + aws-partitions (1.336.0) aws-sdk-core (3.102.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) @@ -655,6 +655,8 @@ GEM rack (2.2.3) rack-honeycomb (0.5.0) libhoney (>= 1.5.0) + rack-protection (2.0.8.1) + rack rack-test (1.1.0) rack (>= 1.0, < 3) rails (5.1.7) @@ -848,10 +850,11 @@ GEM sxp (~> 1.0) shoulda-matchers (4.3.0) activesupport (>= 4.2.0) - sidekiq (6.1.0) + sidekiq (6.0.7) connection_pool (>= 2.2.2) rack (~> 2.0) - redis (>= 4.2.0) + rack-protection (>= 2.0.0) + redis (>= 4.1.0) signet (0.12.0) addressable (~> 2.3) faraday (~> 0.9) From aa467f092c04772ce0a923a0c319d78aae9b9ec6 Mon Sep 17 00:00:00 2001 From: Greg Luis Ramirez Date: Wed, 1 Jul 2020 09:37:26 -0700 Subject: [PATCH 3/6] update hyrax-migrator 7-1-20 --- Gemfile.lock | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3030e9940..cd7244987 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/OregonDigital/hyrax-migrator.git - revision: aac90717c56afe41e5080e2f8d9894bcbf49e1e8 + revision: 6a77da6f6054c517c2913ca3e058bb3fdcec6cb0 branch: master specs: hyrax-migrator (0.1.0) @@ -667,8 +667,6 @@ GEM rack (2.2.3) rack-honeycomb (0.5.0) libhoney (>= 1.5.0) - rack-protection (2.0.8.1) - rack rack-test (1.1.0) rack (>= 1.0, < 3) rails (5.1.7) @@ -873,11 +871,10 @@ GEM sxp (~> 1.0) shoulda-matchers (4.3.0) activesupport (>= 4.2.0) - sidekiq (6.0.7) + sidekiq (6.1.0) connection_pool (>= 2.2.2) rack (~> 2.0) - rack-protection (>= 2.0.0) - redis (>= 4.1.0) + redis (>= 4.2.0) signet (0.14.0) addressable (~> 2.3) faraday (>= 0.17.3, < 2.0) From b28f3c73675572ffb2f4f1d2691c144d1cd1b782 Mon Sep 17 00:00:00 2001 From: Greg Luis Ramirez Date: Wed, 1 Jul 2020 17:56:15 -0700 Subject: [PATCH 4/6] update Gemfile.lock --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index cd7244987..e34c52f43 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -703,7 +703,7 @@ GEM rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - rdf (3.1.3) + rdf (3.1.4) hamster (~> 3.0) link_header (~> 0.0, >= 0.0.8) rdf-aggregate-repo (3.1.0) From 7b0fbae0fd3e988e6aae777a8f27241b3367b355 Mon Sep 17 00:00:00 2001 From: Greg Luis Ramirez Date: Wed, 1 Jul 2020 17:56:50 -0700 Subject: [PATCH 5/6] remove sidekiq workaround --- config/initializers/sidekiq.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index ecdade844..1e5654df6 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -3,9 +3,6 @@ require 'sidekiq/web' 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: ENV.fetch('SIDEKIQ_ADMIN_SAFE_URLS', '').split(',') -end config = YAML.safe_load(ERB.new(IO.read(Rails.root + 'config' + 'redis.yml')).result)[Rails.env].with_indifferent_access From cbf7002661d91387240af7648af46ebf083f2f8c Mon Sep 17 00:00:00 2001 From: Greg Luis Ramirez Date: Wed, 1 Jul 2020 18:54:37 -0700 Subject: [PATCH 6/6] set sidekiq version to 6.0.7 --- Gemfile | 2 +- Gemfile.lock | 11 +++++++---- config/initializers/sidekiq.rb | 3 +++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index eef90d67e..f50c340b0 100644 --- a/Gemfile +++ b/Gemfile @@ -22,7 +22,7 @@ gem 'puma', '~> 3.12' gem 'rails', '~> 5.1.6' gem 'rsolr', '>= 1.0' gem 'sass-rails', '~> 5.0' -gem 'sidekiq' +gem 'sidekiq', '~> 6.0.7' gem 'tzinfo-data' gem 'uglifier', '>= 1.3.0' gem 'ruby-oembed' diff --git a/Gemfile.lock b/Gemfile.lock index e34c52f43..3076a652c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -118,7 +118,7 @@ GEM activerecord (>= 4.0.0, < 7.0) aws-eventstream (1.1.0) aws-partitions (1.337.0) - aws-sdk-core (3.102.1) + aws-sdk-core (3.103.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) @@ -667,6 +667,8 @@ GEM rack (2.2.3) rack-honeycomb (0.5.0) libhoney (>= 1.5.0) + rack-protection (2.0.8.1) + rack rack-test (1.1.0) rack (>= 1.0, < 3) rails (5.1.7) @@ -871,10 +873,11 @@ GEM sxp (~> 1.0) shoulda-matchers (4.3.0) activesupport (>= 4.2.0) - sidekiq (6.1.0) + sidekiq (6.0.7) connection_pool (>= 2.2.2) rack (~> 2.0) - redis (>= 4.2.0) + rack-protection (>= 2.0.0) + redis (>= 4.1.0) signet (0.14.0) addressable (~> 2.3) faraday (>= 0.17.3, < 2.0) @@ -1031,7 +1034,7 @@ DEPENDENCIES sass-rails (~> 5.0) selenium-webdriver shoulda-matchers (~> 4) - sidekiq + sidekiq (~> 6.0.7) simplecov (>= 0.9) triplestore-adapter! tzinfo-data diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 1e5654df6..ecdade844 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -3,6 +3,9 @@ require 'sidekiq/web' 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: ENV.fetch('SIDEKIQ_ADMIN_SAFE_URLS', '').split(',') +end config = YAML.safe_load(ERB.new(IO.read(Rails.root + 'config' + 'redis.yml')).result)[Rails.env].with_indifferent_access