hexapdf 0.20.2 → 0.20.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84eb73cfede7538e77c381d6c9b3119e77f620d6aab119ec32c667e4179b78c1
-  data.tar.gz: ff8107702d942c278a42812fe10e6a82ad4d96d109af607a1c6ec3e2fc72421c
+  metadata.gz: edc0879019c00378efa5e596e5a24db8d094e8baf682f434c052e62f6a84a563
+  data.tar.gz: 9eb7a38c31ae34d9bdf2d4006a01419b29d0c21faabd9b6b2ff31a3079c4617f
 SHA512:
-  metadata.gz: 981b590a35b0a2fdc37b883f6294efb6a2b6fe58bb4ada80a1ea6805b14f600c44c5e1d19b6eb74c8969291136bcdb5102ea363b1ba923e61d79d149a91401e0
-  data.tar.gz: b802c3ecde178abdc7a438b56fada5cb45fe5f951960c71fc2a12aac9d7679f834d4105c211b3b12cc8e2b251c89748b9b249e11fc8d7bbcc3d8792983b89989
+  metadata.gz: 259aa6bcd520b74bec173c91d92b660681d09f0543287783aacc216fbf633c754e3d05dbcd56e84bff3227551e074193bbcf9d2d79d9435dad33dff6d85f89bf
+  data.tar.gz: 91ba8e27297a9c0769b19531e219987b749e8d356911bd03f22e579dff66cb90788efe1db8a56eb10ee4405eca39469022bafe6aebf597be4faf2285a908d1d5

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 0.20.3 - 2022-01-24
+
+### Changed
+
+* Appearance of signature field values when using the `hexapdf form` command
+
+### Fixed
+
+* Writing of encrypted PDF files in incremental node in case the encryption was
+  changed
+* [HexaPDF::Type::Annotation#appearance] to return correctly wrapped object in
+  case of Form XObjects missing required data
+* Decrypting of files with multiple revisions
+
+
 ## 0.20.2 - 2022-01-17
 
 ### Fixed

data/lib/hexapdf/cli/form.rb

@@ -135,12 +135,20 @@ module HexaPDF
           concrete_field_type = field.concrete_field_type
           nice_field_type = concrete_field_type.to_s.split('_').map(&:capitalize).join(' ')
           position = "(#{widget[:Rect].left}, #{widget[:Rect].bottom})"
+          field_value = if !field.field_value || concrete_field_type != :signature_field
+                          field.field_value.inspect
+                        else
+                          sig = field.field_value
+                          temp = "#{sig.signer_name} (#{sig.signing_time})"
+                          temp << " (#{sig.signing_reason})" if sig.signing_reason
+                          temp
+                        end
 
           puts "  #{field_name}"
           if command_parser.verbosity_info?
             printf("    └─ %-22s | %-20s\n", nice_field_type, position)
           end
-          puts "    └─ #{field.field_value.inspect}"
+          puts "    └─ #{field_value}"
           if command_parser.verbosity_info?
             if field.field_type == :Ch
               puts "    └─ Options: #{field.option_items.map(&:inspect).join(', ')}"

data/lib/hexapdf/encryption/security_handler.rb

@@ -249,6 +249,10 @@ module HexaPDF
         @document = document
         @encrypt_dict_hash = nil
         @encryption_details = {}
+
+        @is_encrypt_dict = document.revisions.each.with_object({}) do |rev, hash|
+          hash[rev.trailer[:Encrypt]] = true
+        end
       end
 
       # Checks if the encryption key computed by this security handler is derived from the
@@ -262,7 +266,7 @@ module HexaPDF
       #
       # See: PDF1.7 s7.6.2
       def decrypt(obj)
-        return obj if obj == document.trailer[:Encrypt] || obj.type == :XRef
+        return obj if @is_encrypt_dict[obj] || obj.type == :XRef
 
         key = object_key(obj.oid, obj.gen, string_algorithm)
         each_string_in_object(obj.value) do |str|

data/lib/hexapdf/type/annotation.rb

@@ -160,7 +160,7 @@ module HexaPDF
         end
         return unless entry.kind_of?(HexaPDF::Stream)
 
-        if entry.type == :XObject && entry[:Subtype] == :Form
+        if entry.type == :XObject && entry[:Subtype] == :Form && !entry.instance_of?(HexaPDF::Stream)
           entry
         elsif (entry[:Type].nil? || entry[:Type] == :XObject) &&
             (entry[:Subtype].nil? || entry[:Subtype] == :Form) && entry[:BBox]

data/lib/hexapdf/version.rb

@@ -37,6 +37,6 @@
 module HexaPDF
 
   # The version of HexaPDF.
-  VERSION = '0.20.2'
+  VERSION = '0.20.3'
 
 end

data/lib/hexapdf/writer.rb

@@ -90,12 +90,20 @@ module HexaPDF
     #
     # For this method to work the document must have been created from an existing file.
     def write_incremental
-      @document.revisions.parser.io.seek(0, IO::SEEK_SET)
-      IO.copy_stream(@document.revisions.parser.io, @io)
+      parser = @document.revisions.parser
+
+      _, orig_trailer = parser.load_revision(parser.startxref_offset)
+      orig_trailer = @document.wrap(orig_trailer, type: :XXTrailer)
+      if @document.revisions.current.trailer[:Encrypt]&.value != orig_trailer[:Encrypt]&.value
+        raise HexaPDF::Error, "Used encryption cannot be modified when doing incremental writing"
+      end
+
+      parser.io.seek(0, IO::SEEK_SET)
+      IO.copy_stream(parser.io, @io)
       @io << "\n"
 
       @rev_size = @document.revisions.current.next_free_oid
-      @use_xref_streams = @document.revisions.parser.contains_xref_streams?
+      @use_xref_streams = parser.contains_xref_streams?
 
       revision = Revision.new(@document.revisions.current.trailer)
       @document.revisions.each do |rev|

data/test/hexapdf/encryption/test_security_handler.rb

@@ -294,9 +294,17 @@ describe HexaPDF::Encryption::SecurityHandler do
       assert_equal('string', obj.stream)
     end
 
-    it "doesn't decrypt a document's Encrypt dictionary" do
-      @document.trailer[:Encrypt] = @obj
-      assert_equal(@encrypted, @handler.decrypt(@obj)[:Key])
+    it "doesn't decrypt a document's Encrypt dictionaries" do
+      @document = HexaPDF::Document.new
+      @document.trailer[:Encrypt] = @document.add({Key: "Something"})
+      @document.revisions.add
+      @document.trailer[:Encrypt] = @document.add({Key: "Otherthing"})
+      @handler = TestHandler.new(@document)
+
+      assert_equal("Something",
+                   @handler.decrypt(@document.revisions[0].trailer[:Encrypt])[:Key])
+      assert_equal("Otherthing",
+                   @handler.decrypt(@document.revisions[1].trailer[:Encrypt])[:Key])
     end
 
     it "defers handling encryption to a Crypt filter is specified" do

data/test/hexapdf/test_writer.rb

@@ -40,7 +40,7 @@ describe HexaPDF::Writer do
       219
       %%EOF
       3 0 obj
-      <</Producer(HexaPDF version 0.20.2)>>
+      <</Producer(HexaPDF version 0.20.3)>>
       endobj
       xref
       3 1
@@ -72,7 +72,7 @@ describe HexaPDF::Writer do
       141
       %%EOF
       6 0 obj
-      <</Producer(HexaPDF version 0.20.2)>>
+      <</Producer(HexaPDF version 0.20.3)>>
       endobj
       2 0 obj
       <</Length 10>>stream
@@ -123,6 +123,17 @@ describe HexaPDF::Writer do
       HexaPDF::Writer.write(doc, output_io, incremental: true)
       refute_match(/^trailer/, output_io.string)
     end
+
+    it "raises an error if the used encryption was changed" do
+      io = StringIO.new
+      doc = HexaPDF::Document.new
+      doc.encrypt
+      doc.write(io)
+
+      doc = HexaPDF::Document.new(io: io)
+      doc.encrypt(owner_password: 'test')
+      assert_raises(HexaPDF::Error) { doc.write('notused', incremental: true) }
+    end
   end
 
   it "creates an xref stream if no xref stream is in a revision but object streams are" do

data/test/hexapdf/type/test_annotation.rb

@@ -77,7 +77,13 @@ describe HexaPDF::Type::Annotation do
     stream[:BBox] = [1, 2, 3, 4]
     appearance = @annot.appearance
     assert_same(stream.data, appearance.data)
-    assert_equal(:Form, appearance[:Subtype])
+    assert_kind_of(HexaPDF::Type::Form, appearance)
+
+    stream[:Type] = :XObject
+    stream[:Subtype] = :Form
+    appearance = @annot.appearance
+    assert_same(stream.data, appearance.data)
+    assert_kind_of(HexaPDF::Type::Form, appearance)
 
     @annot[:AP][:N] = {X: {}}
     assert_nil(@annot.appearance)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hexapdf
 version: !ruby/object:Gem::Version
-  version: 0.20.2
+  version: 0.20.3
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-17 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmdparse