libsaml 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ac08e6937053ccbbf5e097d77a148aa61ce309f
-  data.tar.gz: 54d3b9ae6fabb9d7901cee91bf5e2991f7829666
+  metadata.gz: 777d61727d4b2593863f72a4621312e617a18178
+  data.tar.gz: ca56f6007f85800d1d6808cbbd5cd95024c88635
 SHA512:
-  metadata.gz: 7480ae9f7bc3d5eefc381a237dde9d2e12369ae4766d31bd004797cffa2d8336f3468babb33126200d974df8a1008288cab1cb16ed6f05ca06a32eb8b52af45b
-  data.tar.gz: 3f3d5e840a3aa244fa013e24e232e63bf5225f3aa8d90a9bb3b3a8daddde2a67d8c8156e5cb17db5c2a4dbc0f1bfc7fb549fc8234e1f6ee814bc2bcab8a6f26c
+  metadata.gz: 89f6aa619c04a9d42e842d43cf56ded84bbe3a53bd6a258b4b93d28a868dfcbbf848d8c37913b2d6b8d999c8e4f08d3826d299b83d5bc6ade8882c3b01007ab9
+  data.tar.gz: 56be7dd01abb97f50a773347c5ba841e6a401c2077e4d7a265bd7d0bf3955e49361819cf483db76bc6b7122b0266ac36985e8e60b3ca602908c4715d3dd9719e

data/README.rdoc

