feat(s3): Add support for path-style access in S3 configuration

Author: TheMeinerLP

README.md

@@ -22,6 +22,7 @@ This addon is particularly useful for:
 
 - Store BlueMap data in any S3-compatible storage service
 - Configure custom endpoints for self-hosted S3 solutions
+- Support for path-style access for compatibility with various S3 implementations (like MinIO)
 - Seamless integration with BlueMap's storage system
 
 ## Requirements
@@ -77,6 +78,10 @@ endpoint-url: "http://localhost:9000"
 # Optional: The root path in the S3 bucket where BlueMap data will be stored
 # Default is "." (root of the bucket)
 root-path: "."
+
+# Optional: Force path style access for S3 (needed for MinIO)
+# Default is false (use virtual-hosted style)
+force-path-style: true
 ```
 
 ### Configuration Options
@@ -91,6 +96,7 @@ root-path: "."
 | `secret-access-key` | The AWS secret access key for authentication | `bluemap-secret` |
 | `endpoint-url` | Optional: The endpoint URL for S3-compatible services (leave empty for AWS S3) | `http://localhost:9000` |
 | `root-path` | Optional: The root path in the S3 bucket where BlueMap data will be stored | `.` |
+| `force-path-style` | Optional: Force path style access for S3 (needed for MinIO) | `false` |
 
 ## Usage Examples
 
@@ -110,6 +116,7 @@ access-key-id: "AKIAIOSFODNN7EXAMPLE"
 secret-access-key: "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"
 endpoint-url: ""
 root-path: "."
+force-path-style: false
 ```
 
 ### MinIO
@@ -128,6 +135,7 @@ access-key-id: "minioadmin"
 secret-access-key: "minioadmin"
 endpoint-url: "http://minio-server:9000"
 root-path: "."
+force-path-style: true
 ```
 
 ### DigitalOcean Spaces
@@ -146,6 +154,7 @@ access-key-id: "your-spaces-key"
 secret-access-key: "your-spaces-secret"
 endpoint-url: "https://nyc3.digitaloceanspaces.com"
 root-path: "."
+force-path-style: false
 ```
 
 ## Building from Source

src/main/java/dev/themeinerlp/bluemap/s3/storage/S3Configuration.java

@@ -31,4 +31,6 @@ public sealed interface S3Configuration permits S3StorageConfiguration {
 
     String getRootPath();
 
+    boolean forcePathStyle();
+
 }

src/main/java/dev/themeinerlp/bluemap/s3/storage/S3FileSystemFactory.java

@@ -17,14 +17,14 @@
  */
 package dev.themeinerlp.bluemap.s3.storage;
 
+import software.amazon.nio.spi.s3.S3FileSystemProvider;
+import software.amazon.nio.spi.s3.S3XFileSystemProvider;
+
 import java.net.URI;
 import java.nio.file.FileSystem;
 import java.util.Objects;
-import software.amazon.nio.spi.s3.S3FileSystemProvider;
-import software.amazon.nio.spi.s3.S3XFileSystemProvider;
 
 final class S3FileSystemFactory {
-
     private static final String AWS_REGION_KEY = "aws.region";
     public static final String DEFAULT_AWS_REGION = "us-east-1";
 
@@ -43,20 +43,28 @@ public static S3Fs build(S3Configuration cfg) {
         final boolean thirdParty = cfg.getEndpointUrl() != null && !cfg.getEndpointUrl().isBlank();
         try {
             final URI uri;
+            System.setProperty(AWS_REGION_KEY, cfg.getRegion() != null ? cfg.getRegion() : DEFAULT_AWS_REGION);
+            System.setProperty("aws.accessKeyId", cfg.getAccessKeyId());
+            System.setProperty("aws.secretAccessKey", cfg.getSecretAccessKey());
             if (thirdParty) {
-                PROVIDER = new S3XFileSystemProvider();
                 var url = URI.create(cfg.getEndpointUrl());
-                System.setProperty("s3.spi.endpoint-protocol", url.toString().startsWith("https") ? "https" : "http");
-                System.setProperty(AWS_REGION_KEY, cfg.getRegion() != null ? cfg.getRegion() : DEFAULT_AWS_REGION);
+                if (!url.toString().startsWith("https")) {
+                    System.setProperty("s3.spi.endpoint-protocol", "http");
+                }
+                if (cfg.forcePathStyle()) {
+                    System.setProperty("s3.spi.force-path-style", "true");
+                }
+                PROVIDER = new S3XFileSystemProvider();
                 String userInfo = buildUserInfo(cfg);
                 uri = new URI("s3x", userInfo, url.getHost(), url.getPort(), "/" + cfg.getBucketName(), null, null);
             } else {
                 // AWS S3 – the provider uses the default region/credentials chain
                 PROVIDER = new S3FileSystemProvider();
-                System.setProperty(AWS_REGION_KEY, cfg.getRegion() != null ? cfg.getRegion() : DEFAULT_AWS_REGION);
-                String userInfo = buildUserInfo(cfg);
-                uri = new URI("s3", userInfo,"/" + cfg.getBucketName(), null, null);
+
+                uri = new URI("s3","/" + cfg.getBucketName(), null, null);
             }
+            System.out.println("Using S3 FileSystem Provider: " + PROVIDER.getClass().getName());
+            System.out.println("S3 URI: " + uri);
             FileSystem fs =  PROVIDER.getFileSystem(uri);
             return new S3Fs(fs, uri);
         } catch (Exception e) {

src/main/java/dev/themeinerlp/bluemap/s3/storage/S3Storage.java

@@ -52,6 +52,17 @@ public void initialize() throws IOException {
         try {
             S3FileSystemFactory.S3Fs handle = S3FileSystemFactory.build(configuration);
             this.s3FileSystem = handle.fileSystem();
+            if (!Files.exists(getRooPath())) {
+                Files.createDirectories(getRooPath());
+            }
+            // Preload the map storages into the cache
+            Files.list(getRooPath())
+                    .filter(Files::isDirectory)
+                    .forEach(path -> {
+                        String mapId = path.getFileName().toString();
+                        System.out.println("Loading map storage for: " + mapId);
+                        mapStorages.get(mapId); // This will create the FileMapStorage if it doesn't exist
+                    });
         } catch (Exception e) {
             throw new IOException("Failed to initialize S3 storage", e);
         }

src/main/java/dev/themeinerlp/bluemap/s3/storage/S3StorageConfiguration.java

@@ -52,6 +52,9 @@ public final class S3StorageConfiguration extends StorageConfig implements S3Con
 
     @Comment("The root path in the S3 bucket (default: empty, meaning the root of the bucket)")
     private String rootPath = ".";
+
+    @Comment("Force path style access for S3 (default: false, use virtual-hosted style)")
+    private boolean forcePathStyle = false;
 
     @Override
     public Storage createStorage() throws ConfigurationException {
@@ -112,4 +115,9 @@ public String getRootPath() {
                 .filter(path -> !path.isEmpty())
                 .orElse(".");
     }
+
+    @Override
+    public boolean forcePathStyle() {
+        return forcePathStyle;
+    }
 }