xml-kit 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 003c8b4f66dd0ccc0cc6c5c108a44949c78a313c82dfa39ad459b7a0286b0a57
-  data.tar.gz: f486288e1392e251083f3041a6d2b5577654492462c42695898ec15202aed374
+  metadata.gz: 8c3cc43f29794476f060bdaa709f2c99dc41ed88598f560e24d760701ebfaff8
+  data.tar.gz: 856ae8fd069fee1faa3555d95f329afb57ba2452a501f31d25d2c7b7c963b663
 SHA512:
-  metadata.gz: 564ea8ee284bd6a5b538d07e4387ce95f15aa3f397a41f84225d838631e41b05573df7ac011f50ffc0a94d24d234c68664dc9b04473519224e3262beab33800b
-  data.tar.gz: a0d914c9ecf8a7ac17be20de5db50142f2e17077138aada6bc4fab2c03c8cf1c876734f6a6873ef3260e112757e46b1251800e25136b2f74730bf226ecaac502
+  metadata.gz: 22299b273709119a00cf9bcad3b79361d3e82d476cb1584a9f5bc0a97220f2fb7776e3b1b554acca0956fbe061e26b073a02edad9434a1a6d589a5fb3769f8fe
+  data.tar.gz: 16bc8678b00b62bbde026a73b50b359b81fc5a3fd8dec5ff184ab7f4405e077df74b7343c95f9f6b3a0a5519c3084f5cd3fe9b841b63a51bbad0a5fba37f6f20

data/lib/xml/kit/certificate.rb

@@ -2,11 +2,15 @@ module Xml
   module Kit
     # {include:file:spec/xml/certificate_spec.rb}
     class Certificate
+      BASE64_FORMAT = %r(\A([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?\Z)
       BEGIN_CERT=/-----BEGIN CERTIFICATE-----/
       END_CERT=/-----END CERTIFICATE-----/
       # The use can be `:signing` or `:encryption`. Use `nil` for both.
       attr_reader :use
 
+      # The raw certificate value. This can be a Base64 encoded PEM or just a PEM format.
+      attr_reader :value
+
       def initialize(value, use: nil)
         @value = value
         @use = use.nil? ? use : use.downcase.to_sym
@@ -44,7 +48,7 @@ module Xml
       #
       # return [OpenSSL::X509::Certificate] the OpenSSL equivalent.
       def x509
-        self.class.to_x509(value)
+        @x509 ||= self.class.to_x509(value)
       end
 
       # Returns the public key.
@@ -79,18 +83,32 @@ module Xml
       end
 
       def stripped
-        value.to_s.gsub(BEGIN_CERT, '').gsub(END_CERT, '').gsub(/\n/, '')
+        self.class.strip(x509.to_pem)
+      end
+
+      def to_key_pair(private_key, passphrase: nil, use: nil)
+        KeyPair.new(x509.to_pem, private_key.to_s, passphrase, use)
       end
 
       def self.to_x509(value)
-        OpenSSL::X509::Certificate.new(Base64.decode64(value))
-      rescue OpenSSL::X509::CertificateError
+        value = Base64.decode64(strip(value)) if base64?(value)
+        return value if value.is_a?(OpenSSL::X509::Certificate)
         OpenSSL::X509::Certificate.new(value)
       end
 
-      private
+      def self.base64?(value)
+        return unless value.is_a?(String)
 
-      attr_reader :value
+        sanitized_value = strip(value)
+        !!sanitized_value.match(BASE64_FORMAT)
+      end
+
+      def self.strip(value)
+        value.
+          gsub(BEGIN_CERT, '').
+          gsub(END_CERT, '').
+          gsub(/[\r\n]|\\r|\\n|\s/, "")
+      end
     end
   end
 end

data/lib/xml/kit/document.rb

@@ -59,16 +59,23 @@ module Xml
 
         x509_certificates.each do |certificate|
           inactive = now < certificate.not_before
-          errors.add(:certificate, "Not valid before #{certificate.not_before}") if inactive
+          if inactive
+            error_message = "Not valid before #{certificate.not_before}"
+            errors.add(:certificate, error_message)
+          end
 
           expired = now > certificate.not_after
-          errors.add(:certificate, "Not valid after #{certificate.not_after}") if expired
+          if expired
+            error_message = "Not valid after #{certificate.not_after}"
+            errors.add(:certificate, error_message)
+          end
         end
       end
 
       def x509_certificates
-        xpath = "//ds:KeyInfo/ds:X509Data/ds:X509Certificate"
-        find_all(xpath).map { |item| Certificate.to_x509(item.text) }
+        find_all("//ds:KeyInfo/ds:X509Data/ds:X509Certificate").map do |item|
+          Certificate.to_x509(item.text)
+        end
       end
     end
   end

data/lib/xml/kit/templatable.rb

@@ -46,6 +46,7 @@ module Xml
       #
       # @param key_pair [Xml::Kit::KeyPair] the key pair to use for signing.
       def sign_with(key_pair)
+        self.signing_key_pair = key_pair
         signatures.sign_with(key_pair)
       end
 

data/lib/xml/kit/version.rb

@@ -1,5 +1,5 @@
 module Xml
   module Kit
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xml-kit
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - mo khan