caerp-sign-pdf 2024.1.1__tar.gz → 2024.1.3__tar.gz

caerp_sign_pdf-2024.1.3/CURRENT_VERSION

@@ -0,0 +1 @@
+2024.1.3

{caerp_sign_pdf-2024.1.1 → caerp_sign_pdf-2024.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: caerp_sign_pdf
-Version: 2024.1.1
+Version: 2024.1.3
 Summary: caerp_sign_pdf
 Home-page: https://framagit.org/caerp/caerp_sign_pdf
 Author: Kilya

caerp_sign_pdf-2024.1.3/requirements.txt

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

{caerp_sign_pdf-2024.1.1 → caerp_sign_pdf-2024.1.3}/src/caerp_sign_pdf/public.py

@@ -4,12 +4,11 @@ import hashlib
 
 from io import BytesIO
 from pyhanko.pdf_utils.incremental_writer import IncrementalPdfFileWriter
-from pyhanko.sign import (
-    fields,
-    signers,
-)
+from pyhanko.sign import fields, signers
 from pyhanko.sign.general import SigningError
 from pyhanko.stamp import TextStampStyle
+from PyPDF4.pdf import PdfFileReader, PdfFileWriter
+from pyramid.httpexceptions import HTTPUnsupportedMediaType
 
 from caerp.views.files.controller import FileData
 
@@ -19,6 +18,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
@@ -51,6 +58,19 @@ class SignPDFService(object):
         """
         return hashlib.md5(file_data.getvalue()).hexdigest()
 
+    def _get_safe_pdf(self, file_data: BytesIO) -> str:
+        """
+        Create a new clean PDF buffer from the original
+        to avoid some format errors
+        """
+        writer = PdfFileWriter()
+        reader = PdfFileReader(file_data, strict=False)
+        num_pages = reader.getNumPages()
+        for page in range(num_pages):
+            writer.addPage(reader.getPage(page))
+        writer.write(file_data)
+        return file_data
+
     def sign(
         self, pdf_data: FileData, node_id: int = None, with_stamp: bool = False
     ) -> bool:
@@ -77,11 +97,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
@@ -97,11 +117,18 @@ in config)"
                 border_width=0,
             )
 
-        # Sign
-        w = IncrementalPdfFileWriter(pdf_data.data, strict=False)
+        # 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"Error while opening original PDF file : {error}")
+            raise HTTPUnsupportedMediaType(ERROR_PDF_FORMAT_MSG)
+
+        # 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)
                 ),
@@ -109,13 +136,19 @@ in config)"
         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)
+
+        # 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.1 → caerp_sign_pdf-2024.1.3}/src/caerp_sign_pdf.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: caerp-sign-pdf
-Version: 2024.1.1
+Version: 2024.1.3
 Summary: caerp_sign_pdf
 Home-page: https://framagit.org/caerp/caerp_sign_pdf
 Author: Kilya

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

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

caerp_sign_pdf-2024.1.1/CURRENT_VERSION

@@ -1 +0,0 @@
-2024.1.1

caerp_sign_pdf-2024.1.1/requirements.txt

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

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

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