Merge pull request #346 from benjamin-awd/feature/reader-load-cleanup…

…-edit

Add encrypt dict using property decorator

pyhanko/pdf_utils/reader.py

@@ -204,10 +204,8 @@ def __init__(self, stream, strict: bool = True):
 
     @property
     def security_handler(self):
-        if self._security_handler is None:
-            encrypt_dict = self._get_encryption_params()
-            if encrypt_dict is not None:
-                self._security_handler = SecurityHandler.build(encrypt_dict)
+        if self.encrypt_dict and not self._security_handler:
+            self._security_handler = SecurityHandler.build(self.encrypt_dict)
         return self._security_handler
 
     def _xmp_meta_view(self) -> Optional[DocumentMetadata]:
@@ -325,7 +323,8 @@ def _get_object_from_stream(self, idnum, stmnum, idx):
         else:
             return generic.NullObject()
 
-    def _get_encryption_params(self) -> Optional[generic.DictionaryObject]:
+    @property
+    def encrypt_dict(self) -> Optional[generic.DictionaryObject]:
         try:
             encrypt_ref = self.trailer.raw_get('/Encrypt')
         except KeyError:
@@ -344,8 +343,6 @@ def _get_encryption_params(self) -> Optional[generic.DictionaryObject]:
             raise misc.PdfReadError("Encryption settings must be a dictionary")
         return encrypt_dict
 
-    encrypt_dict = property(_get_encryption_params)
-
     @property
     def trailer_view(self) -> generic.DictionaryObject:
         return self.trailer.flatten()

pyhanko_tests/test_crypt.py

@@ -1547,7 +1547,7 @@ def test_malformed_crypt(fname, strict):
     with open(os.path.join(PDF_DATA_DIR, fname), 'rb') as inf:
         r = PdfFileReader(inf, strict=strict)
         with pytest.raises(misc.PdfReadError, match='Encryption settings'):
-            r._get_encryption_params()
+            r.encrypt_dict
 
 
 def test_tolerate_direct_encryption_dict_in_nonstrict():