support time skew manual adjustment.

Author: huiguangjun

src/main/java/com/aliyun/oss/ClientConfiguration.java

@@ -25,6 +25,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Date;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -99,6 +100,8 @@ public class ClientConfiguration {
 
     protected SignVersion signatureVersion = DEFAULT_SIGNATURE_VERSION;
 
+    protected long tickOffset = 0;
+
     public ClientConfiguration() {
         super();
         AppendDefaultExcludeList(this.cnameExcludeList);
@@ -672,4 +675,28 @@ public SignVersion getSignatureVersion() {
     public void setSignatureVersion(SignVersion signatureVersion) {
         this.signatureVersion = signatureVersion;
     }
+
+    /**
+     * Gets the difference between customized epoch time and local time, in millisecond.
+     *
+     * @return tick Offset
+     */
+    public long getTickOffset() {
+        return tickOffset;
+    }
+
+    /**
+     * Sets the custom base time.
+     * OSS's token validation logic depends on the time.
+     * It requires that there's no more than 15 min time difference between client and OSS server.
+     * This API calculates the difference between local time to epoch time.
+     * Later one other APIs use this difference to offset the local time before sending request to OSS.
+     *
+     * @param epochTicks
+     *             Custom Epoch ticks (in millisecond).
+     */
+    public void setTickOffset(long epochTicks) {
+        long localTime = new Date().getTime();
+        this.tickOffset = epochTicks - localTime;
+    }
 }

src/main/java/com/aliyun/oss/internal/OSSRequestMessageBuilder.java

@@ -167,12 +167,16 @@ public OSSRequestMessageBuilder setOriginalRequest(WebServiceRequest originalReq
     }
 
     public RequestMessage build() {
+        ClientConfiguration clientCofig = this.innerClient.getClientConfiguration();
         Map<String, String> sentHeaders = new HashMap<String, String>(this.headers);
-        sentHeaders.put(OSSHeaders.DATE, DateUtil.formatRfc822Date(new Date()));
         Map<String, String> sentParameters = new LinkedHashMap<String, String>(this.parameters);
+        Date now = new Date();
+        if (clientCofig.getTickOffset() != 0) {
+            now.setTime(now.getTime() + clientCofig.getTickOffset());
+        }
+        sentHeaders.put(OSSHeaders.DATE, DateUtil.formatRfc822Date(now));
 
         RequestMessage request = new RequestMessage(this.originalRequest, this.bucket, this.key);
-        ClientConfiguration clientCofig = this.innerClient.getClientConfiguration();
         request.setBucket(bucket);
         request.setKey(key);
         request.setEndpoint(determineFinalEndpoint(this.endpoint, this.bucket, clientCofig));

src/test/java/com/aliyun/oss/integrationtests/ClientBuilderTest.java

@@ -21,10 +21,9 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
+import java.util.Date;
 
-import com.aliyun.oss.ClientBuilderConfiguration;
-import com.aliyun.oss.OSSClient;
-import com.aliyun.oss.OSSClientBuilder;
+import com.aliyun.oss.*;
 import com.aliyun.oss.common.auth.Credentials;
 import com.aliyun.oss.common.auth.DefaultCredentialProvider;
 import com.aliyun.oss.model.BucketInfo;
@@ -33,6 +32,8 @@
 import junit.framework.Assert;
 import org.junit.Test;
 
+import static com.aliyun.oss.OSSErrorCode.REQUEST_TIME_TOO_SKEWED;
+
 public class ClientBuilderTest extends TestBase {
 
     private final static String TEST_KEY = "test/test.txt";
@@ -170,4 +171,56 @@ public void testClientBuilderWithAll() {
         }
     }
 
+    @Test
+    public void testClientBuilderSpecialEpochTicks() {
+        OSSClient client = null;
+        ClientBuilderConfiguration config = new ClientBuilderConfiguration();
+        Assert.assertEquals(config.getTickOffset(), 0);
+        config.setSupportCname(true);
+        config.setConnectionTimeout(10000);
+        try {
+            long epochTicks = new Date().getTime();
+            epochTicks -= 16*600*1000;
+            config.setTickOffset(epochTicks);
+            client = (OSSClient) new OSSClientBuilder().build(TestConfig.OSS_TEST_ENDPOINT,
+                    new DefaultCredentialProvider(TestConfig.OSS_TEST_ACCESS_KEY_ID,
+                            TestConfig.OSS_TEST_ACCESS_KEY_SECRET),
+                    config);
+            Assert.assertTrue(client.getClientConfiguration().isSupportCname());
+            Assert.assertEquals(client.getClientConfiguration().getConnectionTimeout(), 10000);
+            Assert.assertEquals(client.getClientConfiguration().getTickOffset(), -16*600*1000);
+
+            BucketInfo info = client.getBucketInfo(bucketName);
+            Assert.assertTrue(false);
+        } catch (Exception e) {
+            if (e instanceof ServiceException) {
+                String errorCode = ((ServiceException) e).getErrorCode();
+                Assert.assertEquals(errorCode, REQUEST_TIME_TOO_SKEWED);
+            } else {
+                Assert.assertTrue(false);
+            }
+        } finally {
+            client.shutdown();
+        }
+
+        try {
+            long epochTicks = new Date().getTime();
+            config.setTickOffset(epochTicks);
+            client = (OSSClient) new OSSClientBuilder().build(TestConfig.OSS_TEST_ENDPOINT,
+                    new DefaultCredentialProvider(TestConfig.OSS_TEST_ACCESS_KEY_ID,
+                            TestConfig.OSS_TEST_ACCESS_KEY_SECRET),
+                    config);
+            Assert.assertTrue(client.getClientConfiguration().isSupportCname());
+            Assert.assertEquals(client.getClientConfiguration().getConnectionTimeout(), 10000);
+
+            BucketInfo info = client.getBucketInfo(bucketName);
+            Assert.assertEquals(info.getBucket().getName(), bucketName);
+        } catch (Exception e) {
+            Assert.assertTrue(false);
+        } finally {
+            client.shutdown();
+        }
+
+
+    }
 }