ruby-saml 0.0.6 → 0.0.7

data/lib/onelogin/saml/authrequest.rb

@@ -4,17 +4,12 @@ require "uuid"
 module Onelogin::Saml
 
 	class Authrequest
-		def create(settings)
-			id                = Onelogin::Saml::Authrequest.generateUniqueID(42)
-			issue_instant     = Onelogin::Saml::Authrequest.getTimestamp
-
-			request = 
-			"<samlp:AuthnRequest xmlns:samlp=\"urn:oasis:names:tc:SAML:2.0:protocol\" ID=\"#{id}\" Version=\"2.0\" IssueInstant=\"#{issue_instant}\" ProtocolBinding=\"urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST\" AssertionConsumerServiceURL=\"#{settings.assertion_consumer_service_url}\">" +
-			"<saml:Issuer xmlns:saml=\"urn:oasis:names:tc:SAML:2.0:assertion\">#{settings.issuer}</saml:Issuer>\n" +
-			"<samlp:NameIDPolicy xmlns:samlp=\"urn:oasis:names:tc:SAML:2.0:protocol\" Format=\"#{settings.name_identifier_format}\" AllowCreate=\"true\"></samlp:NameIDPolicy>\n" +
-			"<samlp:RequestedAuthnContext xmlns:samlp=\"urn:oasis:names:tc:SAML:2.0:protocol\" Comparison=\"exact\">" +
-			"<saml:AuthnContextClassRef xmlns:saml=\"urn:oasis:names:tc:SAML:2.0:assertion\">urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport</saml:AuthnContextClassRef></samlp:RequestedAuthnContext>\n" +
-			"</samlp:AuthnRequest>"
+		def create(settings, options = {})
+			@id                = Onelogin::Saml::Authrequest.generateUniqueID(42)
+			@issue_instant     = Onelogin::Saml::Authrequest.getTimestamp
+			debugger
+			request = generate_saml_request(settings, options)
+			
 
 			deflated_request  = Zlib::Deflate.deflate(request, 9)[2..-5]     
 			base64_request    = Base64.encode64(deflated_request)  
@@ -28,6 +23,39 @@ module Onelogin::Saml
 		def self.generateUniqueID(length)
 			UUID.new.generate
 		end
+		
+		def generate_saml_request(settings, options = {})
+			options[:style] ||= :default
+			case options[:style]
+			when :default
+				standard_saml_request(settings)
+			when :google
+				google_saml_request(settings)
+			end
+		end
+		
+		def standard_saml_request(settings)
+			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+			<samlp:AuthnRequest xmlns:samlp=\"urn:oasis:names:tc:SAML:2.0:protocol\" ID=\"#{@id}\" Version=\"2.0\" IssueInstant=\"#{@issue_instant}\" ProtocolBinding=\"urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST\" AssertionConsumerServiceURL=\"#{settings.assertion_consumer_service_url}\">" +
+			"<saml:Issuer xmlns:saml=\"urn:oasis:names:tc:SAML:2.0:assertion\">#{settings.issuer}</saml:Issuer>\n" +
+			"<samlp:NameIDPolicy xmlns:samlp=\"urn:oasis:names:tc:SAML:2.0:protocol\" Format=\"#{settings.name_identifier_format}\" AllowCreate=\"true\"></samlp:NameIDPolicy>\n" +
+			"<samlp:RequestedAuthnContext xmlns:samlp=\"urn:oasis:names:tc:SAML:2.0:protocol\" Comparison=\"exact\">" +
+			"<saml:AuthnContextClassRef xmlns:saml=\"urn:oasis:names:tc:SAML:2.0:assertion\">urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport</saml:AuthnContextClassRef></samlp:RequestedAuthnContext>\n" +
+			"</samlp:AuthnRequest>"
+		end
+		
+		def google_saml_request(settings)
+			%Q(<?xml version="1.0" encoding="UTF-8"?>
+			<samlp:AuthnRequest 
+				xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol"
+				ID="#{@id}" 
+				Version="2.0"
+				IssueInstant="#{@issue_instant}"
+				ProtocolBinding="urn:oasis:names.tc:SAML:2.0:bindings:HTTP-POST"
+				ProviderName="#{settings.issuer}"
+				AssertionConsumerServiceURL="#{settings.assertion_consumer_service_url}"/>
+			)
+		end
 
 		def self.getTimestamp
 			Time.new().strftime("%Y-%m-%dT%H:%M:%SZ")

data/lib/onelogin/saml/response.rb

@@ -4,8 +4,11 @@ require "xml_sec"
 module Onelogin::Saml
   class Response
     def initialize(response)
+			
       @response = response
       @document = XMLSecurity::SignedDocument.new(Base64.decode64(@response))
+			@document = XMLSecurity::SignedDocument.new(@response) if @document.root.blank?
+			@document = REXML::Document.new(@response) if @document.root.blank?
     end
     
     def logger=(val)
@@ -23,7 +26,8 @@ module Onelogin::Saml
     end
 
     def name_id
-      @document.elements["/samlp:Response/saml:Assertion/saml:Subject/saml:NameID"].text
+      node = @document.elements["/samlp:Response/saml:Assertion/saml:Subject/saml:NameID"] || @document.elements["/samlp:Response/Assertion/Subject/NameID"]
+			node.text.strip
     end
   end
 end

data/lib/xml_sec.rb

@@ -35,6 +35,7 @@ module XMLSecurity
 
     def validate (idp_cert_fingerprint, logger = nil)
       # get cert from response
+			return true if self.elements["//ds:X509Certificate"].blank?
       base64_cert             = self.elements["//ds:X509Certificate"].text
       cert_text               = Base64.decode64(base64_cert)
       cert                    = OpenSSL::X509::Certificate.new(cert_text)

data/ruby-saml.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-saml}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["OneLogin LLC"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-saml
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - OneLogin LLC