Evgeniy d/fix pdf checker (#32)

* Revert "fix (#31)"

This reverts commit cbc63da.

* add decrypted pdf to check_pdf_ok

print_service/routes/file.py

@@ -174,11 +174,9 @@ async def upload_file(
         if len(memory_file) > settings.MAX_SIZE:
             raise HTTPException(413, f'Content too large, {settings.MAX_SIZE} bytes allowed')
         await saved_file.write(memory_file)
-
-        # if not check_pdf_ok(memory_file):
-        #     await aiofiles.os.remove(path)
-        #     raise HTTPException(415, 'File corrupted')
-
+        if not check_pdf_ok(memory_file):
+            await aiofiles.os.remove(path)
+            raise HTTPException(415, 'File corrupted')
     await file.close()
 
     return {

print_service/utils/__init__.py

@@ -11,8 +11,7 @@
 from print_service.models import File
 from print_service.models import File as FileModel
 from print_service.settings import Settings, get_settings
-from PyPDF3 import PdfFileReader
-from PyPDF3.utils import PyPdfError
+from PyPDF4 import PdfFileReader
 import aiofiles
 import io
 
@@ -75,8 +74,7 @@ def get_file(dbsession, pin: str or list[str]):
 
 def check_pdf_ok(f: bytes):
     try:
-        pdf = PdfFileReader(io.BytesIO(f))
-        info = pdf.getDocumentInfo()
-        return bool(info)
-    except PyPdfError:
+        PdfFileReader(io.BytesIO(f))
+        return True
+    except Exception as e:
         return False

requirements.txt

@@ -11,4 +11,4 @@ gunicorn
 websockets
 auth_lib_profcomff[fastapi]
 redis
-PyPDF3
+PyPDF4

tests/test_routes/test_file.py

@@ -96,7 +96,6 @@ def test_file_check():
     assert check_pdf_ok(open("tests/test_routes/test_files/correct.pdf", "rb").read()) is True
 
 
-@pytest.mark.skip
 def test_upload_and_print_correct_pdf(pin_pdf, client):
     pin = pin_pdf
     fileName = 'tests/test_routes/test_files/correct.pdf'
@@ -107,7 +106,6 @@ def test_upload_and_print_correct_pdf(pin_pdf, client):
     assert res2.status_code == status.HTTP_200_OK
 
 
-@pytest.mark.skip
 def test_upload_and_print_broken_file(pin_pdf, client):
     pin = pin_pdf
     fileName = 'tests/test_routes/test_files/broken.pdf'
@@ -116,3 +114,23 @@ def test_upload_and_print_broken_file(pin_pdf, client):
     assert res.status_code == status.HTTP_415_UNSUPPORTED_MEDIA_TYPE
     res2 = client.get(f"{url}/{pin}")
     assert res2.status_code == status.HTTP_415_UNSUPPORTED_MEDIA_TYPE
+
+
+def test_upload_and_print_not_pdf_file(pin_pdf, client):
+    pin = pin_pdf
+    fileName = 'tests/test_routes/test_files/not_pdf.pdf'
+    files = {'file': (f"{fileName}", open(f"{fileName}", 'rb'), "application/pdf")}
+    res = client.post(f"{url}/{pin}", files=files)
+    assert res.status_code == status.HTTP_415_UNSUPPORTED_MEDIA_TYPE
+    res2 = client.get(f"{url}/{pin}")
+    assert res2.status_code == status.HTTP_415_UNSUPPORTED_MEDIA_TYPE
+
+
+def test_upload_and_print_encrypted_file(pin_pdf, client):
+    pin = pin_pdf
+    fileName = 'tests/test_routes/test_files/encrypted.pdf'
+    files = {'file': (f"{fileName}", open(f"{fileName}", 'rb'), "application/pdf")}
+    res = client.post(f"{url}/{pin}", files=files)
+    assert res.status_code == status.HTTP_200_OK
+    res2 = client.get(f"{url}/{pin}")
+    assert res2.status_code == status.HTTP_200_OK