Custom uid (#883)

* init

* user and pass to just pass lang update

* session management fixes and avoid demo user locking

* fix for UMASK and extract cleanups

Dockerfile

@@ -15,7 +15,10 @@ ARG VERSION_TAG
 ENV DOCKER_ENABLE_SECURITY=false \
     VERSION_TAG=$VERSION_TAG \
     JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS -XX:MaxRAMPercentage=75" \
-	HOME=/home/stirlingpdfuser
+	HOME=/home/stirlingpdfuser \
+	PUID=1000 \
+    PGID=1000 \
+    UMASK=022
 
 
 # JDK for app

Dockerfile-lite

@@ -7,7 +7,10 @@ ARG VERSION_TAG
 ENV DOCKER_ENABLE_SECURITY=false \
     HOME=/home/stirlingpdfuser \
     VERSION_TAG=$VERSION_TAG \
-    JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS -XX:MaxRAMPercentage=75"
+    JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS -XX:MaxRAMPercentage=75" \
+	PUID=1000 \
+    PGID=1000 \
+    UMASK=022
 
 # Copy necessary files
 COPY scripts/download-security-jar.sh /scripts/download-security-jar.sh

Dockerfile-ultra-lite

@@ -7,10 +7,10 @@ ARG VERSION_TAG
 ENV DOCKER_ENABLE_SECURITY=false \
     HOME=/home/stirlingpdfuser \
     VERSION_TAG=$VERSION_TAG \
-    JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS -XX:MaxRAMPercentage=75"
+    JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS -XX:MaxRAMPercentage=75" \
-#   PUID=1000 \
+	PUID=1000 \
-#   PGID=1000 \
+    PGID=1000 \
-#   UMASK=022 \
+    UMASK=022
 
 # Copy necessary files
 COPY scripts/download-security-jar.sh /scripts/download-security-jar.sh

scripts/init-without-ocr.sh

@@ -1,5 +1,15 @@
 #!/bin/sh
 
+# Update the user and group IDs as per environment variables
+if [ ! -z "$PUID" ] && [ "$PUID" != "$(id -u stirlingpdfuser)" ]; then
+    usermod -o -u "$PUID" stirlingpdfuser
+fi
+
+if [ ! -z "$PGID" ] && [ "$PGID" != "$(id -g stirlingpdfgroup)" ]; then
+    groupmod -o -g "$PGID" stirlingpdfgroup
+fi
+umask "$UMASK"
+
 echo "Setting permissions and ownership for necessary directories..."
 chown -R stirlingpdfuser:stirlingpdfgroup /logs /scripts /usr/share/fonts/opentype/noto /usr/share/tessdata /configs /customFiles
 chmod -R 755 /logs /scripts /usr/share/fonts/opentype/noto /usr/share/tessdata /configs /customFiles

scripts/init.sh

@@ -13,6 +13,17 @@ if [ -d /usr/share/tesseract-ocr/5/tessdata ]; then
         cp -r /usr/share/tesseract-ocr/5/tessdata/* /usr/share/tessdata || true;
 fi
 
+
+# Update the user and group IDs as per environment variables
+if [ ! -z "$PUID" ] && [ "$PUID" != "$(id -u stirlingpdfuser)" ]; then
+    usermod -o -u "$PUID" stirlingpdfuser
+fi
+
+if [ ! -z "$PGID" ] && [ "$PGID" != "$(id -g stirlingpdfgroup)" ]; then
+    groupmod -o -g "$PGID" stirlingpdfgroup
+fi
+umask "$UMASK"
+
 echo "Setting permissions and ownership for necessary directories..."
 chown -R stirlingpdfuser:stirlingpdfgroup /logs /scripts /usr/share/fonts/opentype/noto /usr/share/tessdata /configs /customFiles
 chmod -R 755 /logs /scripts /usr/share/fonts/opentype/noto /usr/share/tessdata /configs /customFiles

src/main/java/stirling/software/SPDF/config/security/CustomAuthenticationFailureHandler.java

@@ -60,5 +60,6 @@ public class CustomAuthenticationFailureHandler extends SimpleUrlAuthenticationF
         return user.isPresent()
                 && user.get().getAuthorities().stream()
                         .anyMatch(authority -> "ROLE_DEMO_USER".equals(authority.getAuthority()));
+
     }
 }

src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImageScansController.java

@@ -73,6 +73,12 @@ public class ExtractImageScansController {
 
         List<String> images = new ArrayList<>();
         
+        List<Path> tempImageFiles = new ArrayList<>();
+        Path tempInputFile = null;
+        Path tempZipFile = null;
+        List<Path> tempDirs = new ArrayList<>();
+        
+        try {
 	        // Check if input file is a PDF
 	        if ("pdf".equalsIgnoreCase(extension)) {
 	            // Load PDF document
@@ -92,10 +98,11 @@ public class ExtractImageScansController {
 	
 	                    // Add temp file path to images list
 	                    images.add(tempFile.toString());
+	                    tempImageFiles.add(tempFile);
 	                }
 	            }
 	        } else {
-            Path tempInputFile = Files.createTempFile("input_", "." + extension);
+	            tempInputFile = Files.createTempFile("input_", "." + extension);
 	            Files.copy(
 	                    form.getFileInput().getInputStream(),
 	                    tempInputFile,
@@ -110,6 +117,7 @@ public class ExtractImageScansController {
 	        for (int i = 0; i < images.size(); i++) {
 	
 	            Path tempDir = Files.createTempDirectory("openCV_output");
+	            tempDirs.add(tempDir);
 	            List<String> command =
 	                    new ArrayList<>(
 	                            Arrays.asList(
@@ -146,7 +154,7 @@ public class ExtractImageScansController {
 	        // Create zip file if multiple images
 	        if (processedImageBytes.size() > 1) {
 	            String outputZipFilename = fileName.replaceFirst("[.][^.]+$", "") + "_processed.zip";
-            Path tempZipFile = Files.createTempFile("output_", ".zip");
+	            tempZipFile = Files.createTempFile("output_", ".zip");
 	
 	            try (ZipOutputStream zipOut =
 	                    new ZipOutputStream(new FileOutputStream(tempZipFile.toFile()))) {
@@ -179,5 +187,31 @@ public class ExtractImageScansController {
 	                    fileName.replaceFirst("[.][^.]+$", "") + ".png",
 	                    MediaType.IMAGE_PNG);
 	        }
+        } finally {
+        	// Cleanup logic for all temporary files and directories
+            tempImageFiles.forEach(path -> {
+                try {
+                    Files.deleteIfExists(path);
+                } catch (IOException e) {
+                    logger.error("Failed to delete temporary image file: " + path, e);
+                }
+            });
+
+            if (tempZipFile != null && Files.exists(tempZipFile)) {
+                try {
+                    Files.delete(tempZipFile);
+                } catch (IOException e) {
+                    logger.error("Failed to delete temporary zip file: " + tempZipFile, e);
+                }
+            }
+
+            tempDirs.forEach(dir -> {
+                try {
+                    FileUtils.deleteDirectory(dir.toFile());
+                } catch (IOException e) {
+                    logger.error("Failed to delete temporary directory: " + dir, e);
+                }
+            });
+        }
     }
 }