Make ruby-saml 1.8.7 compatible

SAML-Toolkits · Apr 8, 2019 · 9e6849e · 9e6849e
1 parent 367189d
commit 9e6849e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/onelogin/ruby-saml/idp_metadata_parser.rb b/lib/onelogin/ruby-saml/idp_metadata_parser.rb
@@ -12,6 +12,7 @@ module RubySaml
     # Auxiliary class to retrieve and parse the Identity Provider Metadata
     #
     class IdpMetadataParser
+
       module SamlMetadata
         module Vocabulary
           METADATA       = "urn:oasis:names:tc:SAML:2.0:metadata"
@@ -385,7 +386,9 @@ def merge_parsed_metadata_into(settings, parsed_metadata)
         settings
       end
 
-      private_constant :SamlMetadata, :IdpMetadata
+      if self.respond_to?(:private_constant)
+        private_constant :SamlMetadata, :IdpMetadata
+      end
     end
   end
 end
diff --git a/lib/onelogin/ruby-saml/utils.rb b/lib/onelogin/ruby-saml/utils.rb
@@ -22,7 +22,11 @@ class Utils
       #
       def self.format_cert(cert)
         # don't try to format an encoded certificate or if is empty or nil
-        return cert if cert.nil? || cert.empty? || !cert.ascii_only?
+        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/)
+        end
 
         if cert.scan(/BEGIN CERTIFICATE/).length > 1
           formatted_cert = []