xmldsig 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a25ba1df705f0356c2b566cccfe488ed8349f15
-  data.tar.gz: 63b9cf765ae35c0a8ff18c7004034ced0be392b1
+  metadata.gz: f23a822603d9deb9781149f9440df390aa386fc2
+  data.tar.gz: 8501502a05a8e89e1c58cabcde2ea86a0dd57dfd
 SHA512:
-  metadata.gz: 8a52954081fa6154227cbd7e68ee41c71c6044344e9ccd24b541f30437df13687ca23fb2a0efc4af5f3248b54ac2541e9d14d08016a18ab81557b00f775a6662
-  data.tar.gz: f7efae54cadb080a881b4b1be9266bed9d800181a4c2cbed41435c6cedeb7089e3cd4971ad1708879070566b2d5f8086c09710d16bed6f1adeba78100e6173b0
+  metadata.gz: 60def31b212dc61e5cf32b3062ecc5969106c9ee6555878c1a79463b0de80b002ce7301c1bb38f181adc78ec3d43edd1b2d2fc1fe4f0edc6ca14dd372a6ec018
+  data.tar.gz: ca9edf2fe24d1297cd9d64121f1154aa637d5bce0e601b27c3323de16b28e7d2a7e6207b50e9ef5d9cbbd064e961a637234b8f4e41f3e742fccc69f8c7ad158f

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+v0.4.0 20-11-2015
+- Breaking change: Signing now leaves previously signed signatures in tact. Use Xmldsig::SignedDocument.new(unsigned_xml, force: true) to resign all signatures
+
 v0.3.2 17-11-2015
 - After signing return the XML the correct way
 

data/lib/xmldsig/signature.rb

@@ -39,6 +39,14 @@ module Xmldsig
       errors.empty?
     end
 
+    def signed?
+      !unsigned?
+    end
+
+    def unsigned?
+      self.signature_value.to_s.empty?
+    end
+
     private
 
     def canonicalization_method

data/lib/xmldsig/signed_document.rb

@@ -1,6 +1,6 @@
 module Xmldsig
   class SignedDocument
-    attr_accessor :document, :id_attr
+    attr_accessor :document, :id_attr, :force
 
     def initialize(document, options = {})
       @document = if document.kind_of?(Nokogiri::XML::Document)
@@ -8,18 +8,17 @@ module Xmldsig
       else
         Nokogiri::XML(document, nil, nil, Nokogiri::XML::ParseOptions::STRICT)
       end
-      @id_attr = options[:id_attr] if options[:id_attr]
+      @id_attr  = options[:id_attr] if options[:id_attr]
+      @force    = options[:force]
     end
 
     def validate(certificate = nil, &block)
       signatures.any? && signatures.all? { |signature| signature.valid?(certificate, &block) }
     end
 
-    def sign(private_key = nil, instruct = true, root_only = false, &block)
-      if root_only
-        signatures.first.sign(private_key, &block)
-      else
-        signatures.reverse.each { |signature| signature.sign(private_key, &block) }
+    def sign(private_key = nil, instruct = true, &block)
+      signatures.reverse.each do |signature|
+        signature.sign(private_key, &block) if signature.unsigned? || force
       end
 
       if instruct

data/lib/xmldsig/version.rb

@@ -1,3 +1,3 @@
 module Xmldsig
-  VERSION = '0.3.2'
+  VERSION = '0.4.0'
 end

data/spec/fixtures/unsigned_nested_signed_signature.xml

@@ -34,9 +34,7 @@
           <ds:DigestValue>ftoSYFdze1AWgGHF5N9i9SFKThXkqH2AdyzA3/epbJw=</ds:DigestValue>
         </ds:Reference>
       </ds:SignedInfo>
-      <ds:SignatureValue>E3yyqsSoxRkhYEuaEtR+SLg85gU5B4a7xUXA+d2Zn6j7F6z73dOd8iYHOusB
-  Ty3C/3ujbmPhHKg8uX9kUE8b+YoOqZt4z9pdxAq44nJEuijwi4doIPpHWirv
-  BnSoP5IoL0DYzGVrgj8udRzfAw5nNeV7wSrBZEn+yrxmUPJoUZc=</ds:SignatureValue>
+      <ds:SignatureValue>ftoSYFdze1AWgGHF5N9i9SFKThXkqH2AdyzA3/epbJw=</ds:SignatureValue>
     </ds:Signature>
   </foo:Foo>
 </baz:Baz>

data/spec/lib/xmldsig/signed_document_spec.rb

@@ -28,7 +28,7 @@ describe Xmldsig::SignedDocument do
     end
 
     it "accepts a nokogiri document" do
-      doc = Nokogiri::XML(unsigned_xml)
+      doc             = Nokogiri::XML(unsigned_xml)
       signed_document = described_class.new(doc)
       signed_document.document.should be_a(Nokogiri::XML::Document)
     end
@@ -74,9 +74,9 @@ describe Xmldsig::SignedDocument do
     end
 
     it "validates a document with a http://www.w3.org/2001/10/xml-exc-c14n#WithComments transform" do
-      unsigned_xml_with_comments = File.read("spec/fixtures/signed_xml-exc-c14n#with_comments.xml")
+      unsigned_xml_with_comments       = File.read("spec/fixtures/signed_xml-exc-c14n#with_comments.xml")
       unsigned_documents_with_comments = Xmldsig::SignedDocument.new(unsigned_xml_with_comments)
-      signed_xml_with_comments = unsigned_documents_with_comments.sign(private_key)
+      signed_xml_with_comments         = unsigned_documents_with_comments.sign(private_key)
       Xmldsig::SignedDocument.new(signed_xml_with_comments).validate(certificate).should be == true
     end
   end
@@ -94,18 +94,33 @@ describe Xmldsig::SignedDocument do
       Xmldsig::SignedDocument.new(signed_document).validate(certificate).should be == true
     end
 
-    context 'with the root only option' do
+    context 'with the force false' do
       let(:unsigned_xml) { File.read("spec/fixtures/unsigned_nested_signed_signature.xml") }
       let(:unsigned_document) { Xmldsig::SignedDocument.new(unsigned_xml) }
 
-      let(:signed_xml) { unsigned_document.sign(private_key, true, true) }
+      let(:signed_xml) { unsigned_document.sign(private_key) }
       let(:signed_document) { Xmldsig::SignedDocument.new(signed_xml) }
 
       it 'only signs the root signature and leaves the nested signature intact' do
         signed_document.signatures.first.valid?(certificate).should be == true
+        signed_document.signatures.last.valid?(certificate).should be == false
         signed_document.signatures.last.signature_value.should be == unsigned_document.signatures.last.signature_value
       end
     end
+
+    context 'with the force true' do
+      let(:unsigned_xml) { File.read("spec/fixtures/unsigned_nested_signed_signature.xml") }
+      let(:unsigned_document) { Xmldsig::SignedDocument.new(unsigned_xml, force: true) }
+
+      let(:signed_xml) { unsigned_document.sign(private_key) }
+      let(:signed_document) { Xmldsig::SignedDocument.new(signed_xml) }
+
+      it 'only signs the root signature and leaves the nested signature intact' do
+        signed_document.signatures.first.valid?(certificate).should be == true
+        signed_document.signatures.last.valid?(certificate).should be == true
+        signed_document.signatures.last.signature_value.should be != unsigned_document.signatures.last.signature_value
+      end
+    end
   end
 
   describe "Nested Signatures" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xmldsig
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - benoist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri