saml2 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90af41e6460d5aa014d4b54d4e597868d005e26b
-  data.tar.gz: 00833d534d9a8e97c08a78d52becb64b70b82aab
+  metadata.gz: a3df3b121cbc505cf89bd09bf2551c4bf169522e
+  data.tar.gz: bee5074779df61a8d6decfc85b1137f407f3bafb
 SHA512:
-  metadata.gz: 88afb82849c17a10a3b2d0bb580cec358bc2cbdbb26ddb4b0c16d0d236aca871be81b514c6b86b6cb35163fa91b44a13e011df7f1c16d902371ce88657463406
-  data.tar.gz: 2f7b4cb6fef7079a6dca04a8051e0f7921199962d50ab24123d439e8fa179dcb5903875173f6b791d3c13fb7268d237b323682a4017f6d43491fd2b6e8b387bf
+  metadata.gz: f960b992502f20a9a518b53a34e7c50d5d3fae14452d51704f1eb36308accf5f3a48e3f5810d35a31bb3a64cb605ba2a5a49a18e6d01d8f36037a467ab36bf0a
+  data.tar.gz: 050953212fed3515aa2a329b24e1adcf1fc7f57bed49d86e700db5d0e47bae8f6c6cc346e1cb02bae366302bcb5c1ce414e32fc7d97adb6b1ad49ee7205a9a3f

data/lib/saml2/attribute.rb

@@ -1,23 +1,10 @@
+require 'date'
+
 require 'saml2/base'
 require 'saml2/namespaces'
 
 module SAML2
-  class AttributeType < Base
-    attr_accessor :name, :friendly_name, :name_format
-
-    def initialize(name = nil, friendly_name = nil, name_format = nil)
-      @name, @friendly_name, @name_format = name, friendly_name, name_format
-    end
-
-    def from_xml(node)
-      @name = node['Name']
-      @friendly_name = node['FriendlyName']
-      @name_format = node['NameFormat']
-      self
-    end
-  end
-
-  class Attribute < AttributeType
+  class Attribute < Base
     module NameFormats
       BASIC       = "urn:oasis:names:tc:SAML:2.0:attrname-format:basic".freeze
       UNSPECIFIED = "urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified".freeze
@@ -38,25 +25,28 @@ module SAML2
         super unless self == Attribute
 
         # look for an appropriate subclass
-        klass = subclasses.find { |klass| klass.recognizes?(node) }
-        if klass
-          klass.from_xml(node)
-        else
-          super
-        end
+        klass = class_for(node)
+        klass ? klass.from_xml(node) : super
       end
 
       def create(name, value = nil)
-        klass = subclasses.find { |klass| klass.recognizes?(name) } || self
-        klass.new(name, value)
+
+        (class_for(name) || self).new(name, value)
+      end
+
+      protected
+
+      def class_for(name_or_node)
+        subclasses.find do |klass|
+          klass.respond_to?(:recognizes?) && klass.recognizes?(name_or_node)
+        end
       end
     end
 
-    attr_accessor :value
+    attr_accessor :name, :friendly_name, :name_format, :value
 
     def initialize(name = nil, value = nil, friendly_name = nil, name_format = nil)
-      super(name, friendly_name, name_format)
-      @value = value
+      @name, @value, @friendly_name, @name_format = name, value, friendly_name, name_format
     end
 
     def build(builder)
@@ -73,10 +63,17 @@ module SAML2
     end
 
     def from_xml(node)
-      @value = node.xpath('saml:AttributeValue', Namespaces::ALL).map do |node|
+      @name = node['Name']
+      @friendly_name = node['FriendlyName']
+      @name_format = node['NameFormat']
+      values = node.xpath('saml:AttributeValue', Namespaces::ALL).map do |node|
         convert_from_xsi(node['xsi:type'], node.content && node.content.strip)
       end
-      @value = @value.first if @value.length == 1
+      @value = case values.length
+               when 0; nil
+               when 1; values.first
+               else; values
+               end
       super
     end
 

data/lib/saml2/attribute_consuming_service.rb

@@ -3,9 +3,9 @@ require 'saml2/indexed_object'
 require 'saml2/namespaces'
 
 module SAML2
