rack_entra_id_auth 1.0.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0a2ea6b5c8890bdf9e35c1dc4d8b1dcce9ecd085d212948e83ae1621165698e
-  data.tar.gz: '095bdcaf3880329d01fecd0d70b4478e8f5850ce941989f172e46f1403917ec3'
+  metadata.gz: 1203180f536c61e3f893d7b94beab66c2769c22979daf217421ef11e6d07a9d9
+  data.tar.gz: 4815b5403b5d113460246780faed0f4925216002099da173f24348075a901a91
 SHA512:
-  metadata.gz: 02f0be8e2d05113930639578e75777cf1cb36764fefa4ca6cb1cc9b56dbdc805531463789c206976ab2ac8e0e4233dca5e42e47662e5d4e2d231b20065e46881
-  data.tar.gz: 01471a840c03d0bfed7958a8a96cfe2dc1d242a53e4615fcbd9515464009b1c082971b78d88e4f0a43053983c968f7f146d63781b3664558dcb53b552550d0ff
+  metadata.gz: aaa60faf6eac7b26d71426f88bfaf46a088134fbe71e3dab4d8f929172f5847e1c422690ce190f910693acbbc87b42a7d7245ef1832aeef583ff400ab54b96ed
+  data.tar.gz: 76f7a00c6a86fe63e7c78f69f26457b07fe3eee61674923b6ee4a3935dd3bf721e9267678326fe8377e0dc4b3ca2c8578d3d6ee3190f1b25726c644e1932f4aa

data/lib/rack_entra_id_auth/configuration.rb

@@ -1,9 +1,49 @@
 require 'active_support/configurable'
+require 'ruby-saml'
 
 module RackEntraIdAuth
   class Configuration
     include ActiveSupport::Configurable
 
+    RUBY_SAML_SETTINGS = %i(
+      idp_entity_id
+      idp_sso_service_url
+      idp_slo_service_url
+      idp_slo_response_service_url
+      idp_cert
+      idp_cert_fingerprint
+      idp_cert_fingerprint_algorithm
+      idp_cert_multi
+      idp_attribute_names
+      idp_name_qualifier
+      valid_until
+      sp_entity_id
+      assertion_consumer_service_url
+      single_logout_service_url
+      sp_name_qualifier
+      name_identifier_format
+      name_identifier_value
+      name_identifier_value_requested
+      sessionindex
+      compress_request
+      compress_response
+      double_quote_xml_attribute_values
+      message_max_bytesize
+      passive
+      attributes_index
+      force_authn
+      certificate
+      private_key
+      sp_cert_multi
+      authn_context
+      authn_context_comparison
+      authn_context_decl_ref
+      security
+      soft
+    )
+
+    RUBY_SAML_SETTINGS.each { |ruby_saml_setting| config_accessor ruby_saml_setting }
+
     config_accessor :login_path, default: '/login'
     config_accessor :login_relay_state_url
     config_accessor :logout_path, default: '/logout'
@@ -24,57 +64,29 @@ module RackEntraIdAuth
     }
     config_accessor :skip_single_logout, default: true
 
-    # Ruby SAML ID Provider Settings
-    config_accessor :idp_entity_id
-    config_accessor :idp_sso_service_url
-    config_accessor :idp_slo_service_url
-    config_accessor :idp_slo_response_service_url
-    config_accessor :idp_cert
-    config_accessor :idp_cert_fingerprint
-    config_accessor :idp_cert_fingerprint_algorithm
-    config_accessor :idp_cert_multi
-    config_accessor :idp_attribute_names
-    config_accessor :idp_name_qualifier
-    config_accessor :valid_until
+    def configuration_options (configuration_options = {})
+      configuration_options.slice(:metadata_url, *RUBY_SAML_SETTINGS).each do |key, value|
+        self.send("#{key}=", value) unless value.nil?
+      end
+    end
+
+    def metadata_url
+      @metadata_url
+    end
+
+    def metadata_url= (metadata_url)
+      @metadata_url = metadata_url
 
