Fix following cops:

- Style/HashTransformKeys
- Style/IdenticalConditionalBranches
- Style/IfInsideElse
- Style/IfUnlessModifier
- Style/InverseMethods
- Style/NegatedUnless
- Style/NonNilCheck
- Style/Not

Author: johnnyshields

.rubocop.yml

@@ -5,6 +5,8 @@ AllCops:
   NewCops: disable
   Include:
     - 'lib/**/*'
+  Exclude:
+    - '**/*.xsd'
 
 #Bundler:
 #  Enabled: false

.rubocop_todo.yml

@@ -550,27 +550,6 @@ Style/GuardClause:
     - 'lib/onelogin/ruby-saml/utils.rb'
     - 'lib/xml_security.rb'
 
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/HashTransformKeys:
-  Exclude:
-    - 'lib/onelogin/ruby-saml/idp_metadata_parser.rb'
-
-# Offense count: 2
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/IdenticalConditionalBranches:
-  Exclude:
-    - 'lib/onelogin/ruby-saml/idp_metadata_parser.rb'
-
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowIfModifier.
-Style/IfInsideElse:
-  Exclude:
-    - 'lib/onelogin/ruby-saml/attributes.rb'
-    - 'lib/onelogin/ruby-saml/utils.rb'
-    - 'lib/xml_security.rb'
-
 # Offense count: 69
 # This cop supports safe autocorrection (--autocorrect).
 Style/IfUnlessModifier:
@@ -587,13 +566,6 @@ Style/IfUnlessModifier:
     - 'lib/onelogin/ruby-saml/utils.rb'
     - 'lib/xml_security.rb'
 
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: InverseMethods, InverseBlocks.
-Style/InverseMethods:
-  Exclude:
-    - 'lib/onelogin/ruby-saml/idp_metadata_parser.rb'
-
 # Offense count: 20
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
@@ -616,14 +588,6 @@ Style/NegatedIf:
     - 'lib/onelogin/ruby-saml/response.rb'
     - 'lib/onelogin/ruby-saml/settings.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: both, prefix, postfix
-Style/NegatedUnless:
-  Exclude:
-    - 'lib/onelogin/ruby-saml/logoutresponse.rb'
-
 # Offense count: 6
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, MinBodyLength.
@@ -636,20 +600,6 @@ Style/Next:
     - 'lib/onelogin/ruby-saml/slo_logoutrequest.rb'
     - 'lib/xml_security.rb'
 
-# Offense count: 8
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: IncludeSemanticChanges.
-Style/NonNilCheck:
-  Exclude:
-    - 'lib/onelogin/ruby-saml/authrequest.rb'
-    - 'lib/onelogin/ruby-saml/slo_logoutresponse.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Style/Not:
-  Exclude:
-    - 'lib/onelogin/ruby-saml/settings.rb'
-
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Strict, AllowedNumbers, AllowedPatterns.

lib/onelogin/ruby-saml/attributes.rb

@@ -128,9 +128,9 @@ def fetch(name)
           if name.is_a?(Regexp)
             if name.respond_to? :match?
               return self[attribute_key] if name.match?(attribute_key)
-            else 
-              return self[attribute_key] if name.match(attribute_key)
-            end
+            elsif name.match(attribute_key)
+              return self[attribute_key]
+            end 
           elsif canonize_name(name) == canonize_name(attribute_key)
             return self[attribute_key]
           end

lib/onelogin/ruby-saml/authrequest.rb

@@ -121,15 +121,16 @@ def create_xml_document(settings)
         root.attributes['ForceAuthn'] = settings.force_authn unless settings.force_authn.nil?
 
         # Conditionally defined elements based on settings
-        if settings.assertion_consumer_service_url != nil
+        unless settings.assertion_consumer_service_url.nil?
           root.attributes["AssertionConsumerServiceURL"] = settings.assertion_consumer_service_url
         end
-        if settings.sp_entity_id != nil
+
+        unless settings.sp_entity_id.nil?
           issuer = root.add_element "saml:Issuer"
           issuer.text = settings.sp_entity_id
         end
 
-        if settings.name_identifier_value_requested != nil
+        unless settings.name_identifier_value_requested.nil?
           subject = root.add_element "saml:Subject"
 
           nameid = subject.add_element "saml:NameID"
@@ -140,7 +141,7 @@ def create_xml_document(settings)
           subject_confirmation.attributes['Method'] = "urn:oasis:names:tc:SAML:2.0:cm:bearer"
         end
 
-        if settings.name_identifier_format != nil
+        unless settings.name_identifier_format.nil?
           root.add_element "samlp:NameIDPolicy", {
               # Might want to make AllowCreate a setting?
               "AllowCreate" => "true",
@@ -150,7 +151,7 @@ def create_xml_document(settings)
 
         if settings.authn_context || settings.authn_context_decl_ref
 
-          if settings.authn_context_comparison != nil
+          if !settings.authn_context_comparison.nil?
             comparison = settings.authn_context_comparison
           else
             comparison = 'exact'
@@ -160,15 +161,15 @@ def create_xml_document(settings)
             "Comparison" => comparison,
           }
 
-          if settings.authn_context != nil
+          unless settings.authn_context.nil?
             authn_contexts_class_ref = settings.authn_context.is_a?(Array) ? settings.authn_context : [settings.authn_context]
             authn_contexts_class_ref.each do |authn_context_class_ref|
               class_ref = requested_context.add_element "saml:AuthnContextClassRef"
               class_ref.text = authn_context_class_ref
             end
           end
 
