xmlenc 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZWJjYTNjOTdkM2Y5ZTQ2YThhYWZiNjgzNWU1Zjk1Mjc4MGZhZjIwOA==
-  data.tar.gz: !binary |-
-    YjljZjYyZmQwNmJlY2VmYTVlYmNkZDE4Y2I3YjU5NjEwOTNiNTZjYw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NWI3YzYxMDI0ODQ2OGNlMTM0YzgxZGY3NTIyZjQyYzIzNDY0NGJlZTQzNzlh
-    NjEyNWFjZTAwMmE0YmZjMWYzZDYxNDc5MTY5OTUxMjM5NDY5OTZlZmQ5MTJl
-    YTVmMzRjZTBmYzg4MzU2ODMzM2MyMmVkMDhkOTY0OWNhODNhMTk=
-  data.tar.gz: !binary |-
-    NjJiYmUyY2U5OTIxNTdiYTcyM2NiNTQ1ODM3YWE2NTI1ODJkYTNhNTgxMTYx
-    MWY1NGJiZDBiN2I0MjRjZmUyYjI1ZjgxMWM3YzliZWEzZTM3ODgyZmJjNmVm
-    YmM1M2U2ODNmYmNhNDMzNDFkNzk0OTUyM2YyYzViM2Y1Y2JhNzg=
+SHA1:
+  metadata.gz: c7f6fc7a9f8da577303f6edf0fbcb49fc97848af
+  data.tar.gz: 614545d1e5b4ca838d25541428c3e94e89a8d0d8
+SHA512:
+  metadata.gz: c93716a8483eea188e6e8755fc43d5d626b6aee440bd5609446fbb81b2f1d4d33b43c2495b677df9ca4be9f0474aa8f5f7b4e90f7fbdbff6ad8488f1337594ea
+  data.tar.gz: b6f37cb971264ab5db3986b7e7fbe0a315d8e72fa897ca1d3fbd1ecfc32d7fdab288cdd2326648799441508067757233c78f3ed849fb47096674f35d9ecc28b0

data/lib/xmlenc.rb

@@ -24,6 +24,9 @@ module Xmlenc
     autoload :EncryptedKey, 'xmlenc/builder/encrypted_key'
     autoload :KeyInfo, 'xmlenc/builder/key_info'
     autoload :CipherData, 'xmlenc/builder/cipher_data'
+    autoload :DigestMethod, 'xmlenc/builder/digest_method'
+    autoload :ReferenceList, 'xmlenc/builder/reference_list'
+    autoload :DataReference, 'xmlenc/builder/data_reference'
 
     module ComplexTypes
       autoload :EncryptedType, 'xmlenc/builder/complex_types/encrypted_type'

data/lib/xmlenc/algorithms/rsa_oaep_mgf1p.rb

@@ -12,8 +12,7 @@ module Xmlenc
         @key.private_decrypt(cipher_value, OpenSSL::PKey::RSA::PKCS1_OAEP_PADDING)
       end
 
-      def encrypt(data, options = {})
-        verify_algorithm(options[:node]) if options[:node]
+      def encrypt(data)
         @key.public_encrypt(data, OpenSSL::PKey::RSA::PKCS1_OAEP_PADDING)
       end
 

data/lib/xmlenc/builder/complex_types/encrypted_type.rb

@@ -14,6 +14,15 @@ module Xmlenc
 
           validates :cipher_data, presence: true
         end
+
+        def initialize(attributes = {})
+          super
+          self.cipher_data = CipherData.new
+        end
+
+        def set_encryption_method(attributes = {})
+          self.encryption_method = EncryptionMethod.new(attributes)
+        end
       end
     end
   end

data/lib/xmlenc/builder/data_reference.rb

@@ -0,0 +1,14 @@
+module Xmlenc
+  module Builder
+    class DataReference
+      include Xmlenc::Builder::Base
+
+      tag "DataReference"
+
+      register_namespace "xenc", Xmlenc::NAMESPACES[:xenc]
+      namespace "xenc"
+
+      attribute :uri, String, tag: "URI"
+    end
+  end
+end

data/lib/xmlenc/builder/digest_method.rb

@@ -0,0 +1,16 @@
+module Xmlenc
+  module Builder
+    class DigestMethod
+      include Xmlenc::Builder::Base
+
+      tag "DigestMethod"
+
+      register_namespace "ds", Xmlenc::NAMESPACES[:ds]
+      namespace "ds"
+
+      attribute :algorithm, String, tag: "Algorithm"
+
+      validates :algorithm, presence: true
+    end
+  end
+end

data/lib/xmlenc/builder/encrypted_data.rb

@@ -3,11 +3,48 @@ module Xmlenc
     class EncryptedData
       include Xmlenc::Builder::ComplexTypes::EncryptedType
 
+      ALGORITHMS = {
+          'http://www.w3.org/2001/04/xmlenc#tripledes-cbc' => Algorithms::DES3CBC,
+          'http://www.w3.org/2001/04/xmlenc#aes128-cbc'    => Algorithms::AESCBC[128],
+          'http://www.w3.org/2001/04/xmlenc#aes256-cbc'    => Algorithms::AESCBC[256]
+      }
+      TYPES = {
+          'http://www.w3.org/2001/04/xmlenc#Element' => :element,
+          'http://www.w3.org/2001/04/xmlenc#Content' => :content,
+      }
+
       tag "EncryptedData"
       namespace "xenc"
 
       attribute :id, String, tag: "Id"
       attribute :type, String, tag: "Type"
+
+      def type
+        'http://www.w3.org/2001/04/xmlenc#Element'
+      end
+
+      def initialize(attributes = {})
+        super
+        self.id = SecureRandom.hex(5)
+      end
+
+      def encrypt(data)
+        encryptor = algorithm.setup
+        encrypted = encryptor.encrypt(data, node: encryption_method)
+        cipher_data.cipher_value = Base64.encode64(encrypted)
+
+        encrypted_key = EncryptedKey.new(data: encryptor.key)
+        encrypted_key.add_data_reference(id)
+        encrypted_key
+      end
+
+      private
+
+      def algorithm
+        algorithm = encryption_method.algorithm
+        ALGORITHMS[algorithm] ||
+            raise(UnsupportedError.new("Unsupported encryption method #{algorithm}"))
+      end
     end
   end
 end

data/lib/xmlenc/builder/encrypted_key.rb

@@ -3,8 +3,36 @@ module Xmlenc
     class EncryptedKey
       include Xmlenc::Builder::ComplexTypes::EncryptedType
 
+      ALGORITHMS = {
+          'http://www.w3.org/2001/04/xmlenc#rsa-1_5'        => Algorithms::RSA15,
+          'http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p' => Algorithms::RsaOaepMgf1p
+      }
+
       tag "EncryptedKey"
       namespace "xenc"
+
+      has_one :reference_list, Xmlenc::Builder::ReferenceList, xpath: "./"
+
+      attr_accessor :data
+
+      def encrypt(key, data = nil)
+        encryptor = algorithm.new(key)
+        encrypted = encryptor.encrypt(data || self.data)
+        cipher_data.cipher_value = Base64.encode64(encrypted)
+      end
+
+      def add_data_reference(data_id)
+        self.reference_list ||= ReferenceList.new
+        self.reference_list.add_data_reference(data_id)
+      end
+
+      private
+
+      def algorithm
+        algorithm = encryption_method.algorithm
+        ALGORITHMS[algorithm] ||
+            raise(UnsupportedError.new("Unsupported encryption method #{algorithm}"))
+      end
     end
   end
 end

data/lib/xmlenc/builder/encryption_method.rb

@@ -9,8 +9,15 @@ module Xmlenc
       namespace "xenc"
 
       attribute :algorithm, String, tag: "Algorithm"
+      has_one :digest_method, Xmlenc::Builder::DigestMethod
 
       validates :algorithm, presence: true
+
+      def initialize(attributes = {})
+        digest_method_algorithm = attributes.delete(:digest_method_algorithm)
+        attributes[:digest_method] = Xmlenc::Builder::DigestMethod.new(algorithm: digest_method_algorithm)
+        super
+      end
     end
   end
 end

data/lib/xmlenc/builder/reference_list.rb