-  class RequestedAttribute < AttributeType
+  class RequestedAttribute < Attribute
     def initialize(name = nil, is_required = nil, name_format = nil)
-      super(name, name_format)
+      super(name, nil, nil, name_format)
       @is_required = is_required
     end
 
@@ -28,6 +28,17 @@ module SAML2
     end
   end
 
+  class InvalidAttributeValue < RuntimeError
+    attr_reader :requested_attribute, :provided_value
+
+    def initialize(requested_attribute, provided_value)
+      super("Attribute #{requested_attribute.name} is provided value " \
+        "#{provided_value.inspect}, but only allows "                  \
+        "#{Array(requested_attribute.value).inspect}")
+      @requested_attribute, @provided_value = requested_attribute, provided_value
+    end
+  end
+
   class AttributeConsumingService < Base
     include IndexedObject
 
@@ -64,9 +75,20 @@ module SAML2
           attr ||= attributes_hash[[requested_attr.name, nil]]
         end
         if attr
+          if requested_attr.value &&
+            !Array(requested_attr.value).include?(attr.value)
+            raise InvalidAttributeValue.new(requested_attr, attr.value)
+          end
           attributes << attr
         elsif requested_attr.required?
-          raise RequiredAttributeMissing.new(requested_attr)
+          # if the metadata includes only one possible value, helpfully set
+          # that value
+          if requested_attr.value && !requested_attr.value.is_a?(::Array)
+            attributes << Attribute.create(requested_attr.name,
+                                           requested_attr.value)
+          else
+            raise RequiredAttributeMissing.new(requested_attr)
+          end
         end
       end
       return nil if attributes.empty?

data/lib/saml2/version.rb

@@ -1,3 +1,3 @@
 module SAML2
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/spec/lib/attribute_consuming_service_spec.rb

@@ -69,6 +69,59 @@ module SAML2
         stmt.attributes.first.name.must_equal 'name'
         stmt.attributes.first.value.must_equal 'cody'
       end
+
+      it "requires that provided attributes match a single default" do
+        acs.requested_attributes.clear
+        attr = RequestedAttribute.new('attr')
+        attr.value = 'value'
+        acs.requested_attributes << attr
+        -> { acs.create_statement('attr' => 'something') }.must_raise InvalidAttributeValue
+        stmt = acs.create_statement('attr' => 'value')
+        stmt.attributes.length.must_equal 1
+        stmt.attributes.first.name.must_equal 'attr'
+        stmt.attributes.first.value.must_equal 'value'
+      end
+
+      it "requires that provided attributes be from allowed enumeration" do
+        acs.requested_attributes.clear
+        attr = RequestedAttribute.new('attr')
+        attr.value = ['value1', 'value2']
+        acs.requested_attributes << attr
+        -> { acs.create_statement('attr' => 'something') }.must_raise InvalidAttributeValue
+        stmt = acs.create_statement('attr' => 'value1')
+        stmt.attributes.length.must_equal 1
+        stmt.attributes.first.name.must_equal 'attr'
+        stmt.attributes.first.value.must_equal 'value1'
+      end
+
+      it "auto-provides missing required attribute with a default" do
+        acs.requested_attributes.clear
+        attr = RequestedAttribute.new('attr', true)
+        attr.value = 'value'
+        acs.requested_attributes << attr
+        stmt = acs.create_statement({})
+        stmt.attributes.length.must_equal 1
+        stmt.attributes.first.name.must_equal 'attr'
+        stmt.attributes.first.value.must_equal 'value'
+      end
+
+      it "doesn't auto-provide missing required attribute with an enumeration" do
+        acs.requested_attributes.clear
+        attr = RequestedAttribute.new('attr', true)
+        attr.value = ['value1', 'value2']
+        acs.requested_attributes << attr
+        -> { acs.create_statement({}) }.must_raise RequiredAttributeMissing
+      end
+
+      it "doesn't auto-provide missing non-required attribute with a default" do
+        acs.requested_attributes.clear
+        attr = RequestedAttribute.new('attr')
+        attr.value = 'value'
+        acs.requested_attributes << attr
+        stmt = acs.create_statement({})
+        stmt.must_equal nil
+      end
+
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saml2
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri