caerp-sign-pdf 2024.1.2__tar.gz → 2024.1.4__tar.gz

caerp_sign_pdf-2024.1.4/CURRENT_VERSION

@@ -0,0 +1 @@
+2024.1.4

{caerp_sign_pdf-2024.1.2 → caerp_sign_pdf-2024.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: caerp_sign_pdf
-Version: 2024.1.2
+Version: 2024.1.4
 Summary: caerp_sign_pdf
 Home-page: https://framagit.org/caerp/caerp_sign_pdf
 Author: Kilya
@@ -14,6 +14,7 @@ Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: WSGI :: Application
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
+Requires-Dist: pyHanko[image-support,opentype,pkcs11,xmp]==0.25.1
 
 CAERP Sign PDF
 ======================================================

caerp_sign_pdf-2024.1.4/requirements.txt

@@ -0,0 +1 @@
+pyHanko[pkcs11,image-support,opentype,xmp]==0.25.1

{caerp_sign_pdf-2024.1.2 → caerp_sign_pdf-2024.1.4}/src/caerp_sign_pdf/public.py

@@ -4,11 +4,12 @@ import hashlib
 
 from io import BytesIO
 from pyhanko.pdf_utils.incremental_writer import IncrementalPdfFileWriter
+from pyhanko.pdf_utils.xref import ObjectHeaderReadError
 from pyhanko.sign import fields, signers
 from pyhanko.sign.general import SigningError
 from pyhanko.stamp import TextStampStyle
-from PyPDF4.pdf import PdfFileReader, PdfFileWriter, utils
-from pyramid.httpexceptions import HTTPInternalServerError
+from PyPDF4.pdf import PdfFileReader, PdfFileWriter
+from pyramid.httpexceptions import HTTPUnsupportedMediaType
 
 from caerp.views.files.controller import FileData
 
@@ -18,6 +19,14 @@ from .models import PDFSignatureHistory
 logger = logging.getLogger(f"caerp.{__name__}")
 
 
+ERROR_LOAD_CERTIFICATE_MSG = "Impossible de charger le certificat à utiliser \
+pour signer numériquement le fichier. Veuillez contacter le support."
+
+ERROR_PDF_FORMAT_MSG = "Le fichier PDF ne peut pas être signé numériquement \
+car son format n'est pas correct. Vous pouvez essayer de l'imprimer dans un \
+nouveau fichier PDF avant de le recharger."
+
+
 class SignPDFService(object):
     def __init__(self, context, request):
         self.context = context
@@ -89,11 +98,11 @@ class SignPDFService(object):
             passphrase=self._get_certificate_passphrase().encode(),
         )
         if not signer:
-            raise Exception(
+            logger.error(
                 "Unable to load certificate for signing PDF files (check \
-'caerp.sign_certificate_path' and 'caerp.sign_certificate_passphrase' \
-in config)"
+'caerp.sign_certificate_path' and 'caerp.sign_certificate_passphrase' in config)"
             )
+            raise Exception(ERROR_LOAD_CERTIFICATE_MSG)
 
         # Prepare stamp (if needed)
         stamp = None
@@ -109,21 +118,18 @@ in config)"
                 border_width=0,
             )
 
-        # Clean PDF before signing
+        # Open original PDF
         try:
             pdf_data.data = self._get_safe_pdf(pdf_data.data)
+            pdf_writer = IncrementalPdfFileWriter(pdf_data.data, strict=False)
         except Exception as error:
-            logger.error(f"Unknown error while cleaning original PDF file : {error}")
-            raise HTTPInternalServerError(
-                "Le fichier PDF ne peut pas être traité car son format n'est pas \
-correct. Vous pouvez essayer de le réimprimer dans un nouveau fichier PDF."
-            )
+            logger.error(f"Error while opening original PDF file : {error}")
+            raise HTTPUnsupportedMediaType(ERROR_PDF_FORMAT_MSG)
 
-        # Sign PDF
-        w = IncrementalPdfFileWriter(pdf_data.data, strict=False)
+        # Add signature field on the PDF
         try:
             fields.append_signature_field(
-                w,
+                pdf_writer,
                 sig_field_spec=fields.SigFieldSpec(
                     "SignatureCAERP", box=(445, 800, 580, 830)
                 ),
@@ -131,13 +137,22 @@ correct. Vous pouvez essayer de le réimprimer dans un nouveau fichier PDF."
         except SigningError:
             logger.warn("File is already signed, nothing to do")
             return True
-        meta = signers.PdfSignatureMetadata(field_name="SignatureCAERP")
-        pdf_signer = signers.PdfSigner(
-            meta,
-            signer=signer,
-            stamp_style=stamp,
-        )
-        pdf_data.data = pdf_signer.sign_pdf(w)
+        except ObjectHeaderReadError as error:
+            logger.error(f"Error while reading Xref header : {error}")
+            raise HTTPUnsupportedMediaType(ERROR_PDF_FORMAT_MSG)
+
+        # Sign PDF
+        try:
+            meta = signers.PdfSignatureMetadata(field_name="SignatureCAERP")
+            pdf_signer = signers.PdfSigner(
+                meta,
+                signer=signer,
+                stamp_style=stamp,
+            )
+            pdf_data.data = pdf_signer.sign_pdf(pdf_writer)
+        except Exception as error:
+            logger.error(f"Error while signing PDF file : {error}")
+            raise HTTPUnsupportedMediaType(ERROR_PDF_FORMAT_MSG)
         logger.info(
             "File '{}' signed successfully by {} !".format(
                 pdf_data.name, signer.subject_name

{caerp_sign_pdf-2024.1.2 → caerp_sign_pdf-2024.1.4}/src/caerp_sign_pdf.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
-Name: caerp-sign-pdf
-Version: 2024.1.2
+Name: caerp_sign_pdf
+Version: 2024.1.4
 Summary: caerp_sign_pdf
 Home-page: https://framagit.org/caerp/caerp_sign_pdf
 Author: Kilya
@@ -14,6 +14,7 @@ Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: WSGI :: Application
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
+Requires-Dist: pyHanko[image-support,opentype,pkcs11,xmp]==0.25.1
 
 CAERP Sign PDF
 ======================================================

caerp_sign_pdf-2024.1.4/src/caerp_sign_pdf.egg-info/requires.txt

@@ -0,0 +1 @@
+pyHanko[image-support,opentype,pkcs11,xmp]==0.25.1

caerp_sign_pdf-2024.1.2/CURRENT_VERSION

@@ -1 +0,0 @@
-2024.1.2

caerp_sign_pdf-2024.1.2/requirements.txt

@@ -1 +0,0 @@
-pyHanko[pkcs11,image-support,opentype,xmp]==0.25.0

caerp_sign_pdf-2024.1.2/src/caerp_sign_pdf.egg-info/requires.txt

@@ -1 +0,0 @@
-pyHanko[image-support,opentype,pkcs11,xmp]==0.25.0