@@ -0,0 +1,19 @@
+module Xmlenc
+  module Builder
+    class ReferenceList
+      include Xmlenc::Builder::Base
+
+      tag "ReferenceList"
+
+      register_namespace "xenc", Xmlenc::NAMESPACES[:xenc]
+      namespace "xenc"
+
+      has_many :data_references, Xmlenc::Builder::DataReference, xpath: "./"
+
+      def add_data_reference(data_id)
+        self.data_references ||= []
+        self.data_references << DataReference.new(uri: data_id)
+      end
+    end
+  end
+end

data/lib/xmlenc/version.rb

@@ -1,3 +1,3 @@
 module Xmlenc
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/fixtures/template2.xml

@@ -0,0 +1,47 @@
+<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#">
+    <EncryptedKey Id="EK" xmlns="http://www.w3.org/2001/04/xmlenc#">
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p">
+        <ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"/>
+      </EncryptionMethod>
+      <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/>
+      </CipherData>
+      <ReferenceList>
+        <DataReference URI="ED"/>
+      </ReferenceList>
+    </EncryptedKey>
+  </ds:KeyInfo>
+  <CipherData>
+    <CipherValue/>
+  </CipherData>
+</EncryptedData>

data/spec/lib/xmlenc/builder/data_reference_spec.rb

@@ -0,0 +1,13 @@
+require "spec_helper"
+
+describe Xmlenc::Builder::DataReference do
+
+  let(:xml) { File.read File.join("spec", "fixtures", "template2.xml") }
+  subject { described_class.parse(xml, single: true) }
+
+  describe "#parse" do
+    it "should have uri attribute" do
+      expect(subject.uri).to eq "ED"
+    end
+  end
+end

data/spec/lib/xmlenc/builder/digest_method_spec.rb

@@ -0,0 +1,18 @@
+require "spec_helper"
+
+describe Xmlenc::Builder::DigestMethod do
+
+  let(:xml) { File.read File.join("spec", "fixtures", "template2.xml") }
+  subject { described_class.parse(xml, single: true) }
+
+  describe "#parse" do
+    it "should have one algorithm" do
+      expect(subject.algorithm).to eq "http://www.w3.org/2000/09/xmldsig#sha1"
+    end
+
+    it "raises error when no algorithm" do
+      subject.algorithm = nil
+      expect(subject).to have(1).error_on :algorithm
+    end
+  end
+end

data/spec/lib/xmlenc/builder/encrypted_key_spec.rb

@@ -34,6 +34,14 @@ describe Xmlenc::Builder::EncryptedKey do
       expect(subject).to be_a Xmlenc::Builder::EncryptedKey
     end
 
+    it "should have a reference_list" do
+      expect(subject.reference_list).to be_a Xmlenc::Builder::ReferenceList
+    end
+
+    it "should have a data object" do
+      expect(subject).to respond_to :data
+    end
+
     describe "encryption method" do
       it "should create an EncryptionMethod element" do
         expect(subject.encryption_method).to be_a Xmlenc::Builder::EncryptionMethod
@@ -62,4 +70,25 @@ describe Xmlenc::Builder::EncryptedKey do
       end
     end
   end
+
+  describe "#add_data_reference" do
+    it "has method" do
+      expect(subject).to respond_to :add_data_reference
+    end
+
+    it "has one data reference" do
+      expect(subject.reference_list.data_references.count).to eq 1
+    end
+
+    it "adds an extra data reference" do
+      subject.add_data_reference(SecureRandom.hex(5))
+      expect(subject.reference_list.data_references.count).to eq 2
+    end
+  end
+
+  describe "#encrypt" do
+    it "has method" do
+      expect(subject).to respond_to :encrypt
+    end
+  end
 end

data/spec/lib/xmlenc/builder/reference_list_spec.rb

@@ -0,0 +1,24 @@
+require "spec_helper"
+
+describe Xmlenc::Builder::ReferenceList do
+
+  let(:xml) { File.read File.join("spec", "fixtures", "template2.xml") }
+  subject { described_class.parse(xml, single: true) }
+
+  describe "#parse" do
+    it "has data" do
+      expect(subject.data_references.first).to be_a Xmlenc::Builder::DataReference
+    end
+
+    it "has function" do
+      expect(subject).to respond_to :add_data_reference
+    end
+  end
+
+  describe "#add_data_reference" do
+    it "adds a data reference" do
+      subject.add_data_reference(SecureRandom.hex(5))
+      expect(subject.data_references.count).to eq 2
+    end
+  end
+end

