hexapdf 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee462224ffa152978df2a0aebd05b52c7a75a21655880858bbb4b61e2eccd3dd
-  data.tar.gz: dc2eedf3a556c7a85fbfb229372512043f33200c6ffb6223b344c96bf4aff91b
+  metadata.gz: a1011a745720b76eaa963d0a54b6807e732fe6ecd3bcb029870309e42296bbe9
+  data.tar.gz: 0aed16b283825785a7039ebca11a61da853c7fb01e8d2fadc9e5d7a722e56754
 SHA512:
-  metadata.gz: da87ec95143ad653a606c699dc4e29ac3e4abf6b4e1a0bfc535ede8221f047ab35f7b69556eaa7b7cf23d7da69909685c515d98ea67f1e1e0265ebbb460f2eb7
-  data.tar.gz: f47ec5e10af27baf8a8ee06d4f496f53841b57acc93ce1111288576a473dfb73d73052aa65f21835e19ebadb6e87868fcc3d63f84c82dbfd81dca7ae56eb9975
+  metadata.gz: 70bee8b172f67ab59559ec1b0d740d767dad0db0a5d30476bdbfd71f80f443b31fc8b98bfd62a6d632411c246aa04af9c4203c443f4affc7b0307694bd5b725b
+  data.tar.gz: 04002b0d6728a37c499c1453a4068161b6c3c2631e318981559e52207681ae268de39b6a5b9127b39ee009be079c06e8ea761c2633d1f586efb0294a923e7a61

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.9.3 - 2019-06-13
+
+### Changed
+
+* Behaviour of how object streams are generated to work around a bug (?) in
+  Adobe Acrobat
+
+### Fixed
+
+* Fix problem with [HexaPDF::Encryption::StandardSecurityHandler] due to
+  behaviour change of Ruby 2.6.0 in `String#setbyte`
+
 ## 0.9.2 - 2019-05-22
 
 ### Changed

data/CONTRIBUTERS

@@ -1,4 +1,4 @@
   Count Name
 ======= ====
-   1037 Thomas Leitner <t_leitner@gmx.at>
+   1041 Thomas Leitner <t_leitner@gmx.at>
       1 Daniel Kraus <bovender@bovender.de>

data/VERSION

@@ -1 +1 @@
-0.9.2
+0.9.3

data/lib/hexapdf/encryption/standard_security_handler.rb

@@ -607,7 +607,7 @@ module HexaPDF
         new_key = key.dup
         i = 0
         while i < new_key.length
-          new_key.setbyte(i, new_key.getbyte(i) ^ value)
+          new_key.setbyte(i, (new_key.getbyte(i) ^ value) % 256)
           i += 1
         end
         new_key

data/lib/hexapdf/type/object_stream.rb

@@ -174,7 +174,11 @@ module HexaPDF
         encrypt_dict = document.trailer[:Encrypt]
         while index < objects.size / 2
           obj = revision.object(objects[index])
-          if obj.nil? || obj.null? || obj.gen != 0 || obj.kind_of?(Stream) || obj == encrypt_dict
+
+          # Due to a bug in Adobe Acrobat, the Catalog may not be in an object stream if the
+          # document is encrypted
+          if obj.nil? || obj.null? || obj.gen != 0 || obj.kind_of?(Stream) || obj == encrypt_dict ||
+              (encrypt_dict && obj.type == :Catalog)
             delete_object(objects[index])
             next
           end

data/lib/hexapdf/version.rb

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

data/test/hexapdf/test_writer.rb

@@ -40,7 +40,7 @@ describe HexaPDF::Writer do
       219
       %%EOF
       3 0 obj
-      <</Producer(HexaPDF version 0.9.2)>>
+      <</Producer(HexaPDF version 0.9.3)>>
       endobj
       xref
       3 1
@@ -72,7 +72,7 @@ describe HexaPDF::Writer do
       141
       %%EOF
       6 0 obj
-      <</Producer(HexaPDF version 0.9.2)>>
+      <</Producer(HexaPDF version 0.9.3)>>
       endobj
       2 0 obj
       <</Length 10>>stream

data/test/hexapdf/type/test_object_stream.rb

@@ -57,21 +57,53 @@ describe HexaPDF::Type::ObjectStream do
     assert_nil(@obj.object_index(5))
   end
 
-  it "allows writing the objects to the stream" do
-    @obj.stream = 'something'
-    @obj.add_object(HexaPDF::Object.new(5, oid: 1))
-    @obj.add_object(HexaPDF::Object.new(:will_be_deleted, oid: 3, gen: 1))
-    @obj.add_object(HexaPDF::Object.new([1, 2], oid: 5))
-    @obj.add_object(HexaPDF::Object.new(nil, oid: 7))
-    @obj.add_object(@doc.trailer[:Encrypt])
-
-    revision = Object.new
-    def revision.object(obj); obj; end
-    @obj.write_objects(revision)
-
-    assert_equal(2, @obj.value[:N])
-    assert_equal(8, @obj.value[:First])
-    assert_equal("1 0 5 2 5 [1 2] ", @obj.stream)
+  describe "write objects to stream" do
+    before do
+      @revision = Object.new
+      def @revision.object(obj); obj; end
+    end
+
+    it "processes allowed objects" do
+      @obj.add_object(HexaPDF::Object.new(5, oid: 1))
+      @obj.add_object(HexaPDF::Object.new([1, 2], oid: 5))
+
+      @obj.write_objects(@revision)
+      assert_equal(2, @obj.value[:N])
+      assert_equal(8, @obj.value[:First])
+      assert_equal("1 0 5 2 5 [1 2] ", @obj.stream)
+    end
+
+    it "doesn't allow null objects" do
+      @obj.add_object(HexaPDF::Object.new(nil, oid: 7))
+      @obj.write_objects(@revision)
+      assert_equal(0, @obj.value[:N])
+      assert_equal(0, @obj.value[:First])
+      assert_equal("", @obj.stream)
+    end
+
+    it "doesn't allow objects with gen not 0" do
+      @obj.add_object(HexaPDF::Object.new(:will_be_deleted, oid: 3, gen: 1))
+      @obj.write_objects(@revision)
+      assert_equal(0, @obj.value[:N])
+      assert_equal(0, @obj.value[:First])
+      assert_equal("", @obj.stream)
+    end
+
+    it "doesn't allow the encryption dictionary to be compressed" do
+      @obj.add_object(@doc.trailer[:Encrypt])
+      @obj.write_objects(@revision)
+      assert_equal(0, @obj.value[:N])
+      assert_equal(0, @obj.value[:First])
+      assert_equal("", @obj.stream)
+    end
+
+    it "doesn't allow the Catalog entry to be compressed when encryption is used" do
+      @obj.add_object(HexaPDF::Dictionary.new({Type: :Catalog}, oid: 8))
+      @obj.write_objects(@revision)
+      assert_equal(0, @obj.value[:N])
+      assert_equal(0, @obj.value[:First])
+      assert_equal("", @obj.stream)
+    end
   end
 
   it "fails validation if gen != 0" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hexapdf
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2019-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmdparse