Update our main branch with beta changes

.github/workflows/ci.yml

@@ -10,38 +10,81 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3']
-        gemfile: [rails_5.2.gemfile, rails_6.1.gemfile, rails_7.0.gemfile, rails_7.1.gemfile, rails_dev.gemfile]
+        ruby: ['2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4', '4.0']
+        gemfile: [rails_5.2.gemfile, rails_6.1.gemfile, rails_7.0.gemfile, rails_7.1.gemfile, rails_7.2.gemfile, rails_8.0.gemfile, rails_8.1.gemfile, rails_dev.gemfile]
         exclude:
+          # Ruby 3.3 is min version for Rails 8.2
           - ruby: '2.5'
-            gemfile: rails_7.0.gemfile
+            gemfile: rails_dev.gemfile
+          - ruby: '2.6'
+            gemfile: rails_dev.gemfile
+          - ruby: '2.7'
+            gemfile: rails_dev.gemfile
+          - ruby: '3.0'
+            gemfile: rails_dev.gemfile
+          - ruby: '3.1'
+            gemfile: rails_dev.gemfile
+          - ruby: '3.2'
+            gemfile: rails_dev.gemfile
+          # Ruby 3.2 is min version for Rails 8.1
           - ruby: '2.5'
-            gemfile: rails_7.1.gemfile
+            gemfile: rails_8.1.gemfile
+          - ruby: '2.6'
+            gemfile: rails_8.1.gemfile
+          - ruby: '2.7'
+            gemfile: rails_8.1.gemfile
+          - ruby: '3.0'
+            gemfile: rails_8.1.gemfile
+          - ruby: '3.1'
+            gemfile: rails_8.1.gemfile
+          # Ruby 3.2 is min version for Rails 8.0
           - ruby: '2.5'
-            gemfile: rails_dev.gemfile
+            gemfile: rails_8.0.gemfile
           - ruby: '2.6'
-            gemfile: rails_7.0.gemfile
+            gemfile: rails_8.0.gemfile
+          - ruby: '2.7'
+            gemfile: rails_8.0.gemfile
+          - ruby: '3.0'
+            gemfile: rails_8.0.gemfile
+          - ruby: '3.1'
+            gemfile: rails_8.0.gemfile
+          # Ruby 3.1 is min version for Rails 7.2
+          - ruby: '2.5'
+            gemfile: rails_7.2.gemfile
           - ruby: '2.6'
+            gemfile: rails_7.2.gemfile
+          - ruby: '2.7'
+            gemfile: rails_7.2.gemfile
+          - ruby: '3.0'
+            gemfile: rails_7.2.gemfile
+          # Ruby 2.7 is min version for Rails 7.1
+          - ruby: '2.5'
             gemfile: rails_7.1.gemfile
           - ruby: '2.6'
-            gemfile: rails_dev.gemfile
-          - ruby: '2.7'
-            gemfile: rails_dev.gemfile
+            gemfile: rails_7.1.gemfile
+          # Ruby 2.7 is min version for Rails 7.0
+          - ruby: '2.5'
+            gemfile: rails_7.0.gemfile
+          - ruby: '2.6'
+            gemfile: rails_7.0.gemfile
+          # Ruby 2.7 is max version for Rails 5.2
           - ruby: '3.0'
             gemfile: rails_5.2.gemfile
-          - ruby: '3.0'
-            gemfile: rails_dev.gemfile
           - ruby: '3.1'
             gemfile: rails_5.2.gemfile
           - ruby: '3.2'
             gemfile: rails_5.2.gemfile
           - ruby: '3.3'
             gemfile: rails_5.2.gemfile
+          - ruby: '3.4'
+            gemfile: rails_5.2.gemfile
+          - ruby: '4.0'
+            gemfile: rails_5.2.gemfile
     runs-on: ubuntu-latest
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

.ruby-version

@@ -1 +1 @@
-3.1.2
+3.3.5

Appraisals

@@ -5,17 +5,34 @@ end
 
 appraise 'rails-6.1' do
   gem 'rails', '~> 6.1.0'
-  gem 'activeresource', '~> 5.1.0'
+  gem 'activeresource', '>= 5.1.0'
+  gem 'bigdecimal'
+  gem 'mutex_m'
+  gem 'benchmark'
+  gem 'concurrent-ruby', '1.3.4'
 end
 
 appraise 'rails-7.0' do
   gem 'rails', '~> 7.0.0'
