From b1b9e500a771098d3ea07f626fdb9ff8755d425d Mon Sep 17 00:00:00 2001
From: Abin Antony <abin.antony@aot-technologies.com>
Date: Wed, 4 Sep 2024 16:55:32 -0700
Subject: [PATCH 1/2] #FOIMOD-3439 Zipperservice update removing sensitive
 content

---
 .gitignore                                    |   2 ++
 .../ZippingServices/requirements.txt          | Bin 760 -> 790 bytes
 .../ZippingServices/services/zipperservice.py |  27 +++++++++++++++++-
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 3e5f06c34..f9395bcd2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -100,3 +100,5 @@ bld/
 MCS.FOI.S3FileConversion/MCS.FOI.S3FileConversion/QtBinariesWindows/
 computingservices/ZippingServices/env/*
 openshift/templates/zippingservice/zipper.env
+*.locenv
+
diff --git a/computingservices/ZippingServices/requirements.txt b/computingservices/ZippingServices/requirements.txt
index 6e93668753e3922077ce2411f35c45e150eb823a..a08f010df70dbc95af321746348195b932952cee 100644
GIT binary patch
delta 38
pcmeytI*o0^4<<QY1}=sGhDsoIVQ^zGVz325V+K7210XhJ006B22DktK

delta 7
OcmbQn_Jei94<-N&GXq2b

diff --git a/computingservices/ZippingServices/services/zipperservice.py b/computingservices/ZippingServices/services/zipperservice.py
index dddcc827d..8e98ff311 100644
--- a/computingservices/ZippingServices/services/zipperservice.py
+++ b/computingservices/ZippingServices/services/zipperservice.py
@@ -14,6 +14,7 @@
 from .notificationservice import notificationservice
 import json
 import traceback
+import PyPDF2
 
 
 def processmessage(message):
@@ -110,8 +111,16 @@ def __zipfilesandupload(_message, s3credentials):
                 for fileobj in _jsonfiles:
                     filename = fileobj["filename"]
                     print("\nfilename:",filename)
+
+                    _docbytes = __getdocumentbytearray(fileobj, s3credentials)
+                    _formattedbytes = None
+                    if(filename == "{0}.pdf".format(_message.requestnumber)):
+                        try:                           
+                            _formattedbytes = __removesensitivecontent(_docbytes)                           
+                        except Exception:
+                            print(traceback.format_exc())
                     zip.writestr(
-                        filename, __getdocumentbytearray(fileobj, s3credentials)
+                        filename, _docbytes if _formattedbytes is None else _formattedbytes
                     )
                     
             tp.seek(0)           
@@ -136,6 +145,22 @@ def __zipfilesandupload(_message, s3credentials):
     finally:
         zipped_bytes = None
 
+def __removesensitivecontent(documentbytes):
+    # clear metadata
+    reader2 = PyPDF2.PdfReader(BytesIO(documentbytes))
+    # Check if metadata exists.
+    if reader2.metadata is not None:
+        # Create a new PDF file without metadata.
+        writer = PyPDF2.PdfWriter()
+        # Copy pages from the original PDF to the new PDF.
+        for page_num in range(len(reader2.pages)):
+            page = reader2.pages[page_num]                
+            writer.add_page(page)        
+        #writer.remove_links() # to remove comments.
+        buffer = BytesIO()
+        writer.write(buffer)
+        return buffer.getvalue()
+
 
 def __getzipfilepath(foldername, filename):
     return (

From aa3ad6ad6ce8ec28c1badaf2e3d13de16355180f Mon Sep 17 00:00:00 2001
From: Abin Antony <abin.antony@aot-technologies.com>
Date: Thu, 5 Sep 2024 13:22:31 -0700
Subject: [PATCH 2/2] #FOIMOD-3429 - Removing sensitive info from REDLINE
 packages as well.

---
 .../ZippingServices/services/zipperservice.py          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/computingservices/ZippingServices/services/zipperservice.py b/computingservices/ZippingServices/services/zipperservice.py
index 8e98ff311..5c343244e 100644
--- a/computingservices/ZippingServices/services/zipperservice.py
+++ b/computingservices/ZippingServices/services/zipperservice.py
@@ -114,11 +114,11 @@ def __zipfilesandupload(_message, s3credentials):
 
                     _docbytes = __getdocumentbytearray(fileobj, s3credentials)
                     _formattedbytes = None
-                    if(filename == "{0}.pdf".format(_message.requestnumber)):
-                        try:                           
-                            _formattedbytes = __removesensitivecontent(_docbytes)                           
-                        except Exception:
-                            print(traceback.format_exc())
+                    
+                    try:                           
+                        _formattedbytes = __removesensitivecontent(_docbytes)                           
+                    except Exception:
+                        print(traceback.format_exc())
                     zip.writestr(
                         filename, _docbytes if _formattedbytes is None else _formattedbytes
                     )