From 9fe92a9d4716ccc28177af1b398eef6ab2ff4a10 Mon Sep 17 00:00:00 2001
From: zendesk-mattlefevre <matthew.lefevre@zendesk.com>
Date: Thu, 2 Nov 2023 14:02:15 -0600
Subject: [PATCH 1/4] bump omniauth gems

---
 Gemfile      |  7 +++--
 Gemfile.lock | 76 ++++++++++++++++++++++++++++------------------------
 2 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/Gemfile b/Gemfile
index d84841531..6323f74bd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,11 +25,11 @@ gem 'attr_encrypted'
 gem 'sawyer'
 gem 'dalli'
 gem 'oauth2', '~>2.0.9'
-gem 'omniauth'
+gem 'omniauth', '~>2.0'
 gem 'omniauth-oauth2'
 gem 'omniauth-github', git: "https://github.com/omniauth/omniauth-github.git" # needs >1.3.0
 gem 'omniauth-google-oauth2'
-gem 'omniauth-ldap'
+gem 'omniauth-ldap', git: 'https://github.com/omniauth/omniauth-ldap.git', ref:'fb485bb4613074b224b8d6b28ad1c7f366a6b6d8'
 gem 'omniauth-gitlab'
 gem 'omniauth-atlassian-bitbucket'
 gem 'omniauth-rails_csrf_protection' # remove once https://github.com/omniauth/omniauth/pull/809 is resolved
@@ -44,8 +44,7 @@ gem 'commonmarker'
 gem 'coderay'
 gem 'net-http-persistent'
 gem 'concurrent-ruby'
-# Can delete once this PR https://github.com/hashicorp/vault-ruby/pull/188 is merged and changes reconciled
-gem 'vault', git: 'https://github.com/zendesk/vault-ruby.git', ref: '96be391a2fd50a42871c8b9dc3c59fddbdbdc556'
+gem 'vault'
 gem 'lograge'
 gem 'logstash-event'
 gem 'diffy'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9486ea0cb..46ec63f20 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,18 +1,21 @@
 GIT
   remote: https://github.com/omniauth/omniauth-github.git
-  revision: 5afe8aee3baccd84ce6f265a3e62efbb55ac14b9
+  revision: f27bb4e018150d87e9444ad13955acfc9e76f4d7
   specs:
-    omniauth-github (1.4.0)
-      omniauth (~> 1.5)
-      omniauth-oauth2 (>= 1.4.0, < 2.0)
+    omniauth-github (2.0.1)
+      omniauth (~> 2.0)
+      omniauth-oauth2 (~> 1.8)
 
 GIT
-  remote: https://github.com/zendesk/vault-ruby.git
-  revision: 96be391a2fd50a42871c8b9dc3c59fddbdbdc556
-  ref: 96be391a2fd50a42871c8b9dc3c59fddbdbdc556
+  remote: https://github.com/omniauth/omniauth-ldap.git
+  revision: fb485bb4613074b224b8d6b28ad1c7f366a6b6d8
+  ref: fb485bb4613074b224b8d6b28ad1c7f366a6b6d8
   specs:
-    vault (0.12.0)
-      aws-sigv4
+    omniauth-ldap (2.0.0)
+      net-ldap (~> 0.16)
+      omniauth (~> 2.0.0)
+      pyu-ruby-sasl (~> 0.0.3.3)
+      rubyntlm (~> 0.6.2)
 
 PATH
   remote: plugins/airbrake_hook
@@ -291,6 +294,7 @@ GEM
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.1.4)
       aws-eventstream (~> 1.0, >= 1.0.2)
+    base64 (0.1.1)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     bootsnap (1.4.5)
@@ -330,7 +334,8 @@ GEM
     erubi (1.12.0)
     erubis (2.7.0)
     execjs (2.7.0)
-    faraday (2.7.10)
+    faraday (2.7.11)
+      base64
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-http-cache (2.5.0)
@@ -410,7 +415,7 @@ GEM
       railties (>= 4)
       request_store (~> 1.0)
     logstash-event (1.2.02)
-    loofah (2.21.3)
+    loofah (2.21.4)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.7.1)
@@ -426,7 +431,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.0218.1)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.4)
+    mini_portile2 (2.8.5)
     minitest (5.11.3)
     minitest-rails (6.1.0)
       minitest (~> 5.10)
@@ -444,7 +449,7 @@ GEM
     mysql2 (0.5.3)
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net-ldap (0.16.1)
+    net-ldap (0.18.0)
     netrc (0.11.0)
     newrelic_rpm (6.7.0.359)
     nio4r (2.5.9)
