omniauth-doximity-oauth2 1.1.0 → 1.2.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a941429b4cb288cff3a243611bb0d88bf2b51d7db5bf107a03a74277d102de1
-  data.tar.gz: b086f57d50729fcefcdcd69fef37ff49f0848240fe80acbb7d00d4917adc6c40
+  metadata.gz: 7a115db51c6901227e768b5d4e6b3936cece507e74e95c56e863df69ea8df6a9
+  data.tar.gz: d271503b99bac24d5c48f2671f50d2fee7f2d76f154a6964910e567af76f8f5c
 SHA512:
-  metadata.gz: d7a6c93b65876218e96c5818662b52b12d567db38ebed83134a592f53b312c4ffcf855eac9d30081586d3345b9fc6b9bb2f2cd38e2c85e0cda0f0d73ab6a7a30
-  data.tar.gz: 394c6007a8656388518aab15ef085d7e12aa0b1734fdeac0db99619bb0af4687e068044f5feb7d194e0de28c48f1ac613368344474f90b6b66b2b19c65964ed3
+  metadata.gz: d3e64fd03c57ced3f0b77ebb95a0ef3b8d32e6907ad16d3b65da5fc314f1a4085ed7c7b0b2d6b89dadfc67a641d5693bfa71ff9b8348d3b292cb03e55ad5f04b
+  data.tar.gz: '0208112352a8904c69b7a54c602c10f3e017881efc73f6e5e257bf9bca130288fd3438aa35bdac7f2dcd697004f077bd0fc5fc9833a1e290ba5c8d3794ab894e'

data/.github/CODEOWNERS

@@ -1,2 +1,5 @@
 # Back-end team
 * @doximity/mofo_backend
+
+# Infra Automation
+/.circleci @doximity/infra_automation_reviewers

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+## 1.2.0.pre - 05/05/2023
+  * Update mechanism for verifying RSA public keys to work on OpenSSL 3
+  * Ensure state persists between initial call and on callback
+
 ## 1.1.0 - 06/13/2022
   * Add "prompt" parameter to be persisted on request, allowing for silent authentication (among other things)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    omniauth-doximity-oauth2 (1.1.0)
+    omniauth-doximity-oauth2 (1.2.0.pre)
       activesupport
       faraday
       jwt

data/lib/omniauth/strategies/doximity_oauth2.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "omniauth/strategies/oauth2"
+require "omniauth-doximity-oauth2/crypto"
 require "omniauth-doximity-oauth2/errors"
 require "active_support/core_ext/hash/indifferent_access"
 require "uri"
@@ -74,13 +75,16 @@ module OmniAuth
         @raw_credential_info ||= access_token.to_hash.with_indifferent_access
       end
 
-      def authorize_params
+      def authorize_params # rubocop:disable Metrics/AbcSize
         super.tap do |params|
           options[:authorize_options].each do |v|
             params[v.to_sym] = request.params[v.to_s] if request.params[v.to_s]
           end
 
           params[:scope] = get_scope(params)
+
+          # Ensure state is persisted
+          session['omniauth.state'] = params[:state] if params[:state]
         end
       end
 
@@ -98,7 +102,7 @@ module OmniAuth
         keys = request_keys
 
         public_key_params = keys.find { |key| key["kid"] == header["kid"] }
-        rsa_key = create_rsa_key(public_key_params["n"], public_key_params["e"])
+        rsa_key = Crypto.create_rsa_key(public_key_params["n"], public_key_params["e"])
 
         body, = JWT.decode(token, rsa_key.public_key, true, { algorithm: header["alg"] })
         body
@@ -125,11 +129,6 @@ module OmniAuth
 
         MultiJson.load(response.body)["keys"]
       end
-
-      def create_rsa_key(n, e)
-        key = OpenSSL::PKey::RSA.new
-        key.set_key(OpenSSL::BN.new(Base64.urlsafe_decode64(n), 2), OpenSSL::BN.new(Base64.urlsafe_decode64(e), 2), nil)
-      end
     end
   end
 end

data/lib/omniauth-doximity-oauth2/crypto.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Omniauth
+  module DoximityOauth2
+    # Static crypto methods
+    class Crypto
+      def self.create_rsa_key(n, e)
+        data_sequence = OpenSSL::ASN1::Sequence([
+                                                  OpenSSL::ASN1::Integer(base64_to_long(n)),
+                                                  OpenSSL::ASN1::Integer(base64_to_long(e))
+                                                ])
+        asn1 = OpenSSL::ASN1::Sequence(data_sequence)
+        OpenSSL::PKey::RSA.new(asn1.to_der)
+      end
+
+      private
+
+      def base64_to_long(data)
+        decoded_with_padding = Base64.urlsafe_decode64(data) + Base64.decode64("==")
+        decoded_with_padding.to_s.unpack("C*").map do |byte|
+          byte_to_hex(byte)
+        end.join.to_i(16)
+      end
+
+      def byte_to_hex(int)
+        int < 16 ? "0#{int.to_s(16)}" : int.to_s(16)
+      end
+    end
+  end
+end

data/lib/omniauth-doximity-oauth2/version.rb

@@ -2,6 +2,6 @@
 
 module Omniauth
   module DoximityOauth2
-    VERSION = "1.1.0"
+    VERSION = "1.2.0.pre"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-doximity-oauth2
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0.pre
 platform: ruby
 authors:
 - William Harvey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-14 00:00:00.000000000 Z
+date: 2023-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -199,6 +199,7 @@ files:
 - README.md
 - Rakefile
 - lib/omniauth-doximity-oauth2.rb
+- lib/omniauth-doximity-oauth2/crypto.rb
 - lib/omniauth-doximity-oauth2/errors.rb
 - lib/omniauth-doximity-oauth2/version.rb
 - lib/omniauth/strategies/doximity_oauth2.rb
@@ -264,9 +265,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.11
 signing_key: