hexapdf 0.15.2 → 0.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a6ef1bdd17664ef0b9474b931d31ad69c57c77928ce2b69a3bbd5dadda0dce6
-  data.tar.gz: 11b87436d19cc5498fd6a77f0b6c410e717809264153964668be0f5199b9354d
+  metadata.gz: 592ea8ae7648df43e92ba50effdf3f8f34163e4acf7fb9567c3b38db46eb598e
+  data.tar.gz: 6c3b7d32a1499f2e2133fbafdf46b9d3cd4d1df41b9ae308c0c32ea39aefff2d
 SHA512:
-  metadata.gz: 525a55832758b5eecd1a7f2daf5f220e1afa7ff8e88ca2d65998e658585f290ff2018450e50423f2331b7f195865eab8b1c62562ecdbf3671b46d4da770aed12
-  data.tar.gz: 0b0e18c7f79f0e2a54080fefad1dd4d94e15157f72e5360a3ebd827fc0cc2037ae6e06302155426e7f0900e97ee0cee678e069bd8ef05a9333d684c50e1343a5
+  metadata.gz: fdf9edf53c0443d459008634ddbff7cd80fc1422fa558df41db04af0d9eeb512ea050d5b4a10987b824c675203e39bc851d1b2a68d0178f2cd12fada66b31245
+  data.tar.gz: 8e6a7b91da0ed2b63f7bc6d52c3993553f439edf986253b3508d0510310195c2a6f3721c2cfed735afc3d60dacacedc8207a6fac361bedc354bc6bd779207eac

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.15.3 - 2021-05-01
+
+### Fixed
+
+* Handling of general (not document-level), unencrypted metadata streams
+
+
 ## 0.15.2 - 2021-05-01
 
 ### Fixed

data/lib/hexapdf/encryption/standard_security_handler.rb

@@ -241,7 +241,7 @@ module HexaPDF
       end
 
       def decrypt(obj) #:nodoc:
-        if obj.type == :Metadata && obj == document.catalog.value[:Metadata] && !dict[:EncryptMetadata]
+        if dict[:V] >= 4 && obj.type == :Metadata && obj[:Subtype] == :XML && !dict[:EncryptMetadata]
           obj
         else
           super
@@ -249,7 +249,11 @@ module HexaPDF
       end
 
       def encrypt_stream(obj) #:nodoc
-        obj == document.catalog.value[:Metadata] && !dict[:EncryptMetadata] ? obj.stream_encoder : super
+        if dict[:V] >= 4 && obj.type == :Metadata && obj[:Subtype] == :XML && !dict[:EncryptMetadata]
+          obj.stream_encoder
+        else
+          super
+        end
       end
 
       private

data/lib/hexapdf/version.rb

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

data/test/hexapdf/encryption/test_standard_security_handler.rb

@@ -296,11 +296,11 @@ describe HexaPDF::Encryption::StandardSecurityHandler do
   describe "handling of metadata streams" do
     before do
       @doc = HexaPDF::Document.new
-      @doc.encrypt(encrypt_metadata: false)
       @output = StringIO.new(''.b)
     end
 
-    it "doesn't decrypt or encrypt the document level metadata stream if /EncryptMetadata is false" do
+    it "doesn't decrypt or encrypt a metadata stream if /EncryptMetadata is false" do
+      @doc.encrypt(encrypt_metadata: false)
       @doc.catalog[:Metadata] = @doc.wrap({Type: :Metadata, Subtype: :XML}, stream: "HELLODATA")
       @doc.write(@output)
       assert_match(/stream\nHELLODATA\nendstream/, @output.string)
@@ -309,13 +309,14 @@ describe HexaPDF::Encryption::StandardSecurityHandler do
       assert_equal('HELLODATA', doc.catalog[:Metadata].stream)
     end
 
-    it "doesn't modify decryption/encryption for arbitrary metadata streams" do
-      @doc.catalog[:Anything] = @doc.wrap({Type: :Metadata, Subtype: :XML}, stream: "HELLODATA")
+    it "doesn't modify decryption/encryption for metadata streams if /V is not 4 or 5" do
+      @doc.encrypt(encrypt_metadata: false, algorithm: :arc4)
+      @doc.catalog[:Metadata] = @doc.wrap({Type: :Metadata, Subtype: :XML}, stream: "HELLODATA")
       @doc.write(@output)
       refute_match(/stream\nHELLODATA\nendstream/, @output.string)
 
       doc = HexaPDF::Document.new(io: @output)
-      assert_equal('HELLODATA', doc.catalog[:Anything].stream)
+      assert_equal('HELLODATA', doc.catalog[:Metadata].stream)
     end
   end
 end

data/test/hexapdf/test_writer.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hexapdf
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.15.3
 platform: ruby
 authors:
 - Thomas Leitner