Allow differentiating blob stores by buckets

Allows differentiating the backend blob stores by configured buckets.
The commit allows using the same s3proxy credentials across the
different backends and relies on the bucket names to disambiguate them.

If no buckets are configured, the prior blob store selection algorithm
is used, which returns the first configured blob store for the specified
identity.

The patch supports the glob syntax, which allows specifying groups of
buckets more easily. However, there is no checking for overlapping
globs.

Fixes: #371

Author: timuralp

src/main/java/org/gaul/s3proxy/Main.java

@@ -23,10 +23,15 @@
 import java.io.InputStream;
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.FileSystems;
+import java.nio.file.PathMatcher;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
@@ -103,6 +108,11 @@ public static void main(String[] args) throws Exception {
                 1, 20, 60 * 1000, factory);
         ImmutableMap.Builder<String, Map.Entry<String, BlobStore>> locators =
                 ImmutableMap.builder();
+        ImmutableMap.Builder<String, List<Map.Entry<PathMatcher,
+                BlobStore>>> globLocators = ImmutableMap.builder();
+        Map<String, ImmutableList.Builder<Map.Entry<PathMatcher, BlobStore>>>
+                globBuilders = new HashMap<>();
+        Set<String> parsedIdentities = new HashSet<>();
         for (File propertiesFile : options.propertiesFiles) {
             Properties properties = new Properties();
             try (InputStream is = new FileInputStream(propertiesFile)) {
@@ -117,14 +127,35 @@ public static void main(String[] args) throws Exception {
 
             String s3ProxyAuthorizationString = properties.getProperty(
                     S3ProxyConstants.PROPERTY_AUTHORIZATION);
+            ImmutableList.Builder<String> locatorBuckets =
+                    new ImmutableList.Builder<>();
+
+            String localIdentity = "";
             if (AuthenticationType.fromString(s3ProxyAuthorizationString) !=
                     AuthenticationType.NONE) {
-                String localIdentity = properties.getProperty(
+                localIdentity = properties.getProperty(
                         S3ProxyConstants.PROPERTY_IDENTITY);
                 String localCredential = properties.getProperty(
                         S3ProxyConstants.PROPERTY_CREDENTIAL);
-                locators.put(localIdentity, Maps.immutableEntry(
-                        localCredential, blobStore));
+                if (parsedIdentities.add(localIdentity)) {
+                    locators.put(localIdentity,
+                            Maps.immutableEntry(localCredential, blobStore));
+                }
+            }
+            ImmutableList.Builder<Map.Entry<PathMatcher, BlobStore>>
+                    globBuilder = globBuilders.get(localIdentity);
+            if (globBuilder == null) {
+                globBuilder = new ImmutableList.Builder<>();
+                globBuilders.put(localIdentity, globBuilder);
+            }
+            for (String key : properties.stringPropertyNames()) {
+                if (key.startsWith(S3ProxyConstants.PROPERTY_BUCKET_LOCATOR)) {
+                    locatorBuckets.add(properties.getProperty(key));
+                    globBuilder.add(Maps.immutableEntry(
+                            FileSystems.getDefault().getPathMatcher(
+                            "glob:" + properties.getProperty(key)),
+                            blobStore));
+                }
             }
 
             S3Proxy.Builder s3ProxyBuilder2 = S3Proxy.Builder
@@ -149,21 +180,51 @@ public static void main(String[] args) throws Exception {
             throw e;
         }
 
+        for (Map.Entry<String, ImmutableList.Builder<Map.Entry<PathMatcher,
+                BlobStore>>> entry : globBuilders.entrySet()) {
+            globLocators.put(entry.getKey(), entry.getValue().build());
+        }
+
         final Map<String, Map.Entry<String, BlobStore>> locator =
                 locators.build();
+        final Map<String, List<Map.Entry<PathMatcher, BlobStore>>>
+                globLocator = globLocators.build();
         if (!locator.isEmpty()) {
             s3Proxy.setBlobStoreLocator(new BlobStoreLocator() {
                 @Override
                 public Map.Entry<String, BlobStore> locateBlobStore(
                         String identity, String container, String blob) {
-                    if (identity == null) {
-                        if (locator.size() == 1) {
-                            return locator.entrySet().iterator().next()
-                                    .getValue();
+                    Map.Entry<String, BlobStore> locatorEntry =
+                            locator.get(identity);
+                    List<Map.Entry<PathMatcher, BlobStore>> globEntries =
+                            globLocator.get(identity);
+                    if (globEntries != null) {
+                        for (Map.Entry<PathMatcher, BlobStore> entry :
+                                globLocator.get(identity)) {
+                            if (entry.getKey().matches(FileSystems.getDefault()
+                                    .getPath(container))) {
+                                return Maps.immutableEntry(
+                                        locatorEntry.getKey(),
+                                        entry.getValue());
+                            }
+                        }
+                    }
+                    // Check if the anonymous access globs were configured
+                    globEntries = globLocator.get("");
+                    if (globEntries != null) {
+                        for (Map.Entry<PathMatcher,
+                                BlobStore> entry :
+                                globEntries) {
+                            if (entry.getKey().matches(FileSystems.getDefault()
+                                    .getPath(container))) {
+                                return Maps.immutableEntry(
+                                        locatorEntry.getKey(),
+                                        entry.getValue());
+                            }
                         }
-                        throw new IllegalArgumentException(
-                            "cannot use anonymous access with multiple" +
-                            " backends");
+                    }
+                    if (identity == null) {
+                        return locator.entrySet().iterator().next().getValue();
                     }
                     return locator.get(identity);
                 }

src/main/java/org/gaul/s3proxy/S3ProxyConstants.java

@@ -66,6 +66,18 @@ public final class S3ProxyConstants {
             "s3proxy.max-single-part-object-size";
     public static final String PROPERTY_V4_MAX_NON_CHUNKED_REQUEST_SIZE =
             "s3proxy.v4-max-non-chunked-request-size";
+    /** Used to locate blobstores by specified bucket names. Each property
+     * file should contain a list of buckets associated with it, e.g.
+     *     s3proxy.bucket-locator.1 = data
+     *     s3proxy.bucket-locator.2 = metadata
+     *     s3proxy.bucket-locator.3 = other
+     * When a request is made for the specified bucket, the backend defined
+     * in that properties file is used. This allows using the same
+     * credentials in multiple properties file and select the backend based
+     * on the bucket names.
+     */
+    public static final String PROPERTY_BUCKET_LOCATOR =
+            "s3proxy.bucket-locator";
     /** When true, model eventual consistency using two storage backends. */
     public static final String PROPERTY_EVENTUAL_CONSISTENCY =
             "s3proxy.eventual-consistency";