update qcloud sdk to 5.9.33

Author: jordanqin

QCloudCosXml/cos-android-base/build.gradle

@@ -6,8 +6,8 @@ android {
         minSdkVersion 15
         targetSdkVersion 28
 
-        versionCode 50930
-        versionName '5.9.30'
+        versionCode 50931
+        versionName '5.9.31'
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 

QCloudCosXml/cos-android-base/src/main/java/com/tencent/cos/xml/CosXmlBaseService.java

@@ -224,6 +224,7 @@ private void init(QCloudHttpClient.Builder builder, CosXmlServiceConfig configur
         }
         builder.dnsCache(configuration.isDnsCache());
         builder.addPrefetchHost(configuration.getEndpointSuffix());
+        builder.setVerifySSLEnable(configuration.isVerifySSLEnable());
     }
 
     public void setNetworkClient(CosXmlServiceConfig configuration){

QCloudCosXml/cos-android-base/src/main/java/com/tencent/cos/xml/CosXmlServiceConfig.java

@@ -110,6 +110,7 @@ public class CosXmlServiceConfig implements Parcelable {
     private final int uploadMaxThreadCount;
     private final int downloadMaxThreadCount;
     private final boolean domainSwitch;
+    private final boolean verifySSLEnable;
 
     public CosXmlServiceConfig(Builder builder) {
         this.protocol = builder.protocol;
@@ -148,6 +149,7 @@ public CosXmlServiceConfig(Builder builder) {
         this.uploadMaxThreadCount = builder.uploadMaxThreadCount;
         this.downloadMaxThreadCount = builder.downloadMaxThreadCount;
         this.domainSwitch = builder.domainSwitch;
+        this.verifySSLEnable = builder.verifySSLEnable;
     }
 
     public Builder newBuilder() {
@@ -437,6 +439,10 @@ public boolean isDomainSwitch() {
         return domainSwitch;
     }
 
+    public boolean isVerifySSLEnable(){
+        return verifySSLEnable;
+    }
+
     @Deprecated
     public String getEndpointSuffix() {
         return getEndpointSuffix(region, false);
@@ -641,6 +647,7 @@ public final static class Builder {
         private int uploadMaxThreadCount;
         private int downloadMaxThreadCount;
         private boolean domainSwitch;
+        private boolean verifySSLEnable;
 
         public Builder() {
             protocol = HTTPS_PROTOCOL;
@@ -650,6 +657,7 @@ public Builder() {
             uploadMaxThreadCount = TaskExecutors.UPLOAD_THREAD_COUNT;
             downloadMaxThreadCount = TaskExecutors.DOWNLOAD_THREAD_COUNT;
             domainSwitch = true;
+            verifySSLEnable = true;
         }
 
         public Builder(CosXmlServiceConfig config) {
@@ -689,6 +697,7 @@ public Builder(CosXmlServiceConfig config) {
             uploadMaxThreadCount = config.uploadMaxThreadCount;
             downloadMaxThreadCount = config.downloadMaxThreadCount;
             domainSwitch = config.domainSwitch;
+            verifySSLEnable = config.verifySSLEnable;
         }
 
         /**
@@ -745,6 +754,14 @@ public Builder setDomainSwitch(boolean domainSwitch) {
             return this;
         }
 
+        /**
+         * 设置是否开启SSL证书校验，默认开启
+         */
+        public Builder setVerifySSLEnable(boolean verifySSLEnable) {
+            this.verifySSLEnable = verifySSLEnable;
+            return this;
+        }
+
         /**
          * 设置是否 Https 协议，默认为 Https
          *

QCloudCosXml/cos-android/build.gradle

@@ -92,8 +92,8 @@ android {
     }
 
     // 切换发 normal 或者 slim 包，需要同步修改 pom.artifactId 信息
-    defaultPublishConfig "normalRelease"
-//      defaultPublishConfig  "slimRelease"
+//    defaultPublishConfig "normalRelease"
+      defaultPublishConfig  "slimRelease"
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8

QCloudCosXml/cos-android/src/androidTest/java/com/tencent/cos/xml/core/TestConst.java

@@ -83,6 +83,7 @@ public class TestConst {
     public static final String PERSIST_BUCKET_BIG_OBJECT_PATH = "do_not_remove/big_object";
     public static final String PERSIST_BUCKET_BATCH_OBJECT_PATH = "do_not_remove//batch/small_object";
     public static final String PERSIST_BUCKET_BIG_60M_OBJECT_PATH = "do_not_remove/big_60m_object";
+    public static final String PERSIST_BUCKET_BIG_1G_OBJECT_PATH = "do_not_remove/big_file.zip";
     public static final String PERSIST_BUCKET_CSE_SMALL_OBJECT_PATH = "do_not_remove/cse_small_object";
     public static final String PERSIST_BUCKET_CSE_BIG_OBJECT_PATH = "do_not_remove/cse_big_object";
 

QCloudCosXml/cos-android/src/androidTest/java/com/tencent/cos/xml/transfer/DownloadTest.java

@@ -29,6 +29,7 @@
 import androidx.annotation.Nullable;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
+import com.tencent.cos.xml.CosXmlServiceConfig;
 import com.tencent.cos.xml.CosXmlSimpleService;
 import com.tencent.cos.xml.core.MyOnSignatureListener;
 import com.tencent.cos.xml.core.ServiceFactory;
@@ -478,6 +479,59 @@ public void onFail(CosXmlRequest request, @Nullable CosXmlClientException client
         Assert.assertTrue(true);
     }
 
+    @Test public void testSmallDownloadToFileByVerifySSLNotEnabled() {
+        CosXmlServiceConfig cosXmlServiceConfig = new CosXmlServiceConfig.Builder()
+                .isHttps(true)
+                .setDebuggable(true)
+                .setRegion(TestConst.PERSIST_BUCKET_REGION)
+                .setVerifySSLEnable(false)
+                .builder();
+        CosXmlSimpleService cosXmlSimpleService = ServiceFactory.INSTANCE.newService(cosXmlServiceConfig);
+
+        GetObjectRequest getObjectRequest = new GetObjectRequest(TestConst.PERSIST_BUCKET,
+                TestConst.PERSIST_BUCKET_SMALL_OBJECT_PATH,
+                TestUtils.localParentPath());
+        try {
+            cosXmlSimpleService.getObject(getObjectRequest);
+        } catch (CosXmlClientException e) {
+            Assert.fail(e.getMessage());
+            return;
+        } catch (CosXmlServiceException e) {
+            Assert.fail(e.getMessage());
+            return;
+        }
+        Assert.assertTrue(true);
+    }
+
+    @Test public void testDownloadToFileTimeout() {
+        CosXmlServiceConfig cosXmlServiceConfig = new CosXmlServiceConfig.Builder()
+                .isHttps(true)
+                .setDebuggable(true)
+                .setConnectionTimeout(3000)
+                .setSocketTimeout(3000)
+                .setRegion(TestConst.PERSIST_BUCKET_REGION)
+                .builder();
+        CosXmlSimpleService cosXmlSimpleService = ServiceFactory.INSTANCE.newService(cosXmlServiceConfig);
+
+        GetObjectRequest getObjectRequest = new GetObjectRequest(TestConst.PERSIST_BUCKET,
+                TestConst.PERSIST_BUCKET_BIG_1G_OBJECT_PATH,
+                TestUtils.localParentPath());
+        try {
+            cosXmlSimpleService.getObject(getObjectRequest);
+        } catch (CosXmlClientException e) {
+            if(e.getMessage().contains("timeout")){
+                Assert.assertTrue(true);
+            } else {
+                Assert.fail(e.getMessage());
+            }
+            return;
+        } catch (CosXmlServiceException e) {
+            Assert.fail(e.getMessage());
+            return;
+        }
+        Assert.assertTrue(true);
+    }
+
     @Test public void testDownloadPath() {
         testDownloadBtPath("/", true, true);
         testDownloadBtPath("///////", true, true);

QCloudCosXml/version.gradle

@@ -22,6 +22,6 @@
  */
 
 ext {
-    cosSdkVersionCode = 50932
-    cosSdkVersionName = '5.9.32'
+    cosSdkVersionCode = 50933
+    cosSdkVersionName = '5.9.33'
 }