RubyGems - xmlenc - Versions diffs - 0.6.0 → 0.6.1 - Mend

xmlenc 0.6.0 → 0.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

checksums.yaml +4 -4
data/lib/xmlenc/encrypted_document.rb +8 -4
data/lib/xmlenc/version.rb +1 -1
data/spec/fixtures/encrypted_document_with_unknown_encrypted_key.xml +79 -0
data/spec/lib/xmlenc/encrypted_document_spec.rb +16 -0
metadata +4 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08accbcb8b82b64c4a4dfc285613f8f446b8b80d
-  data.tar.gz: 5d0f1731f648ce8d1dd5323c873133493d7e6da3
+  metadata.gz: 2ca6e55c68b610b3555faafb61cdfbe906bf99c9
+  data.tar.gz: e09a38a6274ecbcbab0072740b7d77d465096db8
 SHA512:
-  metadata.gz: 70e30230bb3c33a3f130cfa1ae6034bc83049d975aa8f38b3c9735de06040e4ada1977bd46e28c5231c8f1c9814d3a0e4e4bc4c22d0566a172001ca6d0ca0b3e
-  data.tar.gz: 84cb6623c55aac0cca112af8dc31281b2a2d512588f4aefd35df6f297b572248f5f08f5415b82849783ea0432b7355668b47991e4281b145d06a34da483d1829
+  metadata.gz: 0afac48b7eacf0907ef0c8dd45a25924a8768be8ac7107d7e297d337bdbcd28ed5658eaf0e7340bfa2fe018e394764e37ae00397e695a94bad5bf8c9a1f6b1d1
+  data.tar.gz: 11e357408fd5b91fa3b1b6b7419c601bdd685a974d931d3e3b3b98d888678c4d61d283e2be6c947ef017d621d8ace6133b30f98101f33f49ad69d6f30c31d836

data/lib/xmlenc/encrypted_document.rb CHANGED Viewed

@@ -14,11 +14,15 @@ module Xmlenc
       document.xpath('//xenc:EncryptedKey', NAMESPACES).collect { |n| EncryptedKey.new(n) }
     end
-    def decrypt(key)
+    def decrypt(key, fail_silent = false)
       encrypted_keys.each do |encrypted_key|
-        encrypted_data = encrypted_key.encrypted_data
-        data_key       = encrypted_key.decrypt(key)
-        encrypted_data.decrypt(data_key)
+        begin
+          encrypted_data = encrypted_key.encrypted_data
+          data_key       = encrypted_key.decrypt(key)
+          encrypted_data.decrypt(data_key)
+        rescue OpenSSL::PKey::RSAError => e
+          raise e unless fail_silent
+        end
       end
       @document.to_xml
     end

data/lib/xmlenc/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Xmlenc
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/spec/fixtures/encrypted_document_with_unknown_encrypted_key.xml ADDED Viewed

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PaymentInfo xmlns="http://example.org/paymentv2">
+  <Name>John Smith</Name>
+  <EncryptedData Id="ED" Type="http://www.w3.org/2001/04/xmlenc#Element" xmlns="http://www.w3.org/2001/04/xmlenc#">
+    <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+    <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:RetrievalMethod URI="#_EK"/>
+      <ds:RetrievalMethod URI="#_EK2"/>
+      <EncryptedKey Id="EK" xmlns="http://www.w3.org/2001/04/xmlenc#">
+        <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>my-rsa-key</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509Certificate>
+              MIIDzTCCArWgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBljELMAkGA1UEBhMCVVMx
+              CzAJBgNVBAgTAk5ZMRIwEAYDVQQHEwlNYW5oYXR0YW4xFTATBgNVBAoTDExhdmEg
+              U3VwcmVtZTEUMBIGA1UECxMLSGVhZCBPZmZpY2UxFDASBgNVBAMTC1JTQSBUZXN0
+              IENBMSMwIQYJKoZIhvcNAQkBFhR0ZWNoQGxhdmFzdXByZW1lLm9yZzAeFw0wMjAx
+              MzExNjI5NDNaFw00MzAyMjUxNjI5NDNaMIGWMQswCQYDVQQGEwJVUzELMAkGA1UE
+              CBMCTlkxEjAQBgNVBAcTCU1hbmhhdHRhbjEVMBMGA1UEChMMTGF2YSBTdXByZW1l
+              MRQwEgYDVQQLEwtIZWFkIE9mZmljZTEUMBIGA1UEAxMLUlNBIFRlc3QgQ0ExIzAh
+              BgkqhkiG9w0BCQEWFHRlY2hAbGF2YXN1cHJlbWUub3JnMIIBIjANBgkqhkiG9w0B
+              AQEFAAOCAQ8AMIIBCgKCAQEAgj3TOyUtgg99oEfsm8h9JTZBxUkzYkXVUOHxIwnk
+              Fwp4y9ZnrGja/j+kpRyKvYP5CkNdq0e58/r7GLXj45iqd03XjsFNTdjy4OIOgf7J
+              xMG7z+hEB1LT2swTs10GILFWPByRl3/BEsnekLZdoqNoJrvnttVkxgu3x80Ji3/A
+              ZD8Ub/kBGOSPyu6pn3OdnMTc5q4r1qUe985lQzCZvCMw6AoGeCyJodNu2MbveNeH
+              +YPjRgLCQfzvOFRq+9qMtE8XfUJZdNhPZhgdsOGf8uJauTcIHbAyw7BhxPy6RikW
+              W5yiWUmBya+7t4y1TQJzham/0y0zU3TAA7b/rDrU7xmNPwIDAQABoyQwIjAPBgNV
+              HRMBAf8EBTADAQH/MA8GA1UdDwEB/wQFAwMHBgAwDQYJKoZIhvcNAQEEBQADggEB
+              ADELWZjFLPjSjGeOaeUwH/mEOP+l/nTtxe07IWAQL4kvb4wsiUsM1EkPptcBQsym
+              OYgFhf3Elqma84bbOyp85y/iQnjpqWWJ73TFXSWZamSIhYb4Gk+dQuwFI+zD3B2y
+              WwqghaAHDzxtzROLUBjo+97Y6ng6V5zjmtdGOFwNXwWhf3Y+MjnErtBIKYao8NJO
+              p6di80w82+s6Ot+CLVvVobLhxS/y8yWplATRiQnI5ij/WTLML+tiU5aes0c9abaf
+              O7i9j1iTuZsDT3f96ia0RSLsXSGij737QKc3ZM8lSxBWfepWYO+G+IRgr1q9IUDa
+              kKO/vB9Ay64Rt88XbLnnGns=
+            </ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+        <CipherData>
+          <CipherValue>
+            cCxxYh3xGBTqlXbhmKxWzNMlHeE28E7vPrMyM5V4T+t1Iy2csj1BoQ7cqBjEhqEy
+            Eot4WNRYsY7P44mWBKurj2mdWQWgoxHvtITP9AR3JTMxUo3TF5ltW76DLDsEvWlE
+            uZKam0PYj6lYPKd4npUULeZyR/rDRrth/wFIBD8vbQlUsBHapNT9MbQfSKZemOuT
+            UJL9PNgsosySpKrX564oQw398XsxfTFxi4hqbdqzA/CLL418X01hUjIHdyv6XnA2
+            98Bmfv9WMPpX05udR4raDv5X8NWxjH00hAhasM3qumxoyCT6mAGfqvE23I+OXtrN
+            lUvE9mMjANw4zweCHsOcfw==
+          </CipherValue>
+        </CipherData>
+        <ReferenceList>
+          <DataReference URI="#ED"/>
+        </ReferenceList>
+      </EncryptedKey>
+      <EncryptedKey Id="EK2" xmlns="http://www.w3.org/2001/04/xmlenc#">
+        <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>my-rsa-key</ds:KeyName>
+        </ds:KeyInfo>
+        <CipherData>
+          <CipherValue>
+            dCxxYh3xGBTqlXbhmKxWzNMlHeE28E7vPrMyM5V4T+t1Iy2csj1BoQ7cqBjEhqEy
+            Eot4WNRYsY7P44mWBKurj2mdWQWgoxHvtITP9AR3JTMxUo3TF5ltW76DLDsEvWlE
+            uZKam0PYj6lYPKd4npUULeZyR/rDRrth/wFIBD8vbQlUsBHapNT9MbQfSKZemOuT
+            UJL9PNgsosySpKrX564oQw398XsxfTFxi4hqbdqzA/CLL418X01hUjIHdyv6XnA2
+            98Bmfv9WMPpX05udR4raDv5X8NWxjH00hAhasM3qumxoyCT6mAGfqvE23I+OXtrN
+            lUvE9mMjANw4zweCHsAaa==
+          </CipherValue>
+        </CipherData>
+      </EncryptedKey>
+    </ds:KeyInfo>
+    <CipherData>
+      <CipherValue>
+        u2vogkwlvFqeknJ0lYTBZkWS/eX8LR1fDPFMfyK1/UY0EyZfHvbONfDHcC/HLv/f
+        aAOOO2Y0GqsknP0LYT1OznkiJrzx134cmJCgbyrYXd3Mp21Pq3rs66JJ34Qt3/+I
+        EyJBUSMT8TdT3fBD44BtOqH2op/hy2g3hQPFZul4GiHBEnNJL/4nU1yad3bMvtAB
+        mzhx80lJvPGLcruj5V77WMvkvZfoeEqMq4qPWK02ZURsJsq0iZcJDi39NB7OCiON
+      </CipherValue>
+    </CipherData>
+  </EncryptedData>
+</PaymentInfo>

data/spec/lib/xmlenc/encrypted_document_spec.rb CHANGED Viewed

@@ -47,5 +47,21 @@ describe Xmlenc::EncryptedDocument do
         expect { subject.decrypt(private_key).chomp }.to raise_error(Xmlenc::EncryptedDataNotFound)
       end
     end
+    context 'when an EncryptedID also contains an EncryptedKey which cant be decrypted' do
+      let(:encrypted_xml) { File.read('spec/fixtures/encrypted_document_with_unknown_encrypted_key.xml') }
+      context 'when "fail_silent" is enabled' do
+        it 'decrypts the EncryptedID without raising an exception' do
+          expect(subject.decrypt(private_key, true).chomp).to eq plain_xml
+        end
+      end
+      context 'when "fail_silent" is disabled' do
+        it 'raises an exception' do
+          expect { subject.decrypt(private_key, false).chomp }.to raise_error(OpenSSL::PKey::RSAError)
+        end
+      end
+    end
   end
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xmlenc
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Benoist
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-11-23 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -160,6 +160,7 @@ files:
 - spec/fixtures/encrypted/java_to_ruby.txt
 - spec/fixtures/encrypted_document.xml
 - spec/fixtures/encrypted_document_no_ref_list.xml
+- spec/fixtures/encrypted_document_with_unknown_encrypted_key.xml
 - spec/fixtures/encrypted_document_without_data.xml
 - spec/fixtures/key.pem
 - spec/fixtures/phaos/enc-content-aes256-kt-rsa1_5.xml
@@ -223,6 +224,7 @@ test_files:
 - spec/fixtures/encrypted/java_to_ruby.txt
 - spec/fixtures/encrypted_document.xml
 - spec/fixtures/encrypted_document_no_ref_list.xml
+- spec/fixtures/encrypted_document_with_unknown_encrypted_key.xml
 - spec/fixtures/encrypted_document_without_data.xml
 - spec/fixtures/key.pem
 - spec/fixtures/phaos/enc-content-aes256-kt-rsa1_5.xml