@@ -1,4 +1,5 @@
 {<img src="https://travis-ci.org/digidentity/libsaml.png?branch=master" alt="Build Status" />}[https://travis-ci.org/digidentity/libsaml]
+{<img src="https://coveralls.io/repos/digidentity/libsaml/badge.png" alt="Coverage Status" />}[https://coveralls.io/r/digidentity/libsaml]
 {<img src="https://gemnasium.com/digidentity/libsaml.png" alt="Dependency Status" />}[https://gemnasium.com/digidentity/libsaml]
 {<img src="https://codeclimate.com/github/digidentity/libsaml.png" />}[https://codeclimate.com/github/digidentity/libsaml]
 = libsaml

data/lib/saml/assertion.rb

@@ -45,6 +45,11 @@ module Saml
       @version       ||= Saml::SAML_VERSION
     end
 
+    # @return [Saml::Provider]
+    def provider
+      @provider ||= Saml.provider(issuer)
+    end
+
     def add_attribute(key, value)
       self.attribute_statement ||= Saml::Elements::AttributeStatement.new
       self.attribute_statement.attribute ||= []
@@ -57,10 +62,6 @@ module Saml
       attribute_statement.fetch_attribute(key)
     end
 
-    def provider
-      @provider ||= Saml.provider(issuer)
-    end
-
     private
 
     def check_issue_instant

data/lib/saml/bindings/http_artifact.rb

@@ -8,6 +8,10 @@ module Saml
           Saml::Util.sign_xml(artifact_response, :soap)
         end
 
+        def create_response(artifact_response)
+          {xml: create_response_xml(artifact_response), content_type: 'text/xml'}
+        end
+
         def create_url(location, artifact, options = {})
           uri   = URI.parse(location)
           query = [uri.query, "SAMLart=#{CGI.escape(artifact.to_s)}"]

data/lib/saml/elements/key_descriptor.rb

@@ -1,4 +1,4 @@
-require 'saml/elements/key_descriptor/key_info'
+require 'saml/elements/key_info'
 
 module Saml
   module Elements

data/lib/saml/elements/key_info.rb

@@ -0,0 +1,28 @@
+require 'saml/elements/key_info/x509_data'
+
+module Saml
+  module Elements
+    class KeyInfo
+      include Saml::Base
+
+      register_namespace 'ds', Saml::XML_DSIG_NAMESPACE
+      namespace 'ds'
+      tag 'KeyInfo'
+
+      element :key_name, String, :namespace => 'ds', :tag => "KeyName"
+
+      has_one :x509Data, X509Data
+
+      validates :x509Data, :presence => true
+
+      def initialize(cert = nil)
+        if cert
+          self.x509Data = X509Data.new(cert)
+        end
+        if self.x509Data && self.x509Data.x509certificate
+          self.key_name = Digest::SHA1.hexdigest(self.x509Data.x509certificate.to_der)
+        end
+      end
+    end
+  end
+end

data/lib/saml/elements/key_info/x509_data.rb

@@ -0,0 +1,32 @@
+module Saml
+  module Elements
+    class KeyInfo
+      class X509Data
+        include Saml::Base
+
+        tag 'X509Data'
+        namespace 'ds'
+
+        element :x509certificate, String, :tag => "X509Certificate", :on_save => lambda { |c| c.present? ? Base64.encode64(c.to_der) : "" }
+
+        validates :x509certificate, :presence => true
+
+        def initialize(cert = nil)
+          self.x509certificate = cert
+        end
+
+        def x509certificate=(cert)
+          if cert.present?
+            if cert =~ /-----BEGIN CERTIFICATE-----/
+              @x509certificate = OpenSSL::X509::Certificate.new(cert)
+            else
+              @x509certificate = OpenSSL::X509::Certificate.new(Base64.decode64(cert))
+            end
+          end
+        rescue OpenSSL::X509::CertificateError => e
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/saml/elements/signature.rb

@@ -6,7 +6,7 @@ require 'saml/elements/signature/reference'
 require 'saml/elements/signature/signature_method'
 require 'saml/elements/signature/canonicalization_method'
 require 'saml/elements/signature/signed_info'
-require 'saml/elements/signature/key_info'
+require 'saml/elements/key_info'
 
 module Saml
   module Elements

data/lib/saml/version.rb

@@ -1,3 +1,3 @@
 module Saml
-  VERSION = "2.1.5"
+  VERSION = "2.1.6"
 end

data/lib/saml/xml_helpers.rb

@@ -5,7 +5,7 @@ module Saml
     def add_signature
       self.signature = Saml::Elements::Signature.new(uri: "##{self._id}")
       x509certificate = OpenSSL::X509::Certificate.new(provider.certificate) rescue nil
-      self.signature.key_info = Saml::Elements::KeyDescriptor::KeyInfo.new(x509certificate.to_pem) if x509certificate
+      self.signature.key_info = Saml::Elements::KeyInfo.new(x509certificate.to_pem) if x509certificate
     end
 
     def to_xml(builder = nil, default_namespace = nil, instruct = true)

metadata

@@ -1,99 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: libsaml
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - Benoist Claassen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
+date: 2014-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: nokogiri-happymapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.7
 - !ruby/object:Gem::Dependency
   name: xmldsig
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: xmlenc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: curb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 description: Libsaml makes the creation of SAML 2.0 messages easy. The object structure
   is modeled after the SAML Core 2.0 specification from OASIS. Supported bindings
   are HTTP-Post, HTTP-Redirect, HTTP-Artifact and SOAP. Features include XML signing,
@@ -104,6 +118,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.rdoc
+- Rakefile
+- lib/saml.rb
 - lib/saml/artifact.rb
 - lib/saml/artifact_resolve.rb
 - lib/saml/artifact_response.rb
@@ -139,9 +157,9 @@ files:
 - lib/saml/elements/entity_attributes.rb
 - lib/saml/elements/entity_descriptor.rb
 - lib/saml/elements/idp_sso_descriptor.rb
-- lib/saml/elements/key_descriptor/key_info/x509_data.rb
-- lib/saml/elements/key_descriptor/key_info.rb
 - lib/saml/elements/key_descriptor.rb
+- lib/saml/elements/key_info.rb
+- lib/saml/elements/key_info/x509_data.rb
 - lib/saml/elements/md_extensions.rb
 - lib/saml/elements/name_id.rb
 - lib/saml/elements/organization.rb
@@ -153,16 +171,15 @@ files:
 - lib/saml/elements/samlp_extensions.rb
 - lib/saml/elements/service_description.rb
 - lib/saml/elements/service_name.rb
+- lib/saml/elements/signature.rb
 - lib/saml/elements/signature/canonicalization_method.rb
 - lib/saml/elements/signature/digest_method.rb
 - lib/saml/elements/signature/inclusive_namespaces.rb
-- lib/saml/elements/signature/key_info.rb
 - lib/saml/elements/signature/reference.rb
 - lib/saml/elements/signature/signature_method.rb
 - lib/saml/elements/signature/signed_info.rb
 - lib/saml/elements/signature/transform.rb
 - lib/saml/elements/signature/transforms.rb
-- lib/saml/elements/signature.rb
 - lib/saml/elements/sp_sso_descriptor.rb
 - lib/saml/elements/status.rb
 - lib/saml/elements/status_code.rb
@@ -182,11 +199,7 @@ files:
 - lib/saml/util.rb
 - lib/saml/version.rb
 - lib/saml/xml_helpers.rb
-- lib/saml.rb
 - lib/tasks/saml_tasks.rake
-- MIT-LICENSE
-- Rakefile
-- README.rdoc
 homepage: https://www.digidentity.eu
 licenses:
 - MIT
@@ -197,17 +210,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: A gem to easily create SAML 2.0 messages.

data/lib/saml/elements/key_descriptor/key_info.rb

@@ -1,30 +0,0 @@
-require 'saml/elements/key_descriptor/key_info/x509_data'
-
-module Saml
-  module Elements
-    class KeyDescriptor
-      class KeyInfo
-        include Saml::Base
-
-        register_namespace 'ds', Saml::XML_DSIG_NAMESPACE
-        namespace 'ds'
-        tag 'KeyInfo'
-
-        element :key_name, String, :namespace => 'ds', :tag => "KeyName"
-
-        has_one :x509Data, X509Data
-
-        validates :x509Data, :presence => true
-
-        def initialize(cert = nil)
-          if cert
-            self.x509Data = X509Data.new(cert)
-          end
-          if self.x509Data && self.x509Data.x509certificate
-            self.key_name = Digest::SHA1.hexdigest(self.x509Data.x509certificate.to_der)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/saml/elements/key_descriptor/key_info/x509_data.rb

@@ -1,34 +0,0 @@
-module Saml
-  module Elements
-    class KeyDescriptor
-      class KeyInfo
-        class X509Data
-          include Saml::Base
-
-          tag 'X509Data'
-          namespace 'ds'
-
-          element :x509certificate, String, :tag => "X509Certificate", :on_save => lambda { |c| c.present? ? Base64.encode64(c.to_der) : "" }
-
-          validates :x509certificate, :presence => true
-
-          def initialize(cert = nil)
-            self.x509certificate = cert
-          end
-
-          def x509certificate=(cert)
-            if cert.present?
-              if cert =~ /-----BEGIN CERTIFICATE-----/
-                @x509certificate = OpenSSL::X509::Certificate.new(cert)
-              else
-                @x509certificate = OpenSSL::X509::Certificate.new(Base64.decode64(cert))
-              end
-            end
-          rescue OpenSSL::X509::CertificateError => e
-            nil
-          end
-        end
-      end
-    end
-  end
-end

data/lib/saml/elements/signature/key_info.rb

@@ -1,14 +0,0 @@
-module Saml
-  module Elements
-    class Signature
-      class KeyInfo
-        include Saml::Base
-
-        tag "KeyInfo"
-        namespace 'ds'
-
-        element :key_name, String, :namespace => 'ds', :tag => "KeyName"
-      end
-    end
-  end
-end