libsaml 2.1.6 → 2.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 777d61727d4b2593863f72a4621312e617a18178
-  data.tar.gz: ca56f6007f85800d1d6808cbbd5cd95024c88635
+  metadata.gz: 5f0ad6ec3944e2e6c2656605f22859cf6de287a6
+  data.tar.gz: 93f72e0c10f8eeae202a550f25b607ca7c6518b9
 SHA512:
-  metadata.gz: 89f6aa619c04a9d42e842d43cf56ded84bbe3a53bd6a258b4b93d28a868dfcbbf848d8c37913b2d6b8d999c8e4f08d3826d299b83d5bc6ade8882c3b01007ab9
-  data.tar.gz: 56be7dd01abb97f50a773347c5ba841e6a401c2077e4d7a265bd7d0bf3955e49361819cf483db76bc6b7122b0266ac36985e8e60b3ca602908c4715d3dd9719e
+  metadata.gz: 199243697919b1cbc4676c75bd54822feec568b567551640729e1774e229a06748338be453d5fdae013722ca0f7d771f49fb15e08150707fc9ff38c8348ee741
+  data.tar.gz: e32fef49de53c91fa57d3d5fccb670ae1457d7d5a03caddc61fd2e3bc016e637b8e2bdd58702ee67687780edc0f4d6f0a4824e924f09781adf2c1df23233de7b

data/lib/saml.rb

@@ -4,6 +4,7 @@ require 'saml/base'
 require 'saml/xml_helpers'
 require 'saml/encoding'
 require 'saml/util'
+require 'saml/notification'
 require 'xmlenc'
 require 'xmldsig'
 require "net/https"

data/lib/saml/bindings/http_artifact.rb

@@ -1,11 +1,12 @@
 module Saml
   module Bindings
     class HTTPArtifact
+      include Saml::Notification
 
       class << self
         # @param [Saml::ArtifactResponse] artifact_response
         def create_response_xml(artifact_response)
-          Saml::Util.sign_xml(artifact_response, :soap)
+          notify('create_response', Saml::Util.sign_xml(artifact_response, :soap))
         end
 
         def create_response(artifact_response)
@@ -23,7 +24,7 @@ module Saml
         end
 
         def receive_message(request)
-          raw_xml          = request.body.dup.read
+          raw_xml          = notify('receive_message', request.body.dup.read)
           artifact_resolve = Saml::ArtifactResolve.parse(raw_xml, single: true)
 
           Saml::Util.verify_xml(artifact_resolve, raw_xml)
@@ -33,9 +34,10 @@ module Saml
           artifact         = request.params["SAMLart"]
           artifact_resolve = Saml::ArtifactResolve.new(artifact: artifact, destination: location)
 
-          response = Saml::Util.post(location, Saml::Util.sign_xml(artifact_resolve, :soap))
+          response = Saml::Util.post(location, notify('create_post', Saml::Util.sign_xml(artifact_resolve, :soap)))
 
           if response.code == "200"
+            notify('receive_response', response.body)
             artifact_response          = Saml::ArtifactResponse.parse(response.body, single: true)
             verified_artifact_response = Saml::Util.verify_xml(artifact_response, response.body)
 

data/lib/saml/bindings/http_post.rb

@@ -1,11 +1,13 @@
 module Saml
   module Bindings
     class HTTPPost
+      include Saml::Notification
+
       class << self
         def create_form_attributes(message, options = {})
           param = message.is_a?(Saml::ComplexTypes::StatusResponseType) ? "SAMLResponse" : "SAMLRequest"
 
-          xml = Saml::Util.sign_xml(message)
+          xml = notify('create_message', Saml::Util.sign_xml(message))
 
           variables        = {}
           variables[param] = Saml::Encoding.encode_64(xml)
@@ -19,6 +21,7 @@ module Saml
 
         def receive_message(request, type)
           message             = Saml::Encoding.decode_64(request.params["SAMLRequest"] || request.params["SAMLResponse"])
+          notify('receive_message', message)
           request_or_response = Saml.parse_message(message, type)
 
           verified_request_or_response = Saml::Util.verify_xml(request_or_response, message)
@@ -28,4 +31,4 @@ module Saml
       end
     end
   end
-end
+end

data/lib/saml/bindings/http_redirect.rb