@@ -465,29 +470,26 @@ GEM
     octokit (6.1.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
-    omniauth (1.9.2)
+    omniauth (2.0.4)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
+      rack-protection
     omniauth-atlassian-bitbucket (0.1.0)
       omniauth-oauth2
-    omniauth-gitlab (1.0.2)
-      omniauth (~> 1.0)
-      omniauth-oauth2 (~> 1.0)
-    omniauth-google-oauth2 (0.8.0)
+    omniauth-gitlab (4.1.0)
+      omniauth (~> 2.0)
+      omniauth-oauth2 (~> 1.8.0)
+    omniauth-google-oauth2 (1.1.1)
       jwt (>= 2.0)
-      omniauth (>= 1.1.1)
-      omniauth-oauth2 (>= 1.6)
-    omniauth-ldap (1.0.5)
-      net-ldap (~> 0.12)
-      omniauth (~> 1.0)
-      pyu-ruby-sasl (~> 0.0.3.2)
-      rubyntlm (~> 0.3.4)
-    omniauth-oauth2 (1.7.3)
+      oauth2 (~> 2.0.6)
+      omniauth (~> 2.0)
+      omniauth-oauth2 (~> 1.8.0)
+    omniauth-oauth2 (1.8.0)
       oauth2 (>= 1.4, < 3)
-      omniauth (>= 1.9, < 3)
-    omniauth-rails_csrf_protection (0.1.2)
+      omniauth (~> 2.0)
+    omniauth-rails_csrf_protection (1.0.1)
       actionpack (>= 4.2)
-      omniauth (>= 1.3.1)
+      omniauth (~> 2.0)
     pagy (3.6.0)
     parallel (1.19.2)
     parallel_tests (2.21.1)
@@ -515,10 +517,12 @@ GEM
     puma (5.6.7)
       nio4r (~> 2.0)
     pyu-ruby-sasl (0.0.3.3)
-    racc (1.7.1)
+    racc (1.7.2)
     rack (2.2.8)
     rack-mini-profiler (1.1.4)
       rack (>= 1.2.0)
+    rack-protection (3.1.0)
+      rack (~> 2.2, >= 2.2.4)
     rack-test (2.1.0)
       rack (>= 1.3)
     rails (6.1.7.6)
@@ -588,7 +592,7 @@ GEM
     ruby2_keywords (0.0.5)
     ruby_parser (3.13.1)
       sexp_processor (~> 4.9)
-    rubyntlm (0.3.4)
+    rubyntlm (0.6.3)
     safe_yaml (1.0.4)
     sass-rails (6.0.0)
       sassc-rails (~> 2.1, >= 2.1.1)
@@ -644,6 +648,8 @@ GEM
     unicode-display_width (1.8.0)
     validates_lengths_from_database (0.8.0)
       activerecord (>= 4)
+    vault (0.12.0)
+      aws-sigv4
     version_gem (1.1.3)
     warden (1.2.7)
       rack (>= 1.0)
@@ -654,7 +660,7 @@ GEM
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.6.11)
+    zeitwerk (2.6.12)
     zendesk_api (2.0.1)
       faraday (> 2.0.0)
       faraday-multipart
@@ -709,12 +715,12 @@ DEPENDENCIES
   net-http-persistent
   oauth2 (~> 2.0.9)
   octokit
-  omniauth
+  omniauth (~> 2.0)
   omniauth-atlassian-bitbucket
   omniauth-github!
   omniauth-gitlab
   omniauth-google-oauth2
-  omniauth-ldap
+  omniauth-ldap!
   omniauth-oauth2
   omniauth-rails_csrf_protection
   pagy
@@ -776,7 +782,7 @@ DEPENDENCIES
   stackprof
   uglifier
   validates_lengths_from_database
-  vault!
+  vault
   warden
   webmock
 

From fa85098f1bcddd80817c028fbb1c7e56e42332b9 Mon Sep 17 00:00:00 2001
From: zendesk-mattlefevre <matthew.lefevre@zendesk.com>
Date: Thu, 2 Nov 2023 15:26:39 -0600
Subject: [PATCH 2/4] revert vault change+bump commit

---
 Gemfile      |  5 +++--
 Gemfile.lock | 18 ++++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 6323f74bd..eb9da9e70 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,7 +29,7 @@ gem 'omniauth', '~>2.0'
 gem 'omniauth-oauth2'
 gem 'omniauth-github', git: "https://github.com/omniauth/omniauth-github.git" # needs >1.3.0
 gem 'omniauth-google-oauth2'
-gem 'omniauth-ldap', git: 'https://github.com/omniauth/omniauth-ldap.git', ref:'fb485bb4613074b224b8d6b28ad1c7f366a6b6d8'
+gem 'omniauth-ldap', git: 'https://github.com/omniauth/omniauth-ldap.git', ref: 'fb485bb4613074b224b8d6b28ad1c7f366a6b6d8'
 gem 'omniauth-gitlab'
 gem 'omniauth-atlassian-bitbucket'
 gem 'omniauth-rails_csrf_protection' # remove once https://github.com/omniauth/omniauth/pull/809 is resolved
@@ -44,7 +44,8 @@ gem 'commonmarker'
 gem 'coderay'
 gem 'net-http-persistent'
 gem 'concurrent-ruby'
