samlr 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6094cc422e3c1b4b142851b36834b9730951800
-  data.tar.gz: 00b21f42fa02b1f0b99f0c7683c023a6afa450f4
+  metadata.gz: ff0c127da7d3901b26a715c4a9466d08ff82af1c
+  data.tar.gz: 3f8fdb9e448341a7b1128569e456dccf1e44d552
 SHA512:
-  metadata.gz: 25091398892548578f7eaf39cb8541c48c1de673e703c5433713872f7c69301bb29206dc8fa7254178fc5ca1f9bb705531c03ff4345d7da067dc4489baf57fbc
-  data.tar.gz: 08cdd18525af9b2b938635ce658b2f1ff828e65d349948f239f6dd8ce49022e0dcaf665bcd0cdb646d88f889dd3b906872074561983a47570e8ab2dfb07ab43c
+  metadata.gz: 4705d104543371a3c61a72ac723f136c7d7cdb00c8aa51f5fd6d6b2909a9942ef03bf6f0388e3407e6c035c777fd5b02414cb81529b3219af652e838a3cb17b4
+  data.tar.gz: 7a4e6fadb9d14f2691d6008ab82e78427d6d1b6c71d64904bf5913aa23163083f9d837a081cf7c5699e1178238a2a60b4f53d62e14fd90bcd7e80870d8f4f39d

data/lib/samlr/tools/logout_request_builder.rb

@@ -5,8 +5,6 @@ module Samlr
     # Use this for building the SAML logout request XML
     module LogoutRequestBuilder
       def self.build(options = {})
-        name_id_format  = options[:name_id_format] || EMAIL_FORMAT
-
         # Mandatory
         name_id = options.fetch(:name_id)
         issuer  = options.fetch(:issuer)
@@ -14,14 +12,32 @@ module Samlr
         builder = Nokogiri::XML::Builder.new do |xml|
           xml.LogoutRequest("xmlns:samlp" => NS_MAP["samlp"], "xmlns:saml" => NS_MAP["saml"], "ID" => Samlr::Tools.uuid, "IssueInstant" => Samlr::Tools::Timestamp.stamp, "Version" => "2.0") do
             xml.doc.root.namespace = xml.doc.root.namespace_definitions.find { |ns| ns.prefix == "samlp" }
-
             xml["saml"].Issuer(issuer)
-            xml["saml"].NameID(name_id, "Format" => name_id_format)
+            xml["saml"].NameID(name_id, logout_options(options))
           end
         end
 
         builder.to_xml(COMPACT)
       end
+
+      def self.logout_options(options)
+        name_id_options  = options[:name_id_options] || {}
+        options = { "Format" => format_option(options) }
+        options.merge!("NameQualifier" => name_id_options[:name_qualifier]) if name_id_options[:name_qualifier]
+        options.merge!("SPNameQualifier" => name_id_options[:spname_qualifier]) if name_id_options[:spname_qualifier]
+        options
+      end
+
+      def self.format_option(options)
+        if options[:name_id_format]
+          warn "[DEPRECATION] options[:name_id_format] is deprecated. Please use options[:name_id_options][:format] instead"
+          options[:name_id_format]
+        elsif options[:name_id_options] && options[:name_id_options][:format]
+          options[:name_id_options][:format]
+        else
+          EMAIL_FORMAT
+        end
+      end
     end
   end
 end

data/samlr.gemspec

@@ -1,4 +1,4 @@
-Gem::Specification.new "samlr", "2.0.2" do |s|
+Gem::Specification.new "samlr", "2.0.3" do |s|
   s.summary     = "Ruby tools for SAML"
   s.description = "Helps you implement a SAML SP"
   s.authors     = ["Morten Primdahl"]

data/test/unit/test_logout_request.rb

@@ -1,11 +1,15 @@
 require File.expand_path("test/test_helper")
 
 describe Samlr::LogoutRequest do
-  before do
-    @request = Samlr::LogoutRequest.new(
+  let(:options) {
+    {
       :issuer => "https://sp.example.com/saml2",
       :name_id => "test@test.com"
-    )
+    }
+  }
+
+  before do
+    @request = Samlr::LogoutRequest.new(options)
   end
 
   describe "#body" do
@@ -36,4 +40,34 @@ describe Samlr::LogoutRequest do
       end
     end
   end
+
+  describe "with optional params" do
+    it "understands name_id_format" do
+      options.merge!(:name_id_format => "some format")
+      request = Samlr::LogoutRequest.new(options)
+
+      assert_match /<saml:NameID Format="some format">/, request.body
+    end
+
+    it "understands [:name_id_options][:format]" do
+      options.merge!(:name_id_options => {:format => "some format"})
+      request = Samlr::LogoutRequest.new(options)
+
+      assert_match /<saml:NameID Format="some format">/, request.body
+    end
+
+    it "understands NameQualifier" do
+      options.merge!(:name_id_options => {:name_qualifier => "Some name qualifier"})
+      request = Samlr::LogoutRequest.new(options)
+
+      assert_match /NameQualifier="Some name qualifier"/, request.body
+    end
+
+    it "understands SPNameQualifier" do
+      options.merge!(:name_id_options => {:spname_qualifier => "Some SPName qualifier"})
+      request = Samlr::LogoutRequest.new(options)
+
+      assert_match /SPNameQualifier="Some SPName qualifier"/, request.body
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: samlr
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Morten Primdahl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri