saml_idp 0.3.0 → 0.3.1

data/README.md

@@ -204,7 +204,7 @@ excellent [ruby-saml](https://github.com/onelogin/ruby-saml) gem.
 
 
 # Author
-Jon Phenow, jon.phenow@sportngin.com
+Jon Phenow, me@jphenow.com
 
 Lawrence Pit, lawrence.pit@gmail.com, lawrencepit.com, @lawrencepit
 

data/lib/saml_idp/assertion_builder.rb

@@ -52,15 +52,17 @@ module SamlIdp
               restriction.Audience audience_uri
             end
           end
-          assertion.AttributeStatement do |attr_statement|
-            config.attributes.each do |friendly_name, attrs|
-              attrs = (attrs || {}).with_indifferent_access
-              attr_statement.Attribute Name: attrs[:name] || friendly_name,
-                NameFormat: attrs[:name_format] || Saml::XML::Namespaces::Formats::Attr::URI,
-                FriendlyName: friendly_name.to_s do |attr|
-                  values = get_values_for friendly_name, attrs[:getter]
-                  values.each do |val|
-                    attr.AttributeValue val.to_s
+          if !config.attributes.nil? && !config.attributes.empty?
+            assertion.AttributeStatement do |attr_statement|
+              config.attributes.each do |friendly_name, attrs|
+                attrs = (attrs || {}).with_indifferent_access
+                attr_statement.Attribute Name: attrs[:name] || friendly_name,
+                  NameFormat: attrs[:name_format] || Saml::XML::Namespaces::Formats::Attr::URI,
+                  FriendlyName: friendly_name.to_s do |attr|
+                    values = get_values_for friendly_name, attrs[:getter]
+                    values.each do |val|
+                      attr.AttributeValue val.to_s
+                    end
                   end
               end
             end

data/lib/saml_idp/request.rb

@@ -11,7 +11,7 @@ module SamlIdp
             zstream.finish
             zstream.close
           end
-        rescue Zlib::DataError # not compressed
+        rescue Zlib::BufError, Zlib::DataError # not compressed
           inflated = decoded
         end
       else

data/lib/saml_idp/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module SamlIdp
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/saml_idp.gemspec

@@ -45,7 +45,7 @@ section of the README.
   s.add_dependency('uuid')
   s.add_dependency('builder')
   s.add_dependency('httparty')
-  s.add_dependency('nokogiri')
+  s.add_dependency('nokogiri', '>= 1.6.2')
 
   s.add_development_dependency "rake"
   s.add_development_dependency "simplecov"

data/spec/lib/saml_idp/assertion_builder_spec.rb

@@ -37,6 +37,24 @@ module SamlIdp
       end
     end
 
+    describe "without attributes" do
+      let(:config) { SamlIdp::Configurator.new }
+      before do
+        config.name_id.formats = {
+          "1.1" => {
+            email_address: ->(p) { "foo@example.com" }
+          }
+        }
+        SamlIdp.stub(config: config)
+      end
+
+      it "doesn't include attribute statement" do
+        Timecop.travel(Time.zone.local(2010, 6, 1, 13, 0, 0)) do
+          subject.raw.should == "<Assertion xmlns=\"urn:oasis:names:tc:SAML:2.0:assertion\" ID=\"_abc\" IssueInstant=\"2010-06-01T13:00:00Z\" Version=\"2.0\"><Issuer>http://sportngin.com</Issuer><Subject><NameID Format=\"urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress\">foo@example.com</NameID><SubjectConfirmation Method=\"urn:oasis:names:tc:SAML:2.0:cm:bearer\"><SubjectConfirmationData InResponseTo=\"123\" NotOnOrAfter=\"2010-06-01T13:03:00Z\" Recipient=\"http://saml.acs.url\"></SubjectConfirmationData></SubjectConfirmation></Subject><Conditions NotBefore=\"2010-06-01T12:59:55Z\" NotOnOrAfter=\"2010-06-01T16:00:00Z\"><AudienceRestriction><Audience>http://example.com</Audience></AudienceRestriction></Conditions><AuthnStatement AuthnInstant=\"2010-06-01T13:00:00Z\" SessionIndex=\"_abc\"><AuthnContext><AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:Password</AuthnContextClassRef></AuthnContext></AuthnStatement></Assertion>"
+        end
+      end
+    end
+
     it "builds encrypted XML" do
       builder = described_class.new(
         reference_id,

data/spec/lib/saml_idp/request_spec.rb

@@ -1,8 +1,24 @@
 require 'spec_helper'
 module SamlIdp
   describe Request do
+    let(:raw_authn_request) { "<samlp:AuthnRequest AssertionConsumerServiceURL='http://localhost:3000/saml/consume' Destination='http://localhost:1337/saml/auth' ID='_af43d1a0-e111-0130-661a-3c0754403fdb' IssueInstant='2013-08-06T22:01:35Z' Version='2.0' xmlns:samlp='urn:oasis:names:tc:SAML:2.0:protocol'><saml:Issuer xmlns:saml='urn:oasis:names:tc:SAML:2.0:assertion'>localhost:3000</saml:Issuer><samlp:NameIDPolicy AllowCreate='true' Format='urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress' xmlns:samlp='urn:oasis:names:tc:SAML:2.0:protocol'/><samlp:RequestedAuthnContext Comparison='exact'><saml:AuthnContextClassRef xmlns:saml='urn:oasis:names:tc:SAML:2.0:assertion'>urn:oasis:names:tc:SAML:2.0:ac:classes:Password</saml:AuthnContextClassRef></samlp:RequestedAuthnContext></samlp:AuthnRequest>" }
+
+    describe "deflated request" do
+      let(:deflated_request) { Base64.encode64(Zlib::Deflate.deflate(raw_authn_request, 9)[2..-5]) }
+
+      subject { described_class.from_deflated_request deflated_request }
+
+      it "inflates" do
+        subject.request_id.should == "_af43d1a0-e111-0130-661a-3c0754403fdb"
+      end
+
+      it "handles invalid SAML" do
+        req = described_class.from_deflated_request "bang!"
+        req.valid?.should == false
+      end
+    end
+
     describe "authn request" do
-      let(:raw_authn_request) { "<samlp:AuthnRequest AssertionConsumerServiceURL='http://localhost:3000/saml/consume' Destination='http://localhost:1337/saml/auth' ID='_af43d1a0-e111-0130-661a-3c0754403fdb' IssueInstant='2013-08-06T22:01:35Z' Version='2.0' xmlns:samlp='urn:oasis:names:tc:SAML:2.0:protocol'><saml:Issuer xmlns:saml='urn:oasis:names:tc:SAML:2.0:assertion'>localhost:3000</saml:Issuer><samlp:NameIDPolicy AllowCreate='true' Format='urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress' xmlns:samlp='urn:oasis:names:tc:SAML:2.0:protocol'/><samlp:RequestedAuthnContext Comparison='exact'><saml:AuthnContextClassRef xmlns:saml='urn:oasis:names:tc:SAML:2.0:assertion'>urn:oasis:names:tc:SAML:2.0:ac:classes:Password</saml:AuthnContextClassRef></samlp:RequestedAuthnContext></samlp:AuthnRequest>" }
       subject { described_class.new raw_authn_request }
 
       it "has a valid request_id" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saml_idp
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -393,7 +393,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1850283737976678938
+      hash: 3897224932473421583
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -402,7 +402,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1850283737976678938
+      hash: 3897224932473421583
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23