ruby-saml-mod 0.1.23 → 0.1.24

data/lib/xml_sec.rb

@@ -79,6 +79,9 @@ module XMLSecurity
       :xmlSecDSigStatusInvalid
   ]
 
+  XMLSEC_ERRORS_R_INVALID_DATA = 12
+  class XmlSecError < ::RuntimeError; end
+
   class XmlSecPtrList < FFI::Struct
     layout \
       :id,                          :string,
@@ -170,6 +173,12 @@ module XMLSecurity
       :reserved1,                   :pointer
   end
 
+  ErrorCallback = FFI::Function.new(:void,
+      [ :string, :int, :string, :string,     :string,      :int,   :string ]
+  ) do |file,    line, func,    errorObject, errorSubject, reason, msg     |
+    XMLSecurity.handle_xmlsec_error_callback(file, line, func, errorObject, errorSubject, reason, msg)
+  end
+
   # xmlsec functions
   attach_function :xmlSecInit, [], :int
   attach_function :xmlSecParseMemory, [ :pointer, :uint, :int ], :pointer
@@ -193,7 +202,9 @@ module XMLSecurity
   attach_function :xmlSecEncCtxDecrypt, [ :pointer, :pointer ], :int
   attach_function :xmlSecEncCtxDestroy, [ :pointer ], :void
 
+  attach_function :xmlSecErrorsDefaultCallback, [ :string, :int, :string, :string, :string, :int, :string ], :void
   attach_function :xmlSecErrorsDefaultCallbackEnableOutput, [ :bool ], :void
+  attach_function :xmlSecErrorsSetCallback, [:pointer], :void
 
   attach_function :xmlSecTransformExclC14NGetKlass, [], :pointer
   attach_function :xmlSecOpenSSLTransformRsaSha1GetKlass, [], :pointer
@@ -238,6 +249,18 @@ module XMLSecurity
   raise "Failed initializing XMLSec" if self.xmlSecInit < 0
   raise "Failed initializing app crypto" if self.xmlSecOpenSSLAppInit(nil) < 0
   raise "Failed initializing crypto" if self.xmlSecOpenSSLInit < 0
+  self.xmlSecErrorsSetCallback(ErrorCallback)
+
+  def self.handle_xmlsec_error_callback(*args)
+    raise_exception_if_necessary(*args)
+    xmlSecErrorsDefaultCallback(*args)
+  end
+
+  def self.raise_exception_if_necessary(file, line, func, errorObject, errorSubject, reason, msg)
+    if reason == XMLSEC_ERRORS_R_INVALID_DATA
+      raise XmlSecError.new(msg)
+    end
+  end
 
 
   def self.mute(&block)

data/ruby-saml-mod.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name = %q{ruby-saml-mod}
-  s.version = "0.1.23"
+  s.version = "0.1.24"
 
   s.authors = ["OneLogin LLC", "Bracken", "Zach", "Cody", "Jeremy", "Paul"]
-  s.date = %q{2014-01-25}
+  s.date = %q{2014-02-02}
   s.extra_rdoc_files = [
     "LICENSE"
   ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-saml-mod
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.24
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-25 00:00:00.000000000 Z
+date: 2014-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libxml-ruby