Fix rubocop

SAML-Toolkits · Jul 10, 2024 · d163dfd · d163dfd
1 parent dc46b9e
commit d163dfd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/lib/ruby_saml/settings.rb b/lib/ruby_saml/settings.rb
@@ -281,9 +281,9 @@ def get_sp_signature_method
                 when OpenSSL::PKey::RSA then 'RSA'
                 when OpenSSL::PKey::DSA then 'DSA'
                 when OpenSSL::PKey::EC  then 'ECDSA'
-                else
-                  'RSA'
+                else # rubocop:disable Lint/DuplicateBranch
                   # raise ArgumentError.new("Unsupported signing key type: #{get_sp_signing_key.class}")
+                  'RSA'
                 end
 
       begin

diff --git a/lib/ruby_saml/xml/crypto.rb b/lib/ruby_saml/xml/crypto.rb
@@ -8,6 +8,7 @@
 
 module RubySaml
   module XML
+    # XML Signature and Canonicalization algorithms
     module Crypto
       extend self
 
@@ -55,7 +56,7 @@ def signature_algorithm(element)
               when 'rsa'   then OpenSSL::PKey::RSA
               when 'dsa'   then OpenSSL::PKey::DSA
               when 'ecdsa' then OpenSSL::PKey::EC
-              else
+              else # rubocop:disable Lint/DuplicateBranch
                 # TODO: raise ArgumentError.new("Invalid key algorithm: #{alg}")
                 OpenSSL::PKey::RSA
               end
@@ -73,7 +74,7 @@ def hash_algorithm(element)
         when 'sha256' then OpenSSL::Digest::SHA256
         when 'sha384' then OpenSSL::Digest::SHA384
         when 'sha512' then OpenSSL::Digest::SHA512
-        else
+        else # rubocop:disable Lint/DuplicateBranch
           # TODO: raise ArgumentError.new("Invalid hash algorithm: #{alg}")
           OpenSSL::Digest::SHA256
         end

diff --git a/lib/ruby_saml/xml/document.rb b/lib/ruby_saml/xml/document.rb
@@ -96,7 +96,7 @@ def sign_document(private_key, certificate, signature_method = RSA_SHA256, diges
         issuer_element = elements['//saml:Issuer']
         if issuer_element
           root.insert_after(issuer_element, signature_element)
-        elsif first_child = root.children[0]
+        elsif (first_child = root.children[0])
           root.insert_before(first_child, signature_element)
         else
           root.add_element(signature_element)

diff --git a/lib/ruby_saml/xml/signed_document.rb b/lib/ruby_saml/xml/signed_document.rb
@@ -106,7 +106,7 @@ def validate_signature(base64_cert, soft = true)
           './ds:SignedInfo/ds:SignatureMethod',
           { 'ds' => RubySaml::XML::Crypto::DSIG }
         )
-        signature_key_algorithm, signature_hash_algorithm = RubySaml::XML::Crypto.signature_algorithm(sig_alg_value)
+        signature_hash_algorithm = RubySaml::XML::Crypto.hash_algorithm(sig_alg_value)
 
         # get signature
         base64_signature = REXML::XPath.first(
@@ -186,7 +186,8 @@ def process_transforms(ref, canon_algorithm)
         )
 
         transforms.each do |transform_element|
-          next unless transform_element.attributes && transform_element.attributes['Algorithm']
+          next unless transform_element.attributes&.[]('Algorithm')
+
           canon_algorithm = RubySaml::XML::Crypto.canon_algorithm(transform_element, default: false)
         end