saml2 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 382418cbc200bcf81a58ff09ebadd551d0c16101
-  data.tar.gz: 0f7318a0d65eb9b80afbe0405d6dc768cc4e3f0d
+  metadata.gz: 788b9842bac7051e976ef2a7360d488f2a0249e1
+  data.tar.gz: 4c654aedef625b8c7ac918775158174406b570cd
 SHA512:
-  metadata.gz: 0b0462631aa2d2c0208655bf85e8a104555034176df8825f42029f1356a745d07f561f15a5c78719e8a1400eb70063cc89c6014abaf226a3294d5a6a0aa319c1
-  data.tar.gz: c1ad828d647e905e3e92e4e34c2e4856a370fe32abf9bfe337e344dd34e46a95b9d344f5c3cd7542a1636a068febad623af0a83ee2cc524d7c0e74eb7cb8a61e
+  metadata.gz: 70b0409bc9a42a6c4786f5de2c3dfc09a18dc518e290fe450f3874695876c8f3ffb41e4baa59e0850c1af43a8f1aecc6a0978ec047f18c7d8b7d9407e5c6beb4
+  data.tar.gz: 802adedaadd6e2c033b4d6c7ec4e9d97fd7426bc8e7244ccd253cddbe89762466c03d59e0af98b7ca33f021abf42b8b1337ba537d703cd3e4e00bf4a2f78acf2

data/lib/saml2/authn_request.rb

@@ -7,6 +7,7 @@ require 'saml2/endpoint'
 require 'saml2/name_id'
 require 'saml2/namespaces'
 require 'saml2/request'
+require 'saml2/requested_authn_context'
 require 'saml2/schemas'
 require 'saml2/subject'
 
@@ -21,13 +22,14 @@ module SAML2
       AuthnRequest.from_xml(Nokogiri::XML('<xml></xml>').root)
     end
 
-    def valid_schema?
-      return false unless super
-      # Check for the correct root element
-      return false unless xml.at_xpath('/samlp:AuthnRequest', Namespaces::ALL)
-
-      true
-    end
+    attr_writer :assertion_consumer_service_index,
+                :assertion_consumer_service_url,
+                :attribute_consuming_service_index,
+                :force_authn,
+                :name_id_policy,
+                :passive,
+                :protocol_binding
+    attr_accessor :requested_authn_context
 
     def valid_web_browser_sso_profile?
       return false unless issuer
@@ -64,37 +66,81 @@ module SAML2
     end
 
     def name_id_policy
-      @name_id_policy ||= NameID::Policy.from_xml(xml.at_xpath('samlp:NameIDPolicy', Namespaces::ALL))
+      if xml && !instance_variable_defined?(:@name_id_policy)
+        @name_id_policy = NameID::Policy.from_xml(xml.at_xpath('samlp:NameIDPolicy', Namespaces::ALL))
+      end
+      @name_id_policy
     end
 
     attr_reader :assertion_consumer_service, :attribute_consuming_service
 
-    def assertion_consumer_service_url
-      xml['AssertionConsumerServiceURL']
+    def assertion_consumer_service_index
+      if xml && !instance_variable_defined?(:@assertion_consumer_service_index)
+        @assertion_consumer_service_index = xml['AssertionConsumerServiceIndex']&.to_i
+      end
+      @assertion_consumer_service_index
     end
 
-    def assertion_consumer_service_index
-      xml['AssertionConsumerServiceIndex'] && xml['AssertionConsumerServiceIndex'].to_i
+    def assertion_consumer_service_url
+      if xml && !instance_variable_defined?(:@assertion_consumer_service_url)
+        @assertion_consumer_service_url = xml['AssertionConsumerServiceURL']
+      end
+      @assertion_consumer_service_url
     end
 
     def attribute_consuming_service_index
-      xml['AttributeConsumerServiceIndex'] && xml['AttributeConsumerServiceIndex'].to_i
+      if xml && !instance_variable_defined?(:@attribute_consuming_service_index)
+        @attribute_consuming_service_index = xml['AttributeConsumingServiceIndex']&.to_i
+      end
+      @attribute_consuming_service_index
     end
 
     def force_authn?