-    # Ruby SAML Service Provider Settings
-    config_accessor :sp_entity_id
-    config_accessor :assertion_consumer_service_url
-    config_accessor :single_logout_service_url
-    config_accessor :sp_name_qualifier
-    config_accessor :name_identifier_format
-    config_accessor :name_identifier_value
-    config_accessor :name_identifier_value_requested
-    config_accessor :sessionindex
-    config_accessor :compress_request
-    config_accessor :compress_response
-    config_accessor :double_quote_xml_attribute_values
-    config_accessor :message_max_bytesize
-    config_accessor :passive
-    config_accessor :attributes_index
-    config_accessor :force_authn
-    config_accessor :certificate
-    config_accessor :private_key
-    config_accessor :sp_cert_multi
-    config_accessor :authn_context
-    config_accessor :authn_context_comparison
-    config_accessor :authn_context_decl_ref
+      OneLogin::RubySaml::IdpMetadataParser.new.parse_remote_to_hash(metadata_url)
+        .slice(*RUBY_SAML_SETTINGS).each do |key, value|
+          self.send("#{key}=", value) unless value.nil?
+        end
 
-    # Ruby SAML workflow Settings
-    config_accessor :security
-    config_accessor :soft
+      @metadata_url
+    end
 
     def ruby_saml_settings
-      config.to_h.except(
-        :login_path,
-        :login_relay_state_url,
-        :logout_path,
-        :logout_relay_state_url,
-        :mock_server,
-        :mock_attributes,
-        :session_key,
-        :session_value_proc,
-        :skip_single_logout)
+      config.to_h.slice(*RUBY_SAML_SETTINGS)
     end
   end
 end

data/lib/rack_entra_id_auth/middleware.rb

@@ -66,13 +66,13 @@ module RackEntraIdAuth
         if !auth_response.is_valid?
           log(env, "Invalid single login reponse from Entra ID: #{auth_response.errors.first}")
 
-          return internal_server_error_response("Invalid login reponse from Entra ID: #{auth_response.errors.first}")
+          return internal_server_error_response("Invalid single login reponse from Entra ID: #{auth_response.errors.first}")
         end
 
         if !auth_response.success?
           log(env, 'Unsuccessful single single reponse from Entra ID.')
 
-          return internal_server_error_response('Unsuccessful login reponse from Entra ID.')
+          return internal_server_error_response('Unsuccessful single login reponse from Entra ID.')
         end
 
         log(env, 'Initializing session and redirecting to relay state URL…')
@@ -94,7 +94,7 @@ module RackEntraIdAuth
         if !logout_request.is_valid?
           log(env, "Invalid single logout request from Entra ID: #{logout_request.errors.first}")
 
-          return internal_server_error_response("Invalid logout request from Entra ID: #{logout_request.errors.first}")
+          return internal_server_error_response("Invalid single logout request from Entra ID: #{logout_request.errors.first}")
         end
 
         log(env, 'Destroying session and sending logout response to Entra ID…')
@@ -124,13 +124,13 @@ module RackEntraIdAuth
         if !logout_response.validate
           log(env, "Invalid single logout reponse from Entra ID: #{logout_response.errors.first}")
 
-          return internal_server_error_response("Invalid logout reponse from Entra ID: #{logout_response.errors.first}")
+          return internal_server_error_response("Invalid single logout reponse from Entra ID: #{logout_response.errors.first}")
         end
 
         if !logout_response.success?
           log(env, 'Unsuccessful single logout reponse from Entra ID.')
 
-          return internal_server_error_response('Unsuccessful logout reponse from Entra ID.')
+          return internal_server_error_response('Unsuccessful single logout reponse from Entra ID.')
         end
 
         log(env, 'Destroying session and redirecting to relay state URL…')

data/lib/rack_entra_id_auth/version.rb

@@ -1,3 +1,3 @@
 module RackEntraIdAuth
-  VERSION = '1.0.3'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack_entra_id_auth
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.2.0
 platform: ruby
 authors:
 - David Susco
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-01 00:00:00.000000000 Z
+date: 2024-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -119,7 +119,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/dsusco/rack_entra_id_auth/issues
-  changelog_uri: https://github.com/dsusco/rack_entra_id_auth/releases/tag/v1.0.3
+  changelog_uri: https://github.com/dsusco/rack_entra_id_auth/releases/tag/v1.2.0
   homepage_uri: https://github.com/dsusco/rack_entra_id_auth
   source_code_uri: https://github.com/dsusco/rack_entra_id_auth
 post_install_message: