Merge pull request #60 from noobdevsam/26-optimize_docker_container

merge from branch 26 - 5

Author: noobdevsam

compose.yml

@@ -23,6 +23,7 @@ services:
         ports:
             - "8080:8080"
         mem_limit: 2g
+        user: "0:0"  # Run as root user initially
         environment:
             # Connect to the MySQL container
             - DATABASE_URL=jdbc:mysql://db-mysql:3306/stego
@@ -33,11 +34,15 @@ services:
             # Other environment variables as needed
             - JAVA_TOOL_OPTIONS=-XX:MaxRAMPercentage=75.0
         volumes:
-            # Mount the local './storage' directory into the container.
-            # This makes it easy to see generated files on your host machine.
-            - ./storage:/app/storage
+            - stego_storage:/app/storage
         command: >
-            sh -c "mkdir -p /app/storage && chown -R cnb:cnb /app/storage && java -jar /workspace/BOOT-INF/lib/spring-project-steganography-tool-v1.jar"
+            sh -c "
+            mkdir -p /app/storage &&
+            chown -R 1000:1000 /app/storage &&
+            chmod -R 755 /app/storage &&
+            cd /workspace &&
+            exec setpriv --reuid=1000 --regid=1000 --clear-groups java org.springframework.boot.loader.launch.JarLauncher
+            "
         networks:
             - stego-network
         depends_on:
@@ -50,3 +55,5 @@ networks:
 volumes:
     mysql_data:
         driver: local
+    stego_storage:
+        driver: local

src/main/java/com/example/springprojectsteganographytool/services/impl/StorageServiceImpl.java

@@ -4,6 +4,7 @@
 import com.example.springprojectsteganographytool.exceptions.data.StorageFileNotFoundException;
 import com.example.springprojectsteganographytool.exceptions.data.StorageSecurityException;
 import com.example.springprojectsteganographytool.services.StorageService;
+import jakarta.annotation.PostConstruct;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
@@ -37,8 +38,29 @@ public StorageServiceImpl(@Value("${app.storage.base-path}") Path basePath) thro
             throw new IllegalArgumentException("app.storage.base-path must not be null");
         }
 
-        log.info("Using storage base path: {}", basePath.toAbsolutePath().normalize());
         this.basePath = basePath.toAbsolutePath().normalize();
+        log.info("Storage base path configured: {}", this.basePath);
+    }
+
+    /**
+     * Post-construct initialization to ensure the storage directory exists.
+     * This method is called after dependency injection is complete and BEFORE lazy initialization.
+     */
+    @PostConstruct
+    public void init() {
+        try {
+            Files.createDirectories(this.basePath);
+            log.info("Storage directory initialized successfully: {}", this.basePath);
+
+            // Verify write permissions
+            if (!Files.isWritable(this.basePath)) {
+                log.error("Storage directory is not writable: {}", this.basePath);
+                throw new IllegalStateException("Storage directory is not writable: " + this.basePath);
+            }
+        } catch (IOException e) {
+            log.error("Failed to create storage directory: {}", this.basePath, e);
+            throw new IllegalStateException("Cannot create storage directory: " + this.basePath, e);
+        }
     }
 
     /**
@@ -56,7 +78,12 @@ public Path save(String relativeFileName, byte[] content) throws StorageSecurity
 
         try {
             var targetPath = safeResolve(relativeFileName);
-            Files.createDirectories(targetPath.getParent());
+
+            // Ensure parent directory exists (though basePath should already exist from init())
+            if (targetPath.getParent() != null && !Files.exists(targetPath.getParent())) {
+                Files.createDirectories(targetPath.getParent());
+            }
+
             Files.write(targetPath, content, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
             log.debug("Saved file: {}  ({} bytes)", targetPath, content.length);
             return targetPath;