-      xml['ForceAuthn']
+      if xml && !instance_variable_defined?(:@force_authn)
+        @force_authn = xml['ForceAuthn']&.== 'true'
+      end
+      @force_authn
     end
 
     def passive?
-      xml['IsPassive']
+      if xml && !instance_variable_defined?(:@passive)
+        @passive = xml['IsPassive']&.== 'true'
+      end
+      @passive
     end
 
     def protocol_binding
-      xml['ProtocolBinding']
+      if xml && !instance_variable_defined?(:@protocol_binding)
+        @protocol_binding = xml['ProtocolBinding']
+      end
+      @protocol_binding
     end
 
     def subject
-      @subject ||= Subject.from_xml(xml.at_xpath('saml:Subject', Namespaces::ALL))
+      if xml && !instance_variable_defined?(:@subject)
+        @subject = Subject.from_xml(xml.at_xpath('saml:Subject', Namespaces::ALL))
+      end
+      @subject
+    end
+
+    def build(builder)
+      builder['samlp'].AuthnRequest(
+          'xmlns:samlp' => Namespaces::SAMLP,
+          'xmlns:saml' => Namespaces::SAML
+      ) do |authn_request|
+        super(authn_request)
+
+        authn_request.parent['AssertionConsumerServiceIndex'] = assertion_consumer_service_index if assertion_consumer_service_index
+        authn_request.parent['AssertionConsumerServiceURL'] = assertion_consumer_service_url if assertion_consumer_service_url
+        authn_request.parent['AttributeConsumingServiceIndex'] = attribute_consuming_service_index if attribute_consuming_service_index
+        authn_request.parent['ForceAuthn'] = force_authn? unless force_authn?.nil?
+        authn_request.parent['IsPassive'] = passive? unless passive?.nil?
+        authn_request.parent['ProtocolBinding'] = protocol_binding if protocol_binding
+
+        subject.build(authn_request) if subject
+        name_id_policy.build(authn_request) if name_id_policy
+        requested_authn_context.build(authn_request) if requested_authn_context
+      end
     end
   end
 end

data/lib/saml2/name_id.rb

@@ -13,26 +13,48 @@ module SAML2
       X509_SUBJECT_NAME             = "urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName".freeze
     end
 
-    class Policy
-      attr_reader :format
+    class Policy < Base
+      attr_writer :allow_create, :format, :sp_name_qualifier
 
-      def self.from_xml(node)
-        if node
-          allow_create = node['AllowCreate'].nil? ? nil : node['AllowCreate'] == 'true'
-          NameID::Policy.new(allow_create, node['Format'])
+      def initialize(allow_create = nil, format = nil, sp_name_qualifier = nil)
+        @allow_create = allow_create if allow_create
+        @format = format if format
+        @sp_name_qualifier = sp_name_qualifier if sp_name_qualifier
+      end
+
+      def allow_create?
+        if xml && !instance_variable_defined?(:@allow_create)
+          @allow_create = xml['AllowCreate']&.== 'true'
         end
+        @allow_create
       end
 
-      def initialize(allow_create, format)
-        @allow_create, @format = allow_create, format
+      def format
+        if xml && !instance_variable_defined?(:@format)
+          @format = xml['Format']
+        end
+        @format
       end
 
-      def allow_create?
-        @allow_create
+      def sp_name_qualifier
+        if xml && !instance_variable_defined?(:@sp_name_qualifier)
+          @sp_name_qualifier = xml['SPNameQualifier']
+        end
+        @sp_name_qualifier
       end
 
       def ==(rhs)