@@ -1,6 +1,8 @@
 module Saml
   module Bindings
     class HTTPRedirect
+      include Saml::Notification
+
       class << self
         def create_url(request_or_response, options = {})
           options[:signature_algorithm] ||= 'http://www.w3.org/2000/09/xmldsig#rsa-sha1'
@@ -26,7 +28,7 @@ module Saml
         private
 
         def parse_request_or_response(type, params)
-          message = decode_message(params["SAMLRequest"] || params["SAMLResponse"])
+          message = notify('receive_message', decode_message(params["SAMLRequest"] || params["SAMLResponse"]))
 
           Saml.parse_message(message, type)
         end
@@ -73,7 +75,7 @@ module Saml
       end
 
       def encoded_message
-        Saml::Encoding.encode_64(Saml::Encoding.encode_gzip(request_or_response.to_xml))
+        Saml::Encoding.encode_64(Saml::Encoding.encode_gzip(notify('create_message', request_or_response.to_xml)))
       end
 
       def encoded_params

data/lib/saml/bindings/soap.rb

@@ -1,21 +1,23 @@
 module Saml
   module Bindings
     class SOAP
+      include Saml::Notification
+
       class << self
 
         SOAP_ACTION = 'http://www.oasis-open.org/committees/security'
 
         def create_response_xml(response)
-          Saml::Util.sign_xml(response, :soap)
+          notify('create_response', Saml::Util.sign_xml(response, :soap))
         end
 
         def post_message(message, response_type)
-          signed_message = Saml::Util.sign_xml(message, :soap)
+          signed_message = notify('create_post', Saml::Util.sign_xml(message, :soap))
 
           http_response = Saml::Util.post(message.destination, signed_message, { 'SOAPAction' => SOAP_ACTION } )
 
           if http_response.code == "200"
-            response = Saml.parse_message(http_response.body, response_type)
+            response = notify('receive_response', Saml.parse_message(http_response.body, response_type))
             Saml::Util.verify_xml(response, http_response.body)
           else
             nil
@@ -24,6 +26,7 @@ module Saml
 
         def receive_message(request, type)
           raw_xml = request.body.dup.read
+          notify('receive_message', raw_xml)
           message = Saml.parse_message(raw_xml, type)
 
           Saml::Util.verify_xml(message, raw_xml)

data/lib/saml/notification.rb

@@ -0,0 +1,55 @@
+module Saml
+  module Notification
+    extend ActiveSupport::Concern
+
+    def notify(method, result)
+      self.class.notify(method, result)
+    end
+
+    module ClassMethods
+      def wrap_with_notification(method, instance_method)
+        wrapper = <<-RUBY
+          define_method "#{method}_with_notification" do |*args|
+            notify "#{method}", send("#{method}_without_notification", *args)
+          end
+          alias_method_chain :#{method}, :notification
+        RUBY
+
+        if instance_method
+          class_eval wrapper
+        else
+          class_eval "class << self; #{wrapper}; end"
+        end
+      end
+
+      def notify(method, result)
+        class_name = self.name.demodulize.underscore
+        ActiveSupport::Notifications.instrument "#{method}.#{class_name}.saml", result
+        result
+      end
+
+      def notify_on(*options)
+        options.present? ? @notify_on = options : @notify_on
+      end
+
+      def should_wrap?(name)
+        @notify_on ||= []
+        @exclude   ||= []
+
+        return false if @notify_on.exclude?(name) || @exclude.include?(name.to_s)
+        @exclude << "#{name}_with_notification"
+        @exclude << "#{name}_without_notification"
+        @exclude << "#{name}"
+        true
+      end
+
+      def singleton_method_added(name)
+        wrap_with_notification(name, false) if should_wrap?(name)
+      end
+
+      def method_added(name)
+        wrap_with_notification(name, true) if should_wrap?(name)
+      end
+    end
+  end
+end

data/lib/saml/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libsaml
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.7
 platform: ruby
 authors:
 - Benoist Claassen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -191,6 +191,7 @@ files:
 - lib/saml/encoding.rb
 - lib/saml/logout_request.rb
 - lib/saml/logout_response.rb
+- lib/saml/notification.rb
 - lib/saml/null_provider.rb
 - lib/saml/provider.rb
 - lib/saml/provider_stores/file.rb