Ruby 3.1対応とOpenSSLのビルドに失敗するやつ対策

mastodon/mastodon#18449
204504bySE · Jun 5, 2022 · 473e958 · 473e958
1 parent f8ada97
commit 473e958
Show file tree

Hide file tree

Showing 3 changed files with 98 additions and 29 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
-ruby '>= 2.6.0', '< 3.1.0'
+ruby '>= 2.6.0'
 
 gem 'pkg-config', '~> 1.4'
 gem 'rexml', '~> 3.2'
@@ -91,8 +91,11 @@ gem 'tty-prompt', '~> 0.23', require: false
 gem 'twitter-text', '~> 3.1.0'
 gem 'tzinfo-data', '~> 1.2022'
 gem 'webpacker', '~> 5.4'
-gem 'webpush', '~> 0.3'
-gem 'webauthn', '~> 3.0.0.alpha1'
+gem 'webpush', git: 'https://github.com/ClearlyClaire/webpush.git', ref: 'f14a4d52e201128b1b00245d11b6de80d6cfdcd9'
+gem 'webauthn', git: 'https://github.com/ClearlyClaire/webauthn-ruby.git', ref: 'ba3028a0a773e5c248c230339d27db422a9e29f8'
+gem 'cose', git: 'https://github.com/ClearlyClaire/cose-ruby.git', ref: 'c36f4268c7e0f68bac25b8cf2bb7e7a37e0240a7'
+gem 'tpm-key_attestation', git: 'https://github.com/ClearlyClaire/tpm-key_attestation.git', ref: '1cd9826c9104d8547b3a8d808faa554a887ea2b2'
+gem 'openssl-signature_algorithm', git: 'https://github.com/ClearlyClaire/openssl-signature_algorithm.git', ref: '724f325b724b6e2a23ac0b5aa42fb36e3394109a'
 
 gem 'json-ld'
 gem 'json-ld-preloaded', '~> 3.2'
@@ -155,3 +158,8 @@ gem 'connection_pool', require: false
 
 gem 'xorcist', '~> 1.1'
 gem 'faraday' 
