Merge pull request #175 from zzq996/master

Version 3.25.4
New features:

支持设置okhttp的callTimeout
支持crr配置中的DeleteData
支持自定义域名相关配置
Resolved issues:
优化了校验ContentType的逻辑

Author: zzq996

README-Android.md

@@ -1,3 +1,11 @@
+Version 3.25.4
+New features:
+1. Added logic to set okhttp callTimeout
+2. Added DeleteData of crr configuration
+3. Added custom domain configuration
+Resolved issues:
+1. Optimised logic of verifying ContentType
+-----------------------------------------------------------------------------------
 Version 3.24.12
 New features:
 1. Added bpa feature

README-Java.md

@@ -1,3 +1,11 @@
+Version 3.25.4
+New features:
+1. Added logic to set okhttp callTimeout
+2. Added DeleteData of crr configuration
+3. Added custom domain configuration
+Resolved issues:
+1. Optimised logic of verifying ContentType
+-----------------------------------------------------------------------------------
 Version 3.24.12
 New features:
 1. Added bpa feature

README.MD

@@ -1,3 +1,11 @@
+Version 3.25.4
+New features:
+1. Added logic to set okhttp callTimeout
+2. Added DeleteData of crr configuration
+3. Added custom domain configuration
+Resolved issues:
+1. Optimised logic of verifying ContentType
+-----------------------------------------------------------------------------------
 Version 3.24.12
 New features:
 1. Added bpa feature

README_CN.MD

@@ -1,3 +1,11 @@
+Version 3.25.4
+New features:
+1. 支持设置okhttp的callTimeout
+2. 支持crr配置中的DeleteData
+3. 支持自定义域名相关配置
+Resolved issues:
+1. 优化了校验ContentType的逻辑
+-----------------------------------------------------------------------------------
 Version 3.24.12
 New features:
 1. 支持bpa特性

app/src/main/java/com/obs/services/AbstractBucketClient.java

@@ -36,6 +36,7 @@
 import com.obs.services.model.CreateBucketRequest;
 import com.obs.services.model.CreateVirtualBucketRequest;
 import com.obs.services.model.CreateVirtualBucketResult;
+import com.obs.services.model.CustomDomainCertificateConfig;
 import com.obs.services.model.DeleteBucketCustomDomainRequest;
 import com.obs.services.model.GetBucketCustomDomainRequest;
 import com.obs.services.model.HeaderResponse;
@@ -60,6 +61,7 @@
 import com.obs.services.model.inventory.GetInventoryConfigurationResult;
 import com.obs.services.model.inventory.ListInventoryConfigurationResult;
 
