saml2 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd165c781d6283a5102e01b4ddb5e2d1582fe279
-  data.tar.gz: 1a1be21ad87cd148bb4fb454d45aa3ea082fd521
+  metadata.gz: d7d5c5444ba487bb6a231a2b42b51032497a4676
+  data.tar.gz: 8851a491f0846b07d16522c7511336e416e3636d
 SHA512:
-  metadata.gz: 97ac827b3a274e025ebf9725d61daf4578514df6f90db860c01ce0f2834a758a8c3bdaa59054575b9ea06d363e06632e892932faa7841e956ff0bca9d864f05e
-  data.tar.gz: b01827f1c9e28d78d7bf978e9fab2becd0864f00ecfd5e2917a0aa6bfe6545829b2199ac8bd616904c43b3267029f31f8d2c7aa9b472eb824b1cc533be45b9d5
+  metadata.gz: 26d24e54a21ece33cc931f2534be59b53dc66707688d96f19913313a50c75276822daf6e80f587549a958b3ae44b1f73b82b65e526eb55059a17e106db5e09e0
+  data.tar.gz: 54265e05b0d014b86ae07199cf9cc90f33b78decaed88218e9e923bda9048a523fccb92f365c74832d598a2dfd066e35a38c1cd236c35aada156eb0991c4cd9f

data/lib/saml2/authn_request.rb

@@ -31,6 +31,21 @@ module SAML2
                 :protocol_binding
     attr_accessor :requested_authn_context
 
+    def self.initiate(issuer, identity_provider = nil,
+        assertion_consumer_service: nil,
+        service_provider: nil)
+      authn_request = new
+      authn_request.issuer = issuer
+      authn_request.destination = identity_provider.single_sign_on_services.first.location if identity_provider
+      authn_request.name_id_policy = NameID::Policy.new(true, NameID::Format::UNSPECIFIED)
+      assertion_consumer_service ||= service_provider.assertion_consumer_services.default if service_provider
+      if assertion_consumer_service
+        authn_request.protocol_binding = assertion_consumer_service.binding
+        authn_request.assertion_consumer_service_url = assertion_consumer_service.location
+      end
+      authn_request
+    end
+
     def valid_web_browser_sso_profile?
       return false unless issuer
       return false if issuer.format && issuer.format != NameID::Format::ENTITY

data/lib/saml2/bindings/http_post.rb

@@ -0,0 +1,7 @@
+module SAML2
+  module Bindings
+    module HTTP_POST
+      URN ="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST".freeze
+    end
+  end
+end

data/lib/saml2/endpoint.rb

@@ -1,15 +1,16 @@
 require 'saml2/bindings/http_redirect'
+require 'saml2/bindings/http_post'
 
 module SAML2
   class Endpoint < Base
     module Bindings
-      HTTP_POST     = "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST".freeze
+      HTTP_POST     = ::SAML2::Bindings::HTTP_POST::URN
       HTTP_REDIRECT = ::SAML2::Bindings::HTTPRedirect::URN
     end
 
     attr_reader :location, :binding
 
-    def initialize(location = nil, binding = Bindings::HTTP_POST)
+    def initialize(location = nil, binding = ::SAML2::Bindings::HTTP_POST::URN)
       @location, @binding = location, binding
     end
 
@@ -30,7 +31,7 @@ module SAML2
     class Indexed < Endpoint
       include IndexedObject
 
-      def initialize(location = nil, index = nil, is_default = nil, binding = Bindings::HTTP_POST)
+      def initialize(location = nil, index = nil, is_default = nil, binding = ::SAML2::Bindings::HTTP_POST::URN)
         super(location, binding)
         @index, @is_default = index, is_default
       end

data/lib/saml2/indexed_object.rb

@@ -33,16 +33,12 @@ module SAML2
       attr_reader :default
 
       def self.from_xml(nodes)
-        new(nodes.map { |node| name.split('::')[1..-2].inject(SAML2) { |mod, klass| mod.const_get(klass) }.from_xml(node) })
+        new(nodes.map { |node| name.split('::')[1..-2].inject(SAML2) { |mod, klass| mod.const_get(klass) }.from_xml(node) }).freeze
       end
 
-      def initialize(objects)
-        replace(objects.sort_by { |object| object.index || 0 })
-        @index = {}
-        each { |object| @index[object.index] = object }
-        @default = find { |object| object.default? } || first
-
-        freeze
+      def initialize(objects = nil)
+        replace(objects.sort_by { |object| object.index || 0 }) if objects
+        re_index
       end
 
       def [](index)
@@ -52,6 +48,19 @@ module SAML2
       def resolve(index)
         index ? self[index] : default
       end
+
+      def <<(value)
+        super
+        re_index
+      end
+
+      protected
+
+      def re_index
+        @index = {}
+        each { |object| @index[object.index] = object }
+        @default = find { |object| object.default? } || first
+      end
     end
 
     def build(builder, *)

data/lib/saml2/service_provider.rb

@@ -7,8 +7,8 @@ module SAML2
   class ServiceProvider < SSO
     def initialize
       super
-      @assertion_consumer_services = []
-      @attribute_consuming_services = []
+      @assertion_consumer_services = Endpoint::Indexed::Array.new
+      @attribute_consuming_services = AttributeConsumingService::Array.new
     end
 
     def from_xml(node)

data/lib/saml2/version.rb

@@ -1,3 +1,3 @@
 module SAML2
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
 end

data/spec/lib/authn_request_spec.rb

@@ -52,11 +52,8 @@ module SAML2
     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 = AuthnRequest.initiate(NameID.new("entity"),
+        assertion_consumer_service: Endpoint.new('https://somewhere/'))
       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

data/spec/lib/service_provider_spec.rb

@@ -13,7 +13,7 @@ module SAML2
 
       sp = ServiceProvider.new
       sp.single_logout_services << Endpoint.new('https://sso.canvaslms.com/SAML2/Logout',
-                                                 Endpoint::Bindings::HTTP_REDIRECT)
+                                                 Bindings::HTTPRedirect::URN)
       sp.assertion_consumer_services << Endpoint::Indexed.new('https://sso.canvaslms.com/SAML2/Login1', 0)
       sp.assertion_consumer_services << Endpoint::Indexed.new('https://sso.canvaslms.com/SAML2/Login2', 1)
       sp.keys << Key.new('somedata', Key::Type::ENCRYPTION, [Key::EncryptionMethod.new])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saml2
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-18 00:00:00.000000000 Z
+date: 2017-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -137,6 +137,7 @@ files:
 - lib/saml2/authn_statement.rb
 - lib/saml2/base.rb
 - lib/saml2/bindings.rb
+- lib/saml2/bindings/http_post.rb
 - lib/saml2/bindings/http_redirect.rb
 - lib/saml2/conditions.rb
 - lib/saml2/contact.rb
@@ -220,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: SAML 2.0 Library