Merge branch 'main' into main

build.gradle

@@ -13,7 +13,7 @@ plugins {
 import com.github.jk1.license.render.*
 
 ext {
-    springBootVersion = "3.3.3"
+    springBootVersion = "3.3.4"
     pdfboxVersion = "3.0.3"
     logbackVersion = "1.5.7"
     imageioVersion = "3.11.0"
@@ -162,7 +162,7 @@ dependencies {
     runtimeOnly "com.twelvemonkeys.imageio:imageio-webp:$imageioVersion"
     // runtimeOnly "com.twelvemonkeys.imageio:imageio-xwd:$imageioVersion"
 
-    implementation "commons-io:commons-io:2.16.1"
+    implementation "commons-io:commons-io:2.17.0"
     implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0"
     //general PDF
 

src/main/java/stirling/software/SPDF/controller/api/SplitPdfByChaptersController.java

@@ -67,15 +67,6 @@ public ResponseEntity<byte[]> splitPdf(@ModelAttribute SplitPdfByChaptersRequest
         }
         PDDocument sourceDocument = Loader.loadPDF(file.getBytes());
 
-        // checks if the document is encrypted by an empty user password
-        if (sourceDocument.isEncrypted()) {
-            try {
-                sourceDocument.setAllSecurityToBeRemoved(true);
-                logger.info("Removing security from the source document ");
-            } catch (Exception e) {
-                logger.warn("Cannot decrypt the pdf");
-            }
-        }
         PDDocumentOutline outline = sourceDocument.getDocumentCatalog().getDocumentOutline();
 
         if (outline == null) {

src/main/java/stirling/software/SPDF/service/CustomPDDocumentFactory.java

@@ -7,6 +7,8 @@
 
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
@@ -18,6 +20,8 @@
 @Component
 public class CustomPDDocumentFactory {
 
+    private static final Logger logger = LoggerFactory.getLogger(CustomPDDocumentFactory.class);
+
     private final PdfMetadataService pdfMetadataService;
 
     @Autowired
@@ -71,6 +75,7 @@ public PDDocument load(InputStream input) throws IOException {
     public PDDocument load(byte[] input) throws IOException {
         PDDocument document = Loader.loadPDF(input);
         pdfMetadataService.setDefaultMetadata(document);
+        removezeropassword(document);
         return document;
     }
 
@@ -96,5 +101,17 @@ private PDDocument load(byte[] bytes, String password) throws IOException {
         return document;
     }
 
+    private PDDocument removezeropassword(PDDocument document) throws IOException {
+        if (document.isEncrypted()) {
+            try {
+                logger.info("Removing security from the source document");
+                document.setAllSecurityToBeRemoved(true);
+            } catch (Exception e) {
+                logger.warn("Cannot decrypt the pdf");
+            }
+        }
+        return document;
+    }
+
     // Add other load methods as needed, following the same pattern
 }