data/spec/lib/xmlenc/encrypted_key_spec.rb

@@ -105,8 +105,6 @@ describe Xmlenc::EncryptedKey do
       encrypted_key_template.encrypt(public_key, data)
 
       expect(encrypted_key_template.cipher_value.length).to be > 0
-
-      puts encrypted_key_template.document.to_xml
     end
 
     it 'allows decryption with the key' do

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: xmlenc
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Benoist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-21 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
@@ -98,14 +98,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A (partial)implementation of the XMLENC specificiation
@@ -129,10 +129,13 @@ files:
 - lib/xmlenc/builder/base.rb
 - lib/xmlenc/builder/cipher_data.rb
 - lib/xmlenc/builder/complex_types/encrypted_type.rb
+- lib/xmlenc/builder/data_reference.rb
+- lib/xmlenc/builder/digest_method.rb
 - lib/xmlenc/builder/encrypted_data.rb
 - lib/xmlenc/builder/encrypted_key.rb
 - lib/xmlenc/builder/encryption_method.rb
 - lib/xmlenc/builder/key_info.rb
+- lib/xmlenc/builder/reference_list.rb
 - lib/xmlenc/encrypted_data.rb
 - lib/xmlenc/encrypted_document.rb
 - lib/xmlenc/encrypted_key.rb
@@ -148,6 +151,7 @@ files:
 - spec/fixtures/phaos/payment.xml
 - spec/fixtures/phaos/rsa-priv-key.pem
 - spec/fixtures/template.xml
+- spec/fixtures/template2.xml
 - spec/lib/xmlenc/algorithms/aes_cbc_spec.rb
 - spec/lib/xmlenc/algorithms/des3_cbc_spec.rb
 - spec/lib/xmlenc/algorithms/rsa_15_spec.rb
@@ -155,10 +159,13 @@ files:
 - spec/lib/xmlenc/builder/base_spec.rb
 - spec/lib/xmlenc/builder/cipher_data_spec.rb
 - spec/lib/xmlenc/builder/complex_types/encrypted_type_spec.rb
+- spec/lib/xmlenc/builder/data_reference_spec.rb
+- spec/lib/xmlenc/builder/digest_method_spec.rb
 - spec/lib/xmlenc/builder/encrypted_data_spec.rb
 - spec/lib/xmlenc/builder/encrypted_key_spec.rb
 - spec/lib/xmlenc/builder/encryption_method_spec.rb
 - spec/lib/xmlenc/builder/key_info_spec.rb
+- spec/lib/xmlenc/builder/reference_list_spec.rb
 - spec/lib/xmlenc/encrypted_data_spec.rb
 - spec/lib/xmlenc/encrypted_document_spec.rb
 - spec/lib/xmlenc/encrypted_key_spec.rb
@@ -175,17 +182,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A (partial)implementation of the XMLENC specificiation
@@ -201,6 +208,7 @@ test_files:
 - spec/fixtures/phaos/payment.xml
 - spec/fixtures/phaos/rsa-priv-key.pem
 - spec/fixtures/template.xml
+- spec/fixtures/template2.xml
 - spec/lib/xmlenc/algorithms/aes_cbc_spec.rb
 - spec/lib/xmlenc/algorithms/des3_cbc_spec.rb
 - spec/lib/xmlenc/algorithms/rsa_15_spec.rb
@@ -208,10 +216,13 @@ test_files:
 - spec/lib/xmlenc/builder/base_spec.rb
 - spec/lib/xmlenc/builder/cipher_data_spec.rb
 - spec/lib/xmlenc/builder/complex_types/encrypted_type_spec.rb
+- spec/lib/xmlenc/builder/data_reference_spec.rb
+- spec/lib/xmlenc/builder/digest_method_spec.rb
 - spec/lib/xmlenc/builder/encrypted_data_spec.rb
 - spec/lib/xmlenc/builder/encrypted_key_spec.rb
 - spec/lib/xmlenc/builder/encryption_method_spec.rb
 - spec/lib/xmlenc/builder/key_info_spec.rb
+- spec/lib/xmlenc/builder/reference_list_spec.rb
 - spec/lib/xmlenc/encrypted_data_spec.rb
 - spec/lib/xmlenc/encrypted_document_spec.rb
 - spec/lib/xmlenc/encrypted_key_spec.rb