[#2] Support AWS S3 (ACL is public)

Author: WikiDru

thumbly-http-client/src/main/java/org/code13k/thumbly/web/client/aws/AwsS3SignerV4.java

@@ -1,6 +1,7 @@
 package org.code13k.thumbly.web.client.aws;
 
 import io.vertx.core.MultiMap;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import uk.co.lucasweb.aws.v4.signer.HttpRequest;
@@ -24,6 +25,14 @@ public class AwsS3SignerV4 {
      */
     public static boolean putHeaders(MultiMap headers, String url, AwsS3SignValue awsS3SignValue) {
         try {
+            // Check
+            if(StringUtils.isEmpty(awsS3SignValue.getAccessKey())==true){
+                return true;
+            }
+            if(StringUtils.isEmpty(awsS3SignValue.getSecretKey())==true){
+                return false;
+            }
+
             // Init
             URI uri = new URI(url);
             HttpRequest request = new HttpRequest("GET", uri);

thumbly-main/src/main/java/org/code13k/thumbly/config/ChannelConfig.java

@@ -127,11 +127,7 @@ else if (type.equalsIgnoreCase(ChannelType.AWS_S3)) {
                     awsS3Info.setBucket(bucket);
 
                     // Check validation
-                    if (StringUtils.isEmpty(awsS3Info.getAccessKey()) == true) {
-                        mLogger.error("Invalid aws_s3 channel (access_key is invalid)");
-                    } else if (StringUtils.isEmpty(awsS3Info.getSecretKey()) == true) {
-                        mLogger.error("Invalid aws_s3 channel (secret_key is invalid)");
-                    } else if (StringUtils.isEmpty(awsS3Info.getRegion()) == true) {
+                    if (StringUtils.isEmpty(awsS3Info.getRegion()) == true) {
                         mLogger.error("Invalid aws_s3 channel (region is invalid)");
                     } else if (StringUtils.isEmpty(awsS3Info.getBucket()) == true) {
                         mLogger.error("Invalid aws_s3 channel (bucket is invalid)");

thumbly-main/src/main/java/org/code13k/thumbly/model/config/channel/AwsS3Info.java

@@ -8,7 +8,7 @@ public class AwsS3Info extends ChannelInfo {
 
     @Override
     public String getBaseUrl() {
-        return "https://s3." + region + ".amazonaws.com";
+        return "https://s3." + region + ".amazonaws.com/" + bucket;
     }
 
     public String getAccessKey() {

thumbly-main/src/main/java/org/code13k/thumbly/service/main/MainHttpServer.java

@@ -278,11 +278,16 @@ private void handler(RoutingContext routingContext,
             AwsS3SignValue awsS3SignValue = null;
             if (channelInfo.getType() == ChannelConfig.ChannelType.AWS_S3) {
                 AwsS3Info awsS3Info = (AwsS3Info) channelInfo;
-                awsS3SignValue = new AwsS3SignValue();
-                awsS3SignValue.setAccessKey(awsS3Info.getAccessKey());
-                awsS3SignValue.setSecretKey(awsS3Info.getSecretKey());
-                awsS3SignValue.setRegion(awsS3Info.getRegion());
+                if (StringUtils.isEmpty(awsS3Info.getAccessKey()) == false) {
+                    if (StringUtils.isEmpty(awsS3Info.getSecretKey()) == false) {
+                        awsS3SignValue = new AwsS3SignValue();
+                        awsS3SignValue.setAccessKey(awsS3Info.getAccessKey());
+                        awsS3SignValue.setSecretKey(awsS3Info.getSecretKey());
+                        awsS3SignValue.setRegion(awsS3Info.getRegion());
+                    }
+                }
             }
+            mLogger.trace("awsS3SignValue = " + awsS3SignValue);
 
             /**
              * Get origin file