saml-kit 1.0.6 → 1.0.7

data/lib/saml/kit/translatable.rb

@@ -2,8 +2,9 @@ module Saml
   module Kit
     module Translatable
       # @!visibility private
-      def error_message(attribute, type: :invalid)
-        I18n.translate(attribute, scope: "saml/kit.errors.#{name}")
+      def error_message(attribute, options = {})
+        default_options = { scope: "saml/kit.errors.#{name}" }
+        I18n.translate(attribute, default_options.merge(options))
       end
     end
   end

data/lib/saml/kit/trustable.rb

@@ -16,8 +16,7 @@ module Saml
 
       # @!visibility private
       def signature
-        xml_hash = to_h.fetch(name, {}).fetch('Signature', nil)
-        xml_hash ? Signature.new(xml_hash) : nil
+        @signature ||= Signature.new(at_xpath("/samlp:#{name}/ds:Signature"))
       end
 
       # Returns true when documents is signed and the signing certificate belongs to a known service entity.
@@ -43,16 +42,10 @@ module Saml
 
       def must_have_valid_signature
         return if to_xml.blank?
+        return unless signature.present?
 
-        xml = ::Xml::Kit::Document.new(to_xml, namespaces: {
-          "NameFormat": Namespaces::ATTR_SPLAT,
-          "ds": ::Xml::Kit::Namespaces::XMLDSIG,
-          "md": Namespaces::METADATA,
-          "saml": Namespaces::ASSERTION,
-          "samlp": Namespaces::PROTOCOL,
-        })
-        xml.valid?
-        xml.errors.each do |attribute, error|
+        signature.valid?
+        signature.errors.each do |attribute, error|
           errors[attribute] << error
         end
       end

data/lib/saml/kit/version.rb

@@ -1,5 +1,5 @@
 module Saml
   module Kit
-    VERSION = "1.0.6"
+    VERSION = '1.0.7'.freeze
   end
 end

data/lib/saml/kit/xml_templatable.rb

@@ -4,16 +4,21 @@ module Saml
       include ::Xml::Kit::Templatable
 
       def template_path
-        root_path = File.expand_path(File.dirname(__FILE__))
-        template_name = "#{self.class.name.split("::").last.underscore}.builder"
-        File.join(root_path, "builders/templates/", template_name)
+        root_path = __dir__
+        template_name = "#{self.class.name.split('::').last.underscore}.builder"
+        File.join(root_path, 'builders/templates/', template_name)
       end
 
       # Returns true if an embedded signature is requested and at least one signing certificate is available via the configuration.
       def sign?
         return configuration.sign? if embed_signature.nil?
         (embed_signature && configuration.sign?) ||
-          (embed_signature && @signing_key_pair.present?)
+          (embed_signature && signing_key_pair.present?)
+      end
+
+      def encrypt_with(key_pair)
+        self.encrypt = true
+        self.encryption_certificate = key_pair.certificate
       end
 
       def digest_method
@@ -25,7 +30,7 @@ module Saml
       end
 
       def signing_key_pair
-        configuration.key_pairs(use: :signing).last
+        @signing_key_pair || configuration.key_pairs(use: :signing).last
       end
     end
   end

data/saml-kit.gemspec

@@ -1,34 +1,37 @@
-# coding: utf-8
-lib = File.expand_path("../lib", __FILE__)
+
+lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "saml/kit/version"
+require 'saml/kit/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "saml-kit"
+  spec.name          = 'saml-kit'
   spec.version       = Saml::Kit::VERSION
-  spec.authors       = ["mo khan"]
-  spec.email         = ["mo@mokhan.ca"]
+  spec.authors       = ['mo khan']
+  spec.email         = ['mo@mokhan.ca']
 
-  spec.summary       = %q{A simple toolkit for working with SAML.}
-  spec.description   = %q{A simple toolkit for working with SAML.}
-  spec.homepage      = "https://github.com/saml-kit/saml-kit"
-  spec.license       = "MIT"
+  spec.summary       = 'A simple toolkit for working with SAML.'
+  spec.description   = 'A simple toolkit for working with SAML.'
+  spec.homepage      = 'https://github.com/saml-kit/saml-kit'
+  spec.license       = 'MIT'
   spec.required_ruby_version = '>= 2.2.0'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.metadata["yard.run"] = "yri"
-  spec.bindir        = "exe"
+  spec.metadata['yard.run'] = 'yri'
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "activemodel", ">= 4.2.0"
-  spec.add_dependency "xml-kit", ">= 0.1.5", "<= 1.0.0"
-  spec.add_development_dependency "bundler", "~> 1.15"
-  spec.add_development_dependency "ffaker", "~> 2.7"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "simplecov", "~> 0.15.1"
-  spec.add_development_dependency "webmock", "~> 3.1"
+  spec.add_dependency 'activemodel', '>= 4.2.0'
+  spec.add_dependency 'xml-kit', '>= 0.1.10', '<= 1.0.0'
+  spec.add_development_dependency 'bundler', '~> 1.15'
+  spec.add_development_dependency 'ffaker', '~> 2.7'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rubocop', '~> 0.52'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.22'
+  spec.add_development_dependency 'simplecov', '~> 0.15'
+  spec.add_development_dependency 'webmock', '~> 3.1'
+  spec.add_development_dependency 'rspec-benchmark', '~> 0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saml-kit
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - mo khan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-12 00:00:00.000000000 Z
+date: 2018-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -30,7 +30,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.1.10
     - - "<="
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -40,7 +40,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.1.10
     - - "<="
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -100,20 +100,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.52'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.52'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.22'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.22'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: '0.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +156,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: rspec-benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 description: A simple toolkit for working with SAML.
 email:
 - mo@mokhan.ca
@@ -141,13 +183,18 @@ files:
 - ".gitignore"
 - ".gitlab-ci.yml"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/cibuild
 - bin/console
+- bin/lint
 - bin/setup
+- bin/test
 - exe/saml-kit-create-self-signed-certificate
 - exe/saml-kit-decode-http-post
 - exe/saml-kit-decode-http-redirect
@@ -191,6 +238,7 @@ files:
 - lib/saml/kit/logout_response.rb
 - lib/saml/kit/metadata.rb
 - lib/saml/kit/namespaces.rb
+- lib/saml/kit/null_assertion.rb
 - lib/saml/kit/requestable.rb
 - lib/saml/kit/respondable.rb
 - lib/saml/kit/response.rb