-        format == rhs.format && allow_create? == rhs.allow_create?
+        allow_create? == rhs.allow_create? &&
+            format == rhs.format &&
+            sp_name_qualifier == rhs.sp_name_qualifier
+      end
+
+      def build(builder)
+        builder['samlp'].NameIDPolicy do |name_id_policy|
+          name_id_policy.parent['Format'] = format if format
+          name_id_policy.parent['SPNameQualifier'] = sp_name_qualifier if sp_name_qualifier
+          name_id_policy.parent['AllowCreate'] = allow_create? unless allow_create?.nil?
+        end
       end
     end
 

data/lib/saml2/requested_authn_context.rb

@@ -0,0 +1,16 @@
+require 'saml2/base'
+
+module SAML2
+  class RequestedAuthnContext < Base
+    attr_accessor :comparison, :class_ref
+
+    def build(builder)
+      builder['samlp'].RequestedAuthnContext do |requested_authn_context|
+        requested_authn_context.parent['Comparison'] = comparison.to_s if comparison
+        Array(class_ref).each do |individual_class_ref|
+          requested_authn_context['saml'].AuthnContextClassRef(individual_class_ref)
+        end
+      end
+    end
+  end
+end

data/lib/saml2/subject.rb

@@ -2,15 +2,15 @@ require 'saml2/name_id'
 require 'saml2/namespaces'
 
 module SAML2
-  class Subject
-    attr_accessor :name_id, :confirmation
+  class Subject < Base
+    attr_writer :name_id
+    attr_accessor :confirmation
 
-    def self.from_xml(node)
-      return nil unless node
-      subject = new
-      subject.name_id = NameID.from_xml(node.at_xpath('saml:NameID', Namespaces::ALL))
-
-      subject
+    def name_id
+      if xml && !instance_variable_defined?(:@name_id)
+        @name_id = NameID.from_xml(node.at_xpath('saml:NameID', Namespaces::ALL))
+      end
+      @name_id
     end
 
     def build(builder)
@@ -20,7 +20,7 @@ module SAML2
       end
     end
 
-    class Confirmation
+    class Confirmation < Base
       module Methods
         BEARER         = 'urn:oasis:names:tc:SAML:2.0:cm:bearer'.freeze
         HOLDER_OF_KEY  = 'urn:oasis:names:tc:SAML:2.0:cm:holder-of-key'.freeze

data/lib/saml2/version.rb

@@ -1,3 +1,3 @@
 module SAML2
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/spec/lib/authn_request_spec.rb

@@ -42,7 +42,24 @@ module SAML2
     end
 
     it "should find the NameID policy" do
-      expect(request.name_id_policy).to eq NameID::Policy.new(true, NameID::Format::PERSISTENT)
+      expect(request.name_id_policy).to eq NameID::Policy.new(true, NameID::Format::PERSISTENT, "moodle.bridge.feide.no")
+    end
+
+    it 'serializes valid XML' do
+      authn_request = AuthnRequest.new
+      authn_request.issuer = NameID.new("entity")
+      authn_request.protocol_binding = "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
+      authn_request.assertion_consumer_service_url = 'https://somewhere/'
+      authn_request.name_id_policy = NameID::Policy.new(true, NameID::Format::UNSPECIFIED)
+      authn_request.requested_authn_context = RequestedAuthnContext.new
+      authn_request.requested_authn_context.class_ref = "urn:oasis:names:tc:SAML:2.0:ac:classes:Password"
+      authn_request.requested_authn_context.comparison = :exact
+      authn_request.passive = true
+      xml = authn_request.to_s
+      authn_request = AuthnRequest.parse(xml)
+      expect(authn_request).to be_valid_schema
+      expect(authn_request.force_authn?).to eq nil
+      expect(authn_request.passive?).to eq true
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saml2
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-02 00:00:00.000000000 Z
+date: 2017-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -59,7 +59,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -154,6 +154,7 @@ files:
 - lib/saml2/organization.rb
 - lib/saml2/organization_and_contacts.rb
 - lib/saml2/request.rb
+- lib/saml2/requested_authn_context.rb
 - lib/saml2/response.rb
 - lib/saml2/role.rb
 - lib/saml2/schemas.rb