omniauth-mpassid 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ff6ff316ec561eadb8093c30bcbe1097823cf11796a81386b11d40228c4cdc6
-  data.tar.gz: dd16b5f03d5e8b7814e9b210fe981b15a10521e841f9560cd40a86af67c54ce0
+  metadata.gz: 6c9ea1c51d3ddc3c48696d8fa28047dbd410f9a59418cb7f4518c579533d36ad
+  data.tar.gz: c2dc1ef5792ac9363beb524f3e608c19364e7a711e8e2a98e4c57d2bc0919a07
 SHA512:
-  metadata.gz: 2bcf7c78c1072b8c52db7e9381321fa2a9bcef19c7e5e2d62d98e161808419484c1ecb5ff7472a4fa2bd90e32ebbd735e6a6b7e8150e8a0673a4e7f46d303c6e
-  data.tar.gz: 6c4d56294369192b594a2b6afc9c0ea371d21d44b46e49078c31af3d78794c255d3000ebae7cb8dc318f5a8f36ee8c2416bbcf27086528ca389a8a4203fdf4c8
+  metadata.gz: f71ab3a1cb4a99f7ad90071c21742b9203f437496f1ebb9b87a6c402e2d2751458e834f27e35ec8691518ebcd2c2a8a8f4064ff6ecc5efd9943fcb94821a81c8
+  data.tar.gz: 165be346329403c8486d526ca2bcbe6c0b9c630f78b81b325843914523f028bd62dfb28007d5b85e370e55ce12551ff3811a19fb39bde216c2e09f1f99b2505e

data/lib/omniauth/strategies/mpassid.rb

@@ -10,6 +10,12 @@ module OmniAuth
       # :test - MPASSid test environment
       option :mode, :production
 
+      # The certificate file to define the certificate.
+      option :certificate_file, nil
+
+      # The private key file to define the private key.
+      option :private_key_file, nil
+
       # Defines the lang parameters to check from the request phase request
       # parameters. A valid language will be added to the IdP sign in redirect
       # URL as the last parameter (with the name `lang` as expected by
@@ -200,11 +206,12 @@ module OmniAuth
           [key, attribute]
         end
 
-        Hash[found_attributes]
+        found_attributes.to_h
       end
 
       option(
         :security_settings,
+        authn_requests_signed: true,
         digest_method: XMLSecurity::Document::SHA256,
         signature_method: XMLSecurity::Document::RSA_SHA256
       )
@@ -264,6 +271,9 @@ module OmniAuth
       # Add the SAML attributes to the extra hash for easier access.
       extra { {saml_attributes: saml_attributes} }
 
+      attr_accessor :options
+      attr_reader :mpassid_thread
+
       def initialize(app, *args, &block)
         super
 
@@ -271,15 +281,19 @@ module OmniAuth
         # fetched from the metadata. The options array is the one that gets
         # priority in case it overrides some of the metadata or locally defined
         # option values.
-        @options = OmniAuth::Strategy::Options.new(
-          mpassid_options.merge(options)
-        )
+        @mpassid_thread = Thread.new do
+          @options = OmniAuth::Strategy::Options.new(
+            mpassid_options.merge(options)
+          )
+          options[:security][:authn_requests_signed] = false unless options[:certificate] && options[:private_key]
+        end
       end
 
       # Override the request phase to be able to pass the lang parameter to
       # the redirect URL. Note that this needs to be the last parameter to
       # be passed to the redirect URL.
       def request_phase
+        mpassid_thread.join if mpassid_thread.alive?
         authn_request = OneLogin::RubySaml::Authrequest.new
         lang = lang_for_authn_request
 
@@ -314,6 +328,14 @@ module OmniAuth
 
     private
 
+      def certificate
+        File.read(options.certificate_file) if options.certificate_file
+      end
+
+      def private_key
+        File.read(options.private_key_file) if options.private_key_file
+      end
+
       def idp_metadata_url
         case options.mode
         when :test
@@ -337,10 +359,16 @@ module OmniAuth
           sso_binding: ['urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect']
         )
 
+        # Local certificate and private key to decrypt the responses
+        settings[:certificate] = certificate
+        settings[:private_key] = private_key
+
         # Define the security settings as there are some defaults that need to be
         # modified
         security_defaults = OneLogin::RubySaml::Settings::DEFAULTS[:security]
-        settings[:security] = security_defaults.merge(options.security_settings)
+        settings[:security] = security_defaults.merge(
+          options.security_settings.to_h.transform_keys(&:to_sym)
+        )
 
         settings
       end
@@ -357,7 +385,7 @@ module OmniAuth
 
             value = definition[:name].map do |key|
               @attributes.public_send(definition[:type], key)
-            end.reject(&:nil?).first
+            end.compact.first
 
             attrs[target] = value
           end

data/lib/omniauth-mpassid/test/certificate_generator.rb

@@ -17,14 +17,14 @@ module OmniAuth
             cert = OpenSSL::X509::Certificate.new
             cert.subject = cert.issuer = OpenSSL::X509::Name.parse(subject)
             cert.not_before = Time.now
-            cert.not_after = Time.now + 365 * 24 * 60 * 60
+            cert.not_after = Time.now + (365 * 24 * 60 * 60)
             cert.public_key = public_key
             cert.serial = 0x0
             cert.version = 2
 
             inject_certificate_extensions(cert)
 
-            cert.sign(private_key, OpenSSL::Digest::SHA1.new)
+            cert.sign(private_key, OpenSSL::Digest.new('SHA1'))
 
             cert
           end

data/lib/omniauth-mpassid/test/utility.rb

@@ -10,7 +10,7 @@ module OmniAuth
         end
 
         def self.signed_xml(raw_xml_file, opts)
-          raw_xml = IO.read(raw_xml_file)
+          raw_xml = File.read(raw_xml_file)
           signed_xml_from_string(raw_xml, opts)
         end
 

data/lib/omniauth-mpassid/version.rb

@@ -2,6 +2,6 @@
 
 module OmniAuth
   module MPASSid
-    VERSION = '0.5.0'
+    VERSION = '0.5.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-mpassid
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Antti Hukkanen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-09 00:00:00.000000000 Z
+date: 2022-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-saml
@@ -133,7 +133,8 @@ files:
 homepage: https://github.com/mainio/omniauth-mpassid
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -142,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="