xml-kit 0.1.14 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa2eb376d5c11a9777e3a3a6073754c9783c73bdc24bbb45c7ac5877e3e99472
-  data.tar.gz: 6eb275d2a3791889c12a04a5e2b1143807bf4e1ac1968491f93ef32faeccd868
+  metadata.gz: 03f1eb698452e6bde1528e6899c935996309a1b0e4fdec3995ad04d8401b71e4
+  data.tar.gz: d52d39605ff43af034bf4a913faa35757a34d2abc82f9aca970683132015229d
 SHA512:
-  metadata.gz: 0447e7510327c68ee2f9f500b980d1d36255b044a3825dfd504245ea111eb367f998a0bc6a507d54e5f64472de76a2766460085c808b8ca380254fdbe12feaa0
-  data.tar.gz: 7f9c69571ddd52a638daf3b20062cc4b2d06cfd7cd83f6a517405330daddc8c8bb8d62fbd054b02ad8ad1eda6a9229ef0221f97d90b4d4ee3318420175eb3405
+  metadata.gz: 91ab2b253526d12fc2495afc4261b4ceb8861d4644dd0ae5fcea226d7413df058001cdb6f8e6cb40a63254bcb6546f9a86fd5e9472e41818a1003ac5834442e0
+  data.tar.gz: ac71bd4d5416fadfa85763ed40839cd0e5e33ff2e4fd05ea98e3cdc8d0e29225e528614b33e7cbb1a8ac77b171e991973875b9cf7a53dc01817024d169f2dd4a

data/lib/xml/kit/crypto.rb

@@ -14,6 +14,20 @@ module Xml
       def self.cipher_for(algorithm, key)
         CIPHERS.find { |x| x.matches?(algorithm) }.new(algorithm, key)
       end
+
+      def self.cipher_registry(&block)
+        BlockRegistry.new(&block)
+      end
+
+      class BlockRegistry
+        def initialize(&factory)
+          @factory = factory
+        end
+
+        def cipher_for(algorithm, key)
+          @factory.call(algorithm, key)
+        end
+      end
     end
   end
 end

data/lib/xml/kit/crypto/symmetric_cipher.rb

@@ -12,11 +12,12 @@ module Xml
           "#{::Xml::Kit::Namespaces::XMLENC}aes256-cbc" => 'AES-256-CBC',
         }.freeze
 
-        attr_reader :key
+        attr_reader :algorithm, :key, :padding
 
-        def initialize(algorithm, key = nil)
+        def initialize(algorithm, key = nil, padding = nil)
           @algorithm = algorithm
           @key = key || cipher.random_key
+          @padding = padding
         end
 
         def self.matches?(algorithm)
@@ -30,19 +31,30 @@ module Xml
         end
 
         def decrypt(cipher_text)
+          result = default_decrypt(
+            cipher_text[0...cipher.iv_len],
+            cipher_text[cipher.iv_len..-1]
+          )
+          return result if padding.nil?
+
+          padding_size = result.bytes.last
+          result[0...-padding_size]
+        end
+
+        protected
+
+        def default_decrypt(initialization_vector, data)
           cipher.decrypt
-          iv = cipher_text[0..cipher.iv_len - 1]
-          data = cipher_text[cipher.iv_len..-1]
-          # cipher.padding = 0
+          cipher.padding = padding unless padding.nil?
           cipher.key = @key
-          cipher.iv = iv
-          cipher.update(data) + cipher.final
+          cipher.iv = initialization_vector
+          cipher.update(data) << cipher.final
         end
 
         private
 
         def cipher
-          @cipher ||= OpenSSL::Cipher.new(ALGORITHMS[@algorithm])
+          @cipher ||= OpenSSL::Cipher.new(ALGORITHMS[algorithm])
         end
       end
     end

data/lib/xml/kit/decryption.rb

