0.6.11

Author: dwarring

Changes

@@ -1,6 +1,9 @@
 {{$NEXT}}
-    - Support /EncryptMetadata entry in encryption
-      dictionary
+
+0.6.11  2025-04-25T08:06:09+12:00
+    - Add support for encrypt EncryptMetadata setting
+    - Handle reading indirect object generation numbers up to 5 digits,
+      as per cross-reference trailer syntax.
 
 0.6.10  2025-04-14T10:19:45+12:00
     - Don't encrypt /Contents hex-string entry of signature

META6.json

@@ -72,5 +72,5 @@
   ],
   "test-depends": [
   ],
-  "version": "0.6.10"
+  "version": "0.6.11"
 }

coverage/PDF.rakucov

@@ -1,6 +1,6 @@
 * #| this class represents the top level node in a PDF or FDF document,
   #| the trailer dictionary
-* unit class PDF:ver<0.6.10>;
+* unit class PDF:ver<0.6.11>;
 
   use PDF::COS::Dict;
   also is PDF::COS::Dict;
@@ -73,10 +73,7 @@
       self;
   }
 
-* method encrypt(PDF:D $doc: Str :$owner-pass!, Str :$user-pass = '', :$EncryptMetadata = True, |c ) {
-  
-*     die '.encrypt(:!EncryptMetadata, ...) is not yet supported'
-          unless $EncryptMetadata;
+* method encrypt(PDF:D $doc: Str :$owner-pass!, Str :$user-pass = '', Bool :$EncryptMetadata = True, |c ) {
 
 *     with $.reader {
 *         with .crypt {
@@ -88,7 +85,7 @@
 
 *     $doc<Encrypt>:delete;
 *     $!flush = True;
-*     $!crypt = PDF::COS.required('PDF::IO::Crypt::PDF').new: :$doc, :$owner-pass, :$user-pass, |c;
+*     $!crypt = PDF::COS.required('PDF::IO::Crypt::PDF').new: :$doc, :$owner-pass, :$user-pass, :$EncryptMetadata, |c;
   }
 
 * method !is-indexed {

coverage/PDF/IO/Crypt.rakucov

@@ -48,9 +48,9 @@
 * method !generate(:$doc!,
                    Str  :$owner-pass!,
                    Str  :$user-pass = '',
-*                  UInt :R($!revision) = self.type eq 'AESV2' ?? 4 !! 3,
-x                  UInt :V($version) = self.type eq 'AESV2' ?? 4 !! 2,
                    Bool :$!EncryptMetadata = True,
+*                  UInt :R($!revision) = self.type eq 'AESV2' || !$!EncryptMetadata ?? 4 !! 3,
+x                  UInt :V($version) = self.type eq 'AESV2' ?? 4 !! 2,
 *                  UInt :$Length = $version > 1 ?? 128 !! 40,
 *                  Int  :P($permissions) = -64,  #| permissions mask
                    --> PDF::COS::Type::Encrypt
@@ -93,8 +93,14 @@ x                  UInt :V($version) = self.type eq 'AESV2' ?? 4 !! 2,
       }
 
 *     %dict<Length> = $Length unless $version == 1;
-*     %dict<EncryptMetadata> = False
-          if $!revision >= 4 && ! $!EncryptMetadata;
+*     unless $!EncryptMetadata {
+*         if $!revision >= 4 {
+*             %dict<EncryptMetadata> = False
+          }
+          else {
+*             warn "ignoring :!EncryptMetadata for encryption revision < 4";
+          }
+      }
 
 ✱     my $enc = $doc.Encrypt = %dict;
 

coverage/PDF/IO/Crypt/AST.rakucov

@@ -3,7 +3,7 @@
 x method crypt {...}
 x method EncryptMetadata {...}
 
-  my subset CatalogDictLike of Hash where (.<Type> ~~ Pair) && (.<Type><name> ~~ 'Catalog');
+  my subset MetadataDictLike of Hash where (.<Type> ~~ Pair) && (.<Type><name> ~~ 'Metadata');
 
   my subset EncryptDictLike of Hash where (.<Filter>:exists) && (.<U>:exists) && (.<O>:exists) && (.<P>:exists);
 
@@ -28,14 +28,6 @@ x method EncryptMetadata {...}
 *     $.crypt-ast($_, |c) for $ast.values
   }
 
-* multi method crypt-ast('dict', CatalogDictLike $ast, |c) {
-*     for $ast.pairs.sort {
-*         $.crypt-ast(.value, |c)
-              unless .key eq 'Encrypt'
-x                || (.key eq 'Metadata' && ! $.EncryptMetadata);
-      }
-  }
-  
 * multi method crypt-ast('dict', EncryptDictLike $ast, |c) {
       # skip encryption of the Encrypt dictionary
   }
@@ -55,9 +47,14 @@ x         $.crypt-ast(.value, |c)
   }
 
 * multi method crypt-ast('stream', Hash $ast, |c) {
+✱     my $dict = $ast<dict>;
+  
+*     return
+          if ! $.EncryptMetadata && $dict ~~ MetadataDictLike;
+  
 *     $.crypt-ast($_, |c)
           for $ast.pairs;
-*     $ast<dict><Length> = .codes
+*     $dict<Length> = .codes
           with $ast<encoded>;
   }
 

coverage/PDF/IO/Crypt/PDF.rakucov

@@ -11,16 +11,16 @@
 
   has PDF::IO::Crypt $!stm-f; #| stream filter (/StmF)
   has PDF::IO::Crypt $!str-f; #| string filter (/StrF)
-  has Bool $.EncryptMetadata is built;
 
 * submethod TWEAK(:$doc!, Str :$owner-pass, |c) {
 *     $owner-pass
           ?? self!generate( :$doc, :$owner-pass, |c)
           !! self!load( :$doc, |c);
-*     $!EncryptMetadata = $doc<EncryptMetadata> // True;
   }
 
-x method type { ($!stm-f.type, $!str-f.type).unique }
+* method EncryptMetadata { do with $!stm-f { .EncryptMetadata } // Bool }
+  
+* method type { ($!stm-f.type, $!str-f.type).unique }
 
   #| generate encryption
 * submethod !generate( Hash :$doc!, Bool :$aes, UInt :$V = $aes ?? 4 !! 2, |c ) {

lib/PDF.rakumod

@@ -1,6 +1,6 @@
 #| this class represents the top level node in a PDF or FDF document,
 #| the trailer dictionary
-unit class PDF:ver<0.6.10>;
+unit class PDF:ver<0.6.11>;
 
 use PDF::COS::Dict;
 also is PDF::COS::Dict;