RubyGems - xmlenc - Versions diffs - 0.1.2 → 0.1.3 - Mend

xmlenc 0.1.2 → 0.1.3

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_key.rb +11 -2
data/lib/xmlenc/version.rb +1 -1
data/spec/fixtures/encrypted_document_no_ref_list.xml +112 -0
data/spec/lib/xmlenc/encrypted_key_spec.rb +14 -2
metadata +4 -2

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a6e7c29df014686dadf47b1ece5612a7b725e8f
-  data.tar.gz: b64890289ba633730119b3c059c196b1df1c2b83
+  metadata.gz: 4453557d61e71a970c57c65ff1bd18a97ad5614c
+  data.tar.gz: 792f1da07197cba184dae87839e98dd659c5fd89
 SHA512:
-  metadata.gz: bd4fc69195a98850babd49014aa0d35ef3c4b28542b8ba8c95af917cc07ed02fb159ddfb6041beeb0184bf40a7c0f168c4d5db6012d221c7baeda5488b40409f
-  data.tar.gz: 3b7639e970fb6f9c0494a94b48274a2bb006023569814a862f1e5c3fb0530536cc34b7288ea97cb3183e460cb9c35341ccec200026e54fde13fc779e6650ffaf
+  metadata.gz: 3a0149a730a4c597ae1fa2a3b865000ad787c6886537b1ad4c869c02476c67d774cd41eefad3e882b68c7d29809c62529be986584bcd5d1cdc6cb33c66a78455
+  data.tar.gz: 3a14e7b3140f671ee620122133547c0cf43f3092172585619932a26042ee09c40b2b487f22afc9e5e4e3000c9995e3a1e66054181375d602b4941e2cbde3bbcc

data/lib/xmlenc/encrypted_key.rb CHANGED

@@ -43,11 +43,20 @@ module Xmlenc
     private
     def referenced_node
-      document.at_xpath("//xenc:EncryptedData[@Id='#{reference_uri}']", NAMESPACES)
+      if reference_uri
+        document.at_xpath("//xenc:EncryptedData[@Id='#{reference_uri}']", NAMESPACES)
+      else
+        #document.at_xpath("//xenc:EncryptedData", NAMESPACES)
+        @node.at_xpath('ancestor::xenc:EncryptedData', Xmlenc::NAMESPACES)
+      end
     end
     def reference_uri
-      at_xpath('./xenc:ReferenceList/xenc:DataReference')['URI'][1..-1]
+      if at_xpath('./xenc:ReferenceList/xenc:DataReference')
+        at_xpath('./xenc:ReferenceList/xenc:DataReference')['URI'][1..-1]
+      else
+        nil
+      end
     end
     def at_xpath(xpath)

data/lib/xmlenc/version.rb CHANGED

@@ -1,3 +1,3 @@
 module Xmlenc
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/fixtures/encrypted_document_no_ref_list.xml ADDED

@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PaymentInfo xmlns="http://example.org/paymentv2">
+  <Name>John Smith</Name>
+  <EncryptedData Type="http://www.w3.org/2001/04/xmlenc#Element" xmlns="http://www.w3.org/2001/04/xmlenc#" ID="first_data">
+    <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+    <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <EncryptedKey xmlns="http://www.w3.org/2001/04/xmlenc#" ID="first_key">
+        <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>
+      </EncryptedKey>
+    </ds:KeyInfo>
+    <CipherData>
+      <CipherValue>
+        u2vogkwlvFqeknJ0lYTBZkWS/eX8LR1fDPFMfyK1/UY0EyZfHvbONfDHcC/HLv/f
+        aAOOO2Y0GqsknP0LYT1OznkiJrzx134cmJCgbyrYXd3Mp21Pq3rs66JJ34Qt3/+I
+        EyJBUSMT8TdT3fBD44BtOqH2op/hy2g3hQPFZul4GiHBEnNJL/4nU1yad3bMvtAB
+        mzhx80lJvPGLcruj5V77WMvkvZfoeEqMq4qPWK02ZURsJsq0iZcJDi39NB7OCiON
+      </CipherValue>
+    </CipherData>
+  </EncryptedData>
+  <EncryptedData Type="http://www.w3.org/2001/04/xmlenc#Element" xmlns="http://www.w3.org/2001/04/xmlenc#" ID="second_data">
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <EncryptedKey xmlns="http://www.w3.org/2001/04/xmlenc#" ID="second_key">
+          <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>
+        </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_key_spec.rb CHANGED

@@ -33,8 +33,20 @@ describe Xmlenc::EncryptedKey do
   end
   describe 'encrypted_data' do
-    it 'returns the encrypted data element' do
-      expect(subject.encrypted_data).to be_a(Xmlenc::EncryptedData)
+    describe 'with reference list' do
+      it 'returns the encrypted data element' do
+        expect(subject.encrypted_data).to be_a(Xmlenc::EncryptedData)
+      end
+    end
+    describe 'without reference list' do
+      it 'returns the encrypted data element' do
+        xml_no_ref =  File.read('spec/fixtures/encrypted_document_no_ref_list.xml')
+        no_ref_doc = Nokogiri::XML::Document.parse(xml_no_ref)
+        encrypted_no_ref_key_node = no_ref_doc.at_xpath("//xenc:EncryptedKey[@ID='second_key']", Xmlenc::NAMESPACES)
+        no_ref_node = Xmlenc::EncryptedKey.new(encrypted_no_ref_key_node)
+        expect(no_ref_node.encrypted_data.node['ID']).to be == 'second_data'
+      end
     end
   end

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xmlenc
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Benoist
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -141,6 +141,7 @@ files:
 - lib/xmlenc/encrypted_key.rb
 - lib/xmlenc/version.rb
 - spec/fixtures/encrypted_document.xml
+- spec/fixtures/encrypted_document_no_ref_list.xml
 - spec/fixtures/key.pem
 - spec/fixtures/phaos/enc-content-aes256-kt-rsa1_5.xml
 - spec/fixtures/phaos/enc-element-3des-kt-rsa_oaep_sha1.xml
@@ -198,6 +199,7 @@ specification_version: 4
 summary: A (partial)implementation of the XMLENC specificiation
 test_files:
 - spec/fixtures/encrypted_document.xml
+- spec/fixtures/encrypted_document_no_ref_list.xml
 - spec/fixtures/key.pem
 - spec/fixtures/phaos/enc-content-aes256-kt-rsa1_5.xml
 - spec/fixtures/phaos/enc-element-3des-kt-rsa_oaep_sha1.xml