+
+gem 'net-imap'
+gem 'net-pop'
+gem 'net-smtp'
+gem 'psych', '~> 3.1'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,3 +1,54 @@
+GIT
+  remote: https://github.com/ClearlyClaire/cose-ruby.git
+  revision: c36f4268c7e0f68bac25b8cf2bb7e7a37e0240a7
+  ref: c36f4268c7e0f68bac25b8cf2bb7e7a37e0240a7
+  specs:
+    cose (1.2.0)
+      cbor (~> 0.5.9)
+      openssl-signature_algorithm (~> 1.0)
+
+GIT
+  remote: https://github.com/ClearlyClaire/openssl-signature_algorithm.git
+  revision: 724f325b724b6e2a23ac0b5aa42fb36e3394109a
+  ref: 724f325b724b6e2a23ac0b5aa42fb36e3394109a
+  specs:
+    openssl-signature_algorithm (1.1.1)
+      openssl (> 2.0, < 3.1)
+
+GIT
+  remote: https://github.com/ClearlyClaire/tpm-key_attestation.git
+  revision: 1cd9826c9104d8547b3a8d808faa554a887ea2b2
+  ref: 1cd9826c9104d8547b3a8d808faa554a887ea2b2
+  specs:
+    tpm-key_attestation (0.10.0)
+      bindata (~> 2.4)
+      openssl (> 2.0, < 3.1)
+      openssl-signature_algorithm (~> 1.0)
+
+GIT
+  remote: https://github.com/ClearlyClaire/webauthn-ruby.git
+  revision: ba3028a0a773e5c248c230339d27db422a9e29f8
+  ref: ba3028a0a773e5c248c230339d27db422a9e29f8
+  specs:
+    webauthn (2.5.1)
+      android_key_attestation (~> 0.3.0)
+      awrence (~> 1.1)
+      bindata (~> 2.4)
+      cbor (~> 0.5.9)
+      cose (~> 1.1)
+      openssl (>= 2.2, < 3.1)
+      safety_net_attestation (~> 0.4.0)
+      tpm-key_attestation (~> 0.10.0)
+
+GIT
+  remote: https://github.com/ClearlyClaire/webpush.git
+  revision: f14a4d52e201128b1b00245d11b6de80d6cfdcd9
+  ref: f14a4d52e201128b1b00245d11b6de80d6cfdcd9
+  specs:
+    webpush (0.3.8)
+      hkdf (~> 0.2)
+      jwt (~> 2.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -79,7 +130,7 @@ GEM
     attr_encrypted (3.1.0)
       encryptor (~> 3.0.0)
     attr_required (1.0.1)
-    awrence (1.1.1)
+    awrence (1.2.1)
     aws-eventstream (1.2.0)
     aws-partitions (1.582.0)
     aws-sdk-core (3.130.2)
@@ -167,9 +218,6 @@ GEM
     color_diff (0.1)
     concurrent-ruby (1.1.10)
     connection_pool (2.2.5)
-    cose (1.0.0)
-      cbor (~> 0.5.9)
-      openssl-signature_algorithm (~> 0.4.0)
     crack (0.4.5)
       rexml
     crass (1.0.6)
@@ -192,6 +240,7 @@ GEM
       devise (>= 4.0.0)
       rpam2 (~> 4.0)
     diff-lcs (1.5.0)
+    digest (3.1.0)
     discard (1.2.1)
       activerecord (>= 4.2, < 8)
     docile (1.3.4)
@@ -400,9 +449,23 @@ GEM
     msgpack (1.5.1)
     multi_json (1.15.0)
     multipart-post (2.1.1)
+    net-imap (0.2.3)
+      digest
+      net-protocol
+      strscan
     net-ldap (0.17.0)
+    net-pop (0.1.1)
+      digest
+      net-protocol
+      timeout
+    net-protocol (0.1.3)
+      timeout
     net-scp (3.0.0)
       net-ssh (>= 2.6.5, < 7.0.0)
+    net-smtp (0.3.1)
+      digest
+      net-protocol
+      timeout
     net-ssh (6.1.0)
     nio4r (2.5.8)
     nokogiri (1.13.4)
@@ -437,8 +500,7 @@ GEM
       validate_email
       validate_url
       webfinger (>= 1.0.1)
-    openssl (2.2.0)
-    openssl-signature_algorithm (0.4.0)
+    openssl (3.0.0)
     orm_adapter (0.5.0)
     ox (2.14.11)
     parallel (1.22.1)
@@ -468,6 +530,7 @@ GEM
       pry (~> 0.13.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
+    psych (3.3.2)
     public_suffix (4.0.6)
     puma (5.6.4)
       nio4r (~> 2.0)
@@ -599,7 +662,6 @@ GEM
     scenic (1.6.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
-    securecompare (1.0.0)
     semantic_range (3.0.0)
     sidekiq (6.4.1)
       connection_pool (>= 2.2.2)
@@ -646,6 +708,7 @@ GEM
     stoplight (2.2.1)
     strong_migrations (0.7.9)
       activerecord (>= 5)
+    strscan (3.0.3)
     swd (1.3.0)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
@@ -659,9 +722,7 @@ GEM
     thwait (0.2.0)
       e2mmap
     tilt (2.0.10)
-    tpm-key_attestation (0.9.0)
-      bindata (~> 2.4)
-      openssl-signature_algorithm (~> 0.4.0)
+    timeout (0.3.0)
     tty-color (0.6.0)
     tty-cursor (0.7.1)
     tty-prompt (0.23.1)
@@ -692,16 +753,6 @@ GEM
       public_suffix
     warden (1.2.9)
       rack (>= 2.0.9)
-    webauthn (3.0.0.alpha1)
-      android_key_attestation (~> 0.3.0)
-      awrence (~> 1.1)
-      bindata (~> 2.4)
-      cbor (~> 0.5.9)
-      cose (~> 1.0)
-      openssl (~> 2.0)
-      safety_net_attestation (~> 0.4.0)
-      securecompare (~> 1.0)
-      tpm-key_attestation (~> 0.9.0)
     webfinger (1.2.0)
       activesupport
       httpclient (>= 2.4)
@@ -714,9 +765,6 @@ GEM
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
-    webpush (0.3.8)
-      hkdf (~> 0.2)
-      jwt (~> 2.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -754,6 +802,7 @@ DEPENDENCIES
   color_diff (~> 0.1)
   concurrent-ruby
   connection_pool
+  cose!
   devise (~> 4.8)
   devise-two-factor (~> 4.0)
   devise_pam_authenticatable2 (~> 9.2)
@@ -791,14 +840,18 @@ DEPENDENCIES
   memory_profiler
   microformats (~> 4.2)
   mime-types (~> 3.4.1)
+  net-imap
   net-ldap (~> 0.17)
+  net-pop
+  net-smtp
   nokogiri (~> 1.13)
   nsa (~> 0.2)
   oj (~> 3.13)
   omniauth (~> 1.9)
   omniauth-cas (~> 2.0)
   omniauth-rails_csrf_protection (~> 0.1)
   omniauth-saml (~> 1.10)
+  openssl-signature_algorithm!
   ox (~> 2.14)
   parslet
   pg (~> 1.3)
@@ -809,6 +862,7 @@ DEPENDENCIES
   private_address_check (~> 0.5)
   pry-byebug (~> 3.9)
   pry-rails (~> 0.3)
+  psych (~> 3.1)
   puma (~> 5.6)
   pundit (~> 2.2)
   rack (~> 2.2.3)
@@ -844,11 +898,18 @@ DEPENDENCIES
   stoplight (~> 2.2.1)
   strong_migrations (~> 0.7)
   thor (~> 1.2)
+  tpm-key_attestation!
   tty-prompt (~> 0.23)
   twitter-text (~> 3.1.0)
   tzinfo-data (~> 1.2022)
-  webauthn (~> 3.0.0.alpha1)
+  webauthn!
   webmock (~> 3.14)
   webpacker (~> 5.4)
-  webpush (~> 0.3)
+  webpush!
   xorcist (~> 1.1)
+
+RUBY VERSION
+   ruby 3.1.2p20
+
+BUNDLED WITH
+   2.3.7
diff --git a/spec/fabricators/webauthn_credential_fabricator.rb b/spec/fabricators/webauthn_credential_fabricator.rb
@@ -1,7 +1,7 @@
 Fabricator(:webauthn_credential) do
   user_id { Fabricate(:user).id }
   external_id { Base64.urlsafe_encode64(SecureRandom.random_bytes(16)) }
-  public_key { OpenSSL::PKey::EC.new("prime256v1").generate_key.public_key }
+  public_key { OpenSSL::PKey::EC.generate('prime256v1').public_key }
   nickname 'USB key'
   sign_count 0
 end