-          if settings.authn_context_decl_ref != nil
+          unless settings.authn_context_decl_ref.nil?
             authn_contexts_decl_refs = settings.authn_context_decl_ref.is_a?(Array) ? settings.authn_context_decl_ref : [settings.authn_context_decl_ref]
             authn_contexts_decl_refs.each do |authn_context_decl_ref|
               decl_ref = requested_context.add_element "saml:AuthnContextDeclRef"

lib/onelogin/ruby-saml/idp_metadata_parser.rb

@@ -181,7 +181,7 @@ def parse_to_idp_metadata_array(idp_metadata, options = {})
         @options = options
 
         idpsso_descriptors = self.class.get_idps(@document, options[:entity_id])
-        if !idpsso_descriptors.any?
+        if idpsso_descriptors.none?
           raise ArgumentError.new("idp_metadata must contain an IDPSSODescriptor element")
         end
 
@@ -407,23 +407,19 @@ def merge_certificates_into(parsed_metadata)
               (certificates_has_one('signing') && certificates_has_one('encryption') &&
               certificates["signing"][0] == certificates["encryption"][0])
 
-            if certificates.key?("signing")
-              parsed_metadata[:idp_cert] = certificates["signing"][0]
-              parsed_metadata[:idp_cert_fingerprint] = fingerprint(
-                parsed_metadata[:idp_cert],
-                parsed_metadata[:idp_cert_fingerprint_algorithm]
-              )
-            else
-              parsed_metadata[:idp_cert] = certificates["encryption"][0]
-              parsed_metadata[:idp_cert_fingerprint] = fingerprint(
-                parsed_metadata[:idp_cert],
-                parsed_metadata[:idp_cert_fingerprint_algorithm]
-              )
-            end
+            parsed_metadata[:idp_cert] = if certificates.key?("signing")
+                                           certificates["signing"][0]
+                                         else
+                                           certificates["encryption"][0]
+                                         end
+            parsed_metadata[:idp_cert_fingerprint] = fingerprint(
+              parsed_metadata[:idp_cert],
+              parsed_metadata[:idp_cert_fingerprint_algorithm]
+            )
           end
 
           # symbolize keys of certificates and pass it on
-          parsed_metadata[:idp_cert_multi] = Hash[certificates.map { |k, v| [k.to_sym, v] }]
+          parsed_metadata[:idp_cert_multi] = certificates.transform_keys(&:to_sym)
         end
 
         def certificates_has_one(key)

lib/onelogin/ruby-saml/logoutresponse.rb

@@ -210,7 +210,7 @@ def valid_issuer?
       # @raise [ValidationError] if soft == false and validation fails
       #
       def validate_signature
-        return true unless !options.nil?
+        return true if options.nil?
         return true unless options.has_key? :get_params
         return true unless options[:get_params].has_key? 'Signature'
 

lib/onelogin/ruby-saml/settings.rb

@@ -193,7 +193,7 @@ def get_idp_cert
       def get_idp_cert_multi
         return nil if idp_cert_multi.nil? || idp_cert_multi.empty?
 
-        raise ArgumentError.new("Invalid value for idp_cert_multi") if not idp_cert_multi.is_a?(Hash)
+        raise ArgumentError.new("Invalid value for idp_cert_multi") if !idp_cert_multi.is_a?(Hash)
 
         certs = {signing: [], encryption: [] }
 

lib/onelogin/ruby-saml/slo_logoutresponse.rb

@@ -129,7 +129,7 @@ def create_xml_document(settings, request_id = nil, logout_message = nil, status
         root.attributes['InResponseTo'] = request_id unless request_id.nil?
         root.attributes['Destination'] = destination unless destination.nil? or destination.empty?
 
-        if settings.sp_entity_id != nil
+        unless settings.sp_entity_id.nil?
           issuer = root.add_element "saml:Issuer"
           issuer.text = settings.sp_entity_id
         end

lib/onelogin/ruby-saml/utils.rb

@@ -80,8 +80,8 @@ def self.format_cert(cert)
         # don't try to format an encoded certificate or if is empty or nil
         if cert.respond_to?(:ascii_only?)
           return cert if cert.nil? || cert.empty? || !cert.ascii_only?
-        else
-          return cert if cert.nil? || cert.empty? || cert.match(/\x0d/)
+        elsif cert.nil? || cert.empty? || cert.match(/\x0d/)
+          return cert
         end
 
         if cert.scan(/BEGIN CERTIFICATE/).length > 1

lib/xml_security.rb

@@ -226,16 +226,12 @@ def validate_document(idp_cert_fingerprint, soft = true, options = {})
         if fingerprint != idp_cert_fingerprint.gsub(/[^a-zA-Z0-9]/,"").downcase
           return append_error("Fingerprint mismatch", soft)
         end
+      elsif options[:cert]
+        base64_cert = Base64.encode64(options[:cert].to_pem)
+      elsif soft
+        return false
       else
-        if options[:cert]
-          base64_cert = Base64.encode64(options[:cert].to_pem)
-        else
-          if soft
-            return false
-          else
-            return append_error("Certificate element missing in response (ds:X509Certificate) and not cert provided at settings", soft)
-          end
-        end
+        return append_error("Certificate element missing in response (ds:X509Certificate) and not cert provided at settings", soft)
       end
       validate_signature(base64_cert, soft)
     end