-gem 'vault'
+# Can delete once this PR https://github.com/hashicorp/vault-ruby/pull/188 is merged and changes reconciled
+gem 'vault', git: 'https://github.com/zendesk/vault-ruby.git', ref: 'cacb44d48f21a953a39fd9a71c1c33bcb42d77f0'
 gem 'lograge'
 gem 'logstash-event'
 gem 'diffy'
diff --git a/Gemfile.lock b/Gemfile.lock
index 46ec63f20..31de1b682 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,6 +17,14 @@ GIT
       pyu-ruby-sasl (~> 0.0.3.3)
       rubyntlm (~> 0.6.2)
 
+GIT
+  remote: https://github.com/zendesk/vault-ruby.git
+  revision: cacb44d48f21a953a39fd9a71c1c33bcb42d77f0
+  ref: cacb44d48f21a953a39fd9a71c1c33bcb42d77f0
+  specs:
+    vault (0.12.0)
+      aws-sigv4
+
 PATH
   remote: plugins/airbrake_hook
   specs:
@@ -275,7 +283,7 @@ GEM
     autoprefixer-rails (9.4.8)
       execjs
     awesome_print (1.6.1)
-    aws-eventstream (1.1.0)
+    aws-eventstream (1.2.0)
     aws-partitions (1.329.0)
     aws-sdk-core (3.100.0)
       aws-eventstream (~> 1, >= 1.0.2)
@@ -292,8 +300,8 @@ GEM
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.4)
-      aws-eventstream (~> 1.0, >= 1.0.2)
+    aws-sigv4 (1.6.1)
+      aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.1.1)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
@@ -648,8 +656,6 @@ GEM
     unicode-display_width (1.8.0)
     validates_lengths_from_database (0.8.0)
       activerecord (>= 4)
-    vault (0.12.0)
-      aws-sigv4
     version_gem (1.1.3)
     warden (1.2.7)
       rack (>= 1.0)
@@ -782,7 +788,7 @@ DEPENDENCIES
   stackprof
   uglifier
   validates_lengths_from_database
-  vault
+  vault!
   warden
   webmock
 

From fc758183b14e456ab680ccbaaf371deb00136af3 Mon Sep 17 00:00:00 2001
From: zendesk-mattlefevre <matthew.lefevre@zendesk.com>
Date: Thu, 2 Nov 2023 15:49:31 -0600
Subject: [PATCH 3/4] correct style issue in Gemfile

---
 Gemfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index eb9da9e70..ec66f8512 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,7 +29,9 @@ gem 'omniauth', '~>2.0'
 gem 'omniauth-oauth2'
 gem 'omniauth-github', git: "https://github.com/omniauth/omniauth-github.git" # needs >1.3.0
 gem 'omniauth-google-oauth2'
-gem 'omniauth-ldap', git: 'https://github.com/omniauth/omniauth-ldap.git', ref: 'fb485bb4613074b224b8d6b28ad1c7f366a6b6d8'
+gem 'omniauth-ldap',
+  git: 'https://github.com/omniauth/omniauth-ldap.git',
+  ref: 'fb485bb4613074b224b8d6b28ad1c7f366a6b6d8'
 gem 'omniauth-gitlab'
 gem 'omniauth-atlassian-bitbucket'
 gem 'omniauth-rails_csrf_protection' # remove once https://github.com/omniauth/omniauth/pull/809 is resolved

From 2fa08a2acd6e457e1c9dccacc8b9c82d30e5d8fe Mon Sep 17 00:00:00 2001
From: zendesk-mattlefevre <matthew.lefevre@zendesk.com>
Date: Fri, 3 Nov 2023 11:54:49 -0600
Subject: [PATCH 4/4] undo vault change for real

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index ec66f8512..068e9a1df 100644
--- a/Gemfile
+++ b/Gemfile
@@ -47,7 +47,7 @@ gem 'coderay'
 gem 'net-http-persistent'
 gem 'concurrent-ruby'
 # Can delete once this PR https://github.com/hashicorp/vault-ruby/pull/188 is merged and changes reconciled
-gem 'vault', git: 'https://github.com/zendesk/vault-ruby.git', ref: 'cacb44d48f21a953a39fd9a71c1c33bcb42d77f0'
+gem 'vault', git: 'https://github.com/zendesk/vault-ruby.git', ref: '96be391a2fd50a42871c8b9dc3c59fddbdbdc556'
 gem 'lograge'
 gem 'logstash-event'
 gem 'diffy'
diff --git a/Gemfile.lock b/Gemfile.lock
index 31de1b682..be1354a13 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -19,8 +19,8 @@ GIT
 
 GIT
   remote: https://github.com/zendesk/vault-ruby.git
-  revision: cacb44d48f21a953a39fd9a71c1c33bcb42d77f0
-  ref: cacb44d48f21a953a39fd9a71c1c33bcb42d77f0
+  revision: 96be391a2fd50a42871c8b9dc3c59fddbdbdc556
+  ref: 96be391a2fd50a42871c8b9dc3c59fddbdbdc556
   specs:
     vault (0.12.0)
       aws-sigv4