+
 public abstract class AbstractBucketClient extends AbstractDeprecatedBucketClient {
     /*
      * (non-Javadoc)
@@ -908,12 +910,14 @@ public BucketCustomDomainInfo action() throws ServiceException {
     public HeaderResponse setBucketCustomDomain(String bucketName, String domainName) throws ObsException {
         return setBucketCustomDomain(new SetBucketCustomDomainRequest(bucketName, domainName));
     }
-    
+
     @Override
     public HeaderResponse setBucketCustomDomain(SetBucketCustomDomainRequest request) throws ObsException {
-        ServiceUtils.assertParameterNotNull(request, "request is null");
-        ServiceUtils.assertParameterNotNull(request.getBucketName(), "bucketName is null");
-        ServiceUtils.assertParameterNotNull2(request.getDomainName(), "domainName is null");
+        ServiceUtils.assertParameterNotNull(request, "Request is null");
+        ServiceUtils.assertParameterNotNull(request.getBucketName(), "Bucket name is null");
+        ServiceUtils.assertParameterNotNull2(request.getDomainName(), "Domain name is null");
+
+        CustomDomainCertificateConfig.checkCertificateConfig(request.getCustomDomainCertificateConfig());
 
         return this.doActionWithResult("setBucketCustomDomain", request.getBucketName(),
                 new ActionCallbackWithResult<HeaderResponse>() {

app/src/main/java/com/obs/services/ObsConfiguration.java

@@ -112,6 +112,8 @@ public class ObsConfiguration implements Cloneable {
 
     private SSLContext sslContext;
 
+    private int callTimeout;
+
     /**
      * Constructor
      */
@@ -148,6 +150,7 @@ public ObsConfiguration() {
         this.secureRandom = new SecureRandom();
         this.localTimeUtil = new LocalTimeUtil();
         this.sslContext = null;
+        this.callTimeout = ObsConstraint.HTTP_CALL_TIMEOUT_VALUE;
     }
 
     public String getDelimiter() {
@@ -973,5 +976,12 @@ public void setSslContext(SSLContext sslContext) {
         this.sslContext = sslContext;
     }
 
+    public int getCallTimeout() {
+        return callTimeout;
+    }
+
+    public void setCallTimeout(int callTimeout) {
+        this.callTimeout = callTimeout;
+    }
 
 }

app/src/main/java/com/obs/services/internal/Constants.java

@@ -26,6 +26,7 @@
 import java.util.TimeZone;
 
 import com.obs.services.internal.utils.AbstractAuthentication;
+import com.obs.services.internal.utils.Mimetypes;
 import com.obs.services.internal.utils.ObsAuthentication;
 import com.obs.services.internal.utils.V2Authentication;
 import com.obs.services.model.AuthTypeEnum;
@@ -142,6 +143,23 @@ public static class ObsRequestParams {
         public static final String READAHEAD = "readAhead";
         public static final String X_CACHE_CONTROL = "x-cache-control";
         public static final String TASKID = "taskID";
+
+    }
+
+    public static class ObsBucketReplicationRequestParams {
+        public static final String REPLICATION_CONFIGURATION = "ReplicationConfiguration";
+        public static final String RULE = "Rule";
+
+        public static final String ID = "ID";
+        public static final String HISTORICAL_OBJECT_REPLICATION = "HistoricalObjectReplication";
+        public static final String DESTINATION = "Destination";
+        public static final String STORAGE_CLASS = "StorageClass";
+        public static final String DELETE_DATA = "DeleteData";
+        public static final String STATUS = "Status";
+        public static final String BUCKET = "Bucket";
+        public static final String AGENCY = "Agency";
+        public static final String PREFIX = "Prefix";
+
     }
 
     public static final Map<AuthTypeEnum, IHeaders> HEADERS_MAP;
@@ -221,7 +239,7 @@ public static class ObsRequestParams {
 
     public static final TimeZone GMT_TIMEZONE = TimeZone.getTimeZone("GMT");
 
-    public static final String OBS_SDK_VERSION = "3.24.12";
+    public static final String OBS_SDK_VERSION = "3.25.4";
 
     public static final String USER_AGENT_VALUE = "obs-sdk-java/" + Constants.OBS_SDK_VERSION;
 
@@ -272,13 +290,24 @@ public static class ObsRequestParams {
 
     public static final String CONTENT_SHA256 = "content-sha256";
 
+    public static final String HTTPS_PREFIX = "https://";
+
     public static final long MAX_PART_SIZE = 5 * 1024 * 1024 * 1024L;
 
+    public static final int KB_CONVERSION_FACTOR = 1024;
+
     public static final long MIN_PART_SIZE = 100 * 1024L;
     public static final String REQUEST_TIME_TOO_SKEWED_CODE = "RequestTimeTooSkewed";
     public static final String ERROR_CODE_HEADER_OBS = "x-obs-error-code";
     public static final String ERROR_CODE_HEADER_AMZ = "x-amz-error-code";
 
+    public static final List<String> ALLOWED_RESPONSE_HTTP_CONTENT_TYPES_FOR_XML = Collections.unmodifiableList(
+        Arrays.asList(
+        Mimetypes.MIMETYPE_XML,
+        Mimetypes.MIMETYPE_TEXT_XML,
+        Mimetypes.MIMETYPE_XML_WITH_CHAR_SET_UTF8
+    ));
+
     public static final List<String> ALLOWED_RESPONSE_HTTP_HEADER_METADATA_NAMES = Collections.unmodifiableList(
             Arrays.asList("content-type", "content-md5", "content-length", "content-language", "expires", "origin",
                     "cache-control", "content-disposition", "content-encoding", "x-default-storage-class", "location",

app/src/main/java/com/obs/services/internal/ObsConstraint.java

@@ -58,6 +58,11 @@ public class ObsConstraint {
      */
     public static final String HTTP_CONNECT_TIMEOUT = "httpclient.connection-timeout-ms";
 
+    /**
+     * 整个http请求的超时时间
+     */
+    public static final String HTTP_CALL_TIMEOUT = "httpclient.call-timeout-ms";
+
     /**
      * SOCKET的超时时间
      */
@@ -71,6 +76,8 @@ public class ObsConstraint {
 
     public static final int HTTP_CONNECT_TIMEOUT_VALUE = 20000;
 
+    public static final int HTTP_CALL_TIMEOUT_VALUE = 0;
+
     public static final int HTTP_MAX_CONNECT_VALUE = 1000;
 
     public static final int HTTP_RETRY_MAX_VALUE = 3;
@@ -85,6 +92,8 @@ public class ObsConstraint {
 
     public static final int DEFAULT_CHUNK_SIZE = 4096;
 
+    public static final double KB_PER_MB = 1024.0;
+
     public static final String DEFAULT_BUCKET_LOCATION_VALUE = "region";
 
 //    public static final int DEFAULT_BUFFER_STREAM = 512 * 1024;// 512KB
@@ -165,4 +174,26 @@ public class ObsConstraint {
 
     public static final String OBS_XML_DOC_BUILDER_FACTORY_CLASS = 
             "com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl";
+
+    public static final String CUSTOM_DOMAIN_CERTIFICATE_CONFIG = "CustomDomainConfiguration";
+    public static final String CERTIFICATE_NAME = "Name";
+    public static final String CERTIFICATE_ID = "CertificateId";
+    public static final String CERTIFICATE = "Certificate";
+    public static final String CERTIFICATE_CHAIN = "CertificateChain";
+    public static final String CERTIFICATE_PRIVATE_KEY = "PrivateKey";
+    public static class ObsBucketXMLElements {
+        public static final String CREATE_TIME = "CreateTime";
+        public static final String DOMAINS = "Domains";
+    }
+
+    /**
+     * Constants for CustomDomainCertificateConfig validation
+     */
+    public static final int CUSTOM_DOMAIN_NAME_MIN_LENGTH = 3;
+    public static final int CUSTOM_DOMAIN_NAME_MAX_LENGTH = 63;
+    public static final int CUSTOM_DOMAIN_MAX_SIZE_KB = 40;
+    public static final int CUSTOM_DOMAIN_CERTIFICATE_ID_MIN_LENGTH = 16;
+    public static final int CUSTOM_DOMAIN_CERTIFICATE_ID_MAX_LENGTH = 16;
+    public static final int CUSTOM_DOMAIN_CERTIFICATE_MAX_XML_BODY_SIZE_BY_KB = 40;
+
 }

app/src/main/java/com/obs/services/internal/ObsConvertor.java

@@ -227,27 +227,31 @@ public String transBucketNotificationConfiguration(BucketNotificationConfigurati
     public String transReplicationConfiguration(ReplicationConfiguration replicationConfiguration)
             throws ServiceException {
         try {
-            OBSXMLBuilder builder = OBSXMLBuilder.create("ReplicationConfiguration").e("Agency")
+            OBSXMLBuilder builder = OBSXMLBuilder.create(Constants.ObsBucketReplicationRequestParams.REPLICATION_CONFIGURATION).e(Constants.ObsBucketReplicationRequestParams.AGENCY)
                     .t(ServiceUtils.toValid(replicationConfiguration.getAgency())).up();
             for (ReplicationConfiguration.Rule rule : replicationConfiguration.getRules()) {
-                builder = builder.e("Rule");
+                builder = builder.e(Constants.ObsBucketReplicationRequestParams.RULE);
                 if (rule.getId() != null) {
-                    builder.e("ID").t(rule.getId());
+                    builder.e(Constants.ObsBucketReplicationRequestParams.ID).t(rule.getId());
                 }
-                builder.e("Prefix").t(ServiceUtils.toValid(rule.getPrefix()));
+                builder.e(Constants.ObsBucketReplicationRequestParams.PREFIX).t(ServiceUtils.toValid(rule.getPrefix()));
                 if (rule.getStatus() != null) {
-                    builder.e("Status").t(rule.getStatus().getCode());
+                    builder.e(Constants.ObsBucketReplicationRequestParams.STATUS).t(rule.getStatus().getCode());
                 }
                 if (rule.getHistoricalObjectReplication() != null) {
-                    builder.e("HistoricalObjectReplication").t(rule.getHistoricalObjectReplication().getCode());
+                    builder.e(Constants.ObsBucketReplicationRequestParams.HISTORICAL_OBJECT_REPLICATION).t(rule.getHistoricalObjectReplication().getCode());
                 }
                 if (rule.getDestination() != null) {
                     String bucketName = ServiceUtils.toValid(rule.getDestination().getBucket());
-                    builder = builder.e("Destination").e("Bucket").t(bucketName).up();
+                    builder = builder.e(Constants.ObsBucketReplicationRequestParams.DESTINATION).e(Constants.ObsBucketReplicationRequestParams.BUCKET).t(bucketName).up();
                     if (rule.getDestination().getObjectStorageClass() != null) {
-                        builder.e("StorageClass")
+                        builder.e(Constants.ObsBucketReplicationRequestParams.STORAGE_CLASS)
                                 .t(this.transStorageClass(rule.getDestination().getObjectStorageClass()));
                     }
+                    if (rule.getDestination().getDeleteData() != null) {
+                        builder.e(Constants.ObsBucketReplicationRequestParams.DELETE_DATA)
+                                .t(rule.getDestination().getDeleteData().getCode());
+                    }
                     builder = builder.up();
                 }
                 builder = builder.up();

app/src/main/java/com/obs/services/internal/RestStorageService.java

@@ -412,6 +412,11 @@ protected Response performRequest(NewTransResult result, boolean needSignature,
             result.getUserHeaders().forEach(builder::addHeader);
         }
         Request request = builder.build();
+        if (result.hasCertificate()) {
+            ServiceUtils.checkParameterStartsWith(request.url().toString(),
+                    Constants.HTTPS_PREFIX,
+                    "Only '" + Constants.HTTPS_PREFIX + "' URLs are allowed for sending certificate details to ensure secure transmission.");
+        }
         RequestInfo requestInfo = new RequestInfo(request, new InterfaceLogBean("performRequest", "", ""));
         try {
             tryRequest(result.getParams(), result.getBucketName(), needSignature,