-  gem 'activeresource', '~> 6.0.0'
+  gem 'bigdecimal'
+  gem 'mutex_m'
+  gem 'concurrent-ruby', '1.3.4'
 end
 
 appraise 'rails-7.1' do
   gem 'rails', '~> 7.1.0'
-  gem 'activeresource', '~> 6.0.0'
+end
+
+appraise 'rails-7.2' do
+  gem 'rails', '~> 7.2.0'
+end
+
+appraise 'rails-8.0' do
+  gem 'rails', '~> 8.0.0'
+end
+
+appraise 'rails-8.1' do
+  gem 'rails', '~> 8.1.0'
 end
 
 appraise 'rails-dev' do

README.md

@@ -24,9 +24,13 @@ Add this to your Gemfile:
 
 Include `SamlIdp::Controller` and see the examples that use rails. It should be straightforward for you.
 
-Basically you call `decode_request(params[:SAMLRequest])` on an incoming request and then use the value
-`saml_acs_url` to determine the source for which you need to authenticate a user. How you authenticate
-a user is entirely up to you.
+Basically, you call `decode_request(params[:SAMLRequest])` on an incoming request and then use the value 
+`saml_acs_url` to determine the source for which you need to authenticate a user. 
+If the signature (`Signature`) and signing algorithm (`SigAlg`) are provided as external parameters in the request,
+you can pass those parameters as `decode_request(params[:SAMLRequest], params[:Signature], params[:SigAlg], params[:RelayState])`.
+Then, you can verify the request signature with the `valid?` method.
+
+How you authenticate a user is entirely up to you.
 
 Once a user has successfully authenticated on your system send the Service Provider a SAMLResponse by
 posting to `saml_acs_url` the parameter `SAMLResponse` with the return value from a call to

gemfiles/rails_5.2.gemfile

@@ -4,5 +4,6 @@ source "https://rubygems.org"
 
 gem "rails", "~> 5.2.4"
 gem "activeresource", "~> 5.1.0"
+gem 'concurrent-ruby', '1.3.4'
 
 gemspec path: "../"

gemfiles/rails_6.1.gemfile

@@ -3,6 +3,10 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 6.1.0"
-gem "activeresource", "~> 5.1.0"
+gem "activeresource", ">= 5.1.0"
+gem "bigdecimal"
+gem "mutex_m"
+gem "benchmark"
+gem "concurrent-ruby", "1.3.4"
 
 gemspec path: "../"

gemfiles/rails_7.0.gemfile

@@ -3,6 +3,8 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 7.0.0"
-gem "activeresource", "~> 6.0.0"
+gem "bigdecimal"
+gem "mutex_m"
+gem "concurrent-ruby", "1.3.4"
 
 gemspec path: "../"

gemfiles/rails_7.1.gemfile

@@ -3,6 +3,5 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 7.1.0"
-gem "activeresource", "~> 6.0.0"
 
 gemspec path: "../"

gemfiles/rails_7.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 7.2.0"
+
+gemspec path: "../"

gemfiles/rails_8.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 8.0.0"
+
+gemspec path: "../"

gemfiles/rails_8.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 8.1.0"
+
+gemspec path: "../"

lib/saml_idp.rb

@@ -9,7 +9,7 @@ module SamlIdp
   require 'saml_idp/metadata_builder'
   require 'saml_idp/version'
   require 'saml_idp/fingerprint'
-  require 'saml_idp/engine' if defined?(::Rails)
+  require 'saml_idp/engine' if defined?(::Rails::Engine)
 
   def self.config
     @config ||= SamlIdp::Configurator.new
@@ -70,9 +70,9 @@ def signed?
         !!xpath("//ds:Signature", ds: signature_namespace).first
       end
 
-      def valid_signature?(fingerprint)
+      def valid_signature?(certificate, fingerprint)
         signed? &&
-          signed_document.validate(fingerprint, :soft)
+          signed_document.validate(certificate, fingerprint, :soft)
       end
 
       def signed_document

lib/saml_idp/algorithmable.rb

@@ -1,10 +1,9 @@
 module SamlIdp
   module Algorithmable
     def algorithm
-      algorithm_check = raw_algorithm || SamlIdp.config.algorithm
-      return algorithm_check if algorithm_check.respond_to?(:digest)
+      return raw_algorithm if raw_algorithm.respond_to?(:digest)
       begin
-        OpenSSL::Digest.const_get(algorithm_check.to_s.upcase)
+        OpenSSL::Digest.const_get(raw_algorithm.to_s.upcase)
       rescue NameError
         OpenSSL::Digest::SHA1
       end