@@ -5,10 +5,11 @@ module Xml
     # {include:file:spec/saml/xml_decryption_spec.rb}
     class Decryption
       # The list of private keys to use to attempt to decrypt the document.
-      attr_reader :private_keys
+      attr_reader :cipher_registry, :private_keys
 
-      def initialize(private_keys:)
+      def initialize(private_keys:, cipher_registry: ::Xml::Kit::Crypto)
         @private_keys = private_keys
+        @cipher_registry = cipher_registry
       end
 
       # Decrypts an EncryptedData section of an XML document.
@@ -31,11 +32,11 @@ module Xml
       # @param hash [Hash] the XML document converted to a [Hash] using Hash.from_xml.
       def decrypt_hash(hash)
         encrypted_data = hash['EncryptedData']
-        symmetric_key = symmetric_key_from(encrypted_data)
-        cipher_value = encrypted_data['CipherData']['CipherValue']
-        cipher_text = Base64.decode64(cipher_value)
-        algorithm = encrypted_data['EncryptionMethod']['Algorithm']
-        to_plaintext(cipher_text, symmetric_key, algorithm)
+        to_plaintext(
+          Base64.decode64(encrypted_data['CipherData']['CipherValue']),
+          symmetric_key_from(encrypted_data),
+          encrypted_data['EncryptionMethod']['Algorithm']
+        )
       end
 
       # Decrypts an EncryptedData Nokogiri::XML::Element.
@@ -62,8 +63,8 @@ module Xml
         raise DecryptionError, private_keys
       end
 
-      def to_plaintext(cipher_text, symmetric_key, algorithm)
-        Crypto.cipher_for(algorithm, symmetric_key).decrypt(cipher_text)
+      def to_plaintext(cipher_text, private_key, algorithm)
+        cipher_registry.cipher_for(algorithm, private_key).decrypt(cipher_text)
       end
     end
   end

data/lib/xml/kit/encryption.rb

@@ -15,11 +15,12 @@ module Xml
         asymmetric_algorithm: ::Xml::Kit::Crypto::RsaCipher::ALGORITHM
       )
         @symmetric_algorithm = symmetric_algorithm
-        @symmetric_cipher_value = Base64.encode64(symmetric_cipher.encrypt(raw_xml)).delete("\n")
+        symmetric_cipher = symmetric(symmetric_algorithm)
+        @symmetric_cipher_value = Base64.strict_encode64(symmetric_cipher.encrypt(raw_xml))
 
         @asymmetric_algorithm = asymmetric_algorithm
-        cipher = Crypto.cipher_for(asymmetric_algorithm, public_key)
-        @asymmetric_cipher_value = Base64.encode64(cipher.encrypt(symmetric_cipher.key)).delete("\n")
+        asymmetric_cipher = asymmetric(asymmetric_algorithm, public_key)
+        @asymmetric_cipher_value = Base64.strict_encode64(asymmetric_cipher.encrypt(symmetric_cipher.key))
       end
 
       def to_xml(xml: ::Builder::XmlMarkup.new)
@@ -28,10 +29,16 @@ module Xml
 
       private
 
-      def symmetric_cipher
-        @symmetric_cipher ||= ::Xml::Kit::Crypto::SymmetricCipher.new(
-          symmetric_algorithm
-        )
+      def symmetric(algorithm)
+        return algorithm unless algorithm.is_a?(String)
+
+        ::Xml::Kit::Crypto::SymmetricCipher.new(algorithm)
+      end
+
+      def asymmetric(algorithm, public_key)
+        return algorithm unless algorithm.is_a?(String)
+
+        ::Xml::Kit::Crypto.cipher_for(algorithm, public_key)
       end
     end
   end

data/lib/xml/kit/version.rb

@@ -2,6 +2,6 @@
 
 module Xml
   module Kit
-    VERSION = '0.1.14'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xml-kit
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.2.0
 platform: ruby
 authors:
 - mo khan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-21 00:00:00.000000000 Z
+date: 2018-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel