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

caerp_sign_pdf-2024.2.1/CURRENT_VERSION

@@ -0,0 +1 @@
+2024.2.1

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

@@ -1,12 +1,13 @@
 Metadata-Version: 2.1
 Name: caerp_sign_pdf
-Version: 2024.1.4
+Version: 2024.2.1
 Summary: caerp_sign_pdf
 Home-page: https://framagit.org/caerp/caerp_sign_pdf
 Author: Kilya
 Author-email: contact@kilya.net
 License: GPLv3
 Keywords: web wsgi bfg pylons pyramid caerp
+Platform: UNKNOWN
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Programming Language :: Python
 Classifier: Framework :: Pyramid
@@ -14,7 +15,6 @@ 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
 ======================================================
@@ -70,3 +70,5 @@ Sous linux la signature d'un document PDF peut être vérifiée facilement en li
 
    pdfsig <monfichierpdf.pdf>
 
+
+

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

@@ -1,14 +1,13 @@
 # -*- coding: utf-8 -*-
 import logging
 import hashlib
+import subprocess
 
 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
 from pyramid.httpexceptions import HTTPUnsupportedMediaType
 
 from caerp.views.files.controller import FileData
@@ -28,6 +27,10 @@ nouveau fichier PDF avant de le recharger."
 
 
 class SignPDFService(object):
+    """
+    The PDF digital signing service
+    """
+
     def __init__(self, context, request):
         self.context = context
         self.request = request
@@ -59,18 +62,44 @@ class SignPDFService(object):
         """
         return hashlib.md5(file_data.getvalue()).hexdigest()
 
-    def _get_safe_pdf(self, file_data: BytesIO) -> str:
+    def _get_clean_pdf(self, file_data: BytesIO) -> BytesIO:
         """
-        Create a new clean PDF buffer from the original
-        to avoid some format errors
+        Create a new clean PDF buffer from the original to avoid 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
+        logger.info(f"Cleaning PDF buffer...")
+        file_data.seek(0)
+        process = subprocess.Popen(
+            ["/usr/bin/pdftocairo", "-pdf", "-", "-"],
+            stdin=subprocess.PIPE,
+            stdout=subprocess.PIPE,
+        )
+        output = process.communicate(input=file_data.read())[0]
+        result = BytesIO()
+        result.write(output)
+        result.seek(0)
+        return result
+
+    def _get_pdf_stamp(self, display_stamp: bool) -> TextStampStyle:
+        """
+        Prepare physical stamp to apply on the PDF
+
+        :param bool display_stamp: Whether the stamp must be visible or not
+
+        :return TextStampStyle: The stamp object
+        """
+        stamp = None
+        if display_stamp:
+            stamp = TextStampStyle(
+                timestamp_format="%d/%m/%Y %H:%M:%S %Z",
+                stamp_text="Signé par: %(signer)s\nLe: %(ts)s",
+                border_width=2,
+            )
+        else:
+            stamp = TextStampStyle(
+                stamp_text="",
+                border_width=0,
+            )
+        return stamp
 
     def sign(
         self, pdf_data: FileData, node_id: int = None, with_stamp: bool = False
@@ -81,7 +110,8 @@ class SignPDFService(object):
 
         :param FileData pdf_data: The FileData object describing the PDF file
         :param int node_id: The related node's id if relevant
-        :param bool with_stamp: whether we want a stamp on result file or not
+        :param bool with_stamp: Whether we want a printed stamp on result file or not
+
         :return bool: either the PDF has been signed or not
         """
 
@@ -89,7 +119,7 @@ class SignPDFService(object):
 
         # Check mimetype
         if not pdf_data.mimetype == "application/pdf":
-            logger.warn("File is not a PDF, signing aborted")
+            logger.warning("File is not a PDF, signing aborted")
             return False
 
         # Load sign certificate
@@ -104,26 +134,18 @@ class SignPDFService(object):
             )
             raise Exception(ERROR_LOAD_CERTIFICATE_MSG)
 
-        # Prepare stamp (if needed)
-        stamp = None
-        if with_stamp:
-            stamp = TextStampStyle(
-                timestamp_format="%d/%m/%Y %H:%M:%S %Z",
-                stamp_text="Signé par: %(signer)s\nLe: %(ts)s",
-                border_width=2,
-            )
-        else:
-            stamp = TextStampStyle(
-                stamp_text="",
-                border_width=0,
-            )
+        # Clean PDF
+        try:
+            pdf_data.data = self._get_clean_pdf(pdf_data.data)
+        except Exception as error:
+            logger.error(f"Error while cleaning original PDF file : {error}")
+            raise HTTPUnsupportedMediaType(ERROR_PDF_FORMAT_MSG)
 
-        # Open original PDF
+        # Open 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}")
+            logger.error(f"Error while opening PDF file : {error}")
             raise HTTPUnsupportedMediaType(ERROR_PDF_FORMAT_MSG)
 
         # Add signature field on the PDF
@@ -135,10 +157,10 @@ class SignPDFService(object):
                 ),
             )
         except SigningError:
-            logger.warn("File is already signed, nothing to do")
+            logger.warning("File is already signed, nothing to do")
             return True
-        except ObjectHeaderReadError as error:
-            logger.error(f"Error while reading Xref header : {error}")
+        except Exception as error:
+            logger.error(f"Error while adding signature field : {error}")
             raise HTTPUnsupportedMediaType(ERROR_PDF_FORMAT_MSG)
 
         # Sign PDF
@@ -147,12 +169,14 @@ class SignPDFService(object):
             pdf_signer = signers.PdfSigner(
                 meta,
                 signer=signer,
-                stamp_style=stamp,
+                stamp_style=self._get_pdf_stamp(with_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)
+
+        # Success
         logger.info(
             "File '{}' signed successfully by {} !".format(
                 pdf_data.name, signer.subject_name

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

@@ -1,12 +1,13 @@
 Metadata-Version: 2.1
-Name: caerp_sign_pdf
-Version: 2024.1.4
+Name: caerp-sign-pdf
+Version: 2024.2.1
 Summary: caerp_sign_pdf
 Home-page: https://framagit.org/caerp/caerp_sign_pdf
 Author: Kilya
 Author-email: contact@kilya.net
 License: GPLv3
 Keywords: web wsgi bfg pylons pyramid caerp
+Platform: UNKNOWN
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Programming Language :: Python
 Classifier: Framework :: Pyramid
@@ -14,7 +15,6 @@ 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
 ======================================================
@@ -70,3 +70,5 @@ Sous linux la signature d'un document PDF peut être vérifiée facilement en li
 
    pdfsig <monfichierpdf.pdf>
 
+
+

caerp_sign_pdf-2024.1.4/CURRENT_VERSION

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