Merge pull request #30 from aliyun/fix_proxy

proxy

Author: baiyubin2020

src/main/java/com/aliyun/oss/common/comm/DefaultServiceClient.java

@@ -27,11 +27,14 @@
 
 import javax.net.ssl.SSLContext;
 
+import org.apache.commons.codec.binary.Base64;
 import org.apache.http.Header;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpStatus;
+import org.apache.http.auth.AUTH;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.NTCredentials;
+import org.apache.http.client.AuthCache;
 import org.apache.http.client.CredentialsProvider;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -46,6 +49,8 @@
 import org.apache.http.conn.ssl.NoopHostnameVerifier;
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
 import org.apache.http.conn.ssl.TrustStrategy;
+import org.apache.http.impl.auth.BasicScheme;
+import org.apache.http.impl.client.BasicAuthCache;
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
@@ -73,6 +78,7 @@ public class DefaultServiceClient extends ServiceClient {
     protected RequestConfig requestConfig;
     protected CredentialsProvider credentialsProvider;
     protected HttpHost proxyHttpHost;
+    protected AuthCache authCache;
 
     public DefaultServiceClient(ClientConfiguration config) {
         super(config);
@@ -97,6 +103,9 @@ public DefaultServiceClient(ClientConfiguration config) {
                 this.credentialsProvider = new BasicCredentialsProvider();
                 this.credentialsProvider.setCredentials(new AuthScope(proxyHost, proxyPort),
                         new NTCredentials(proxyUsername, proxyPassword, proxyWorkstation, proxyDomain));
+                
+                this.authCache = new BasicAuthCache();
+                authCache.put(this.proxyHttpHost, new BasicScheme());
             }
         }
 
@@ -107,7 +116,8 @@ public DefaultServiceClient(ClientConfiguration config) {
     public ResponseMessage sendRequestCore(ServiceClient.Request request, ExecutionContext context)
             throws IOException {        
         HttpRequestBase httpRequest = httpRequestFactory.createHttpRequest(request, context);
-        HttpClientContext httpContext = HttpClientContext.create();
+        setProxyAuthorizationIfNeed(httpRequest);
+        HttpClientContext httpContext = createHttpContext();
         httpContext.setRequestConfig(this.requestConfig);
 
         CloseableHttpResponse httpResponse = null;
@@ -255,9 +265,19 @@ protected HttpClientContext createHttpContext() {
         httpContext.setRequestConfig(this.requestConfig);
         if (this.credentialsProvider != null) {
             httpContext.setCredentialsProvider(this.credentialsProvider);
+            httpContext.setAuthCache(this.authCache);
         }
         return httpContext;
     }
+    
+    private void setProxyAuthorizationIfNeed(HttpRequestBase httpRequest) { 
+        if (this.credentialsProvider != null) {
+            String auth = this.config.getProxyUsername() + ":" + this.config.getProxyPassword();
+            byte[] encodedAuth = Base64.encodeBase64(auth.getBytes());
+            String authHeader = "Basic " + new String(encodedAuth);            
+            httpRequest.addHeader(AUTH.PROXY_AUTH_RESP, authHeader);
+        }
+    }
 
     @Override
     public void shutdown() {

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

@@ -359,6 +359,27 @@ public static void resetTestConfig() {
       if (TestConfig.STS_TEST_BUCKET == null) {
           TestConfig.STS_TEST_BUCKET = System.getenv().get("STS_TEST_BUCKET");
       }
+      
+      // proxy test
+      if (TestConfig.PROXY_HOST == null) {
+          TestConfig.PROXY_HOST = System.getenv().get("PROXY_HOST");
+      }
+      
+      if (TestConfig.PROXY_PORT == -1) {
+         TestConfig.PROXY_PORT = 3128;
+         String portStr = System.getenv().get("PROXY_PORT");
+         if (portStr != null) {
+             TestConfig.PROXY_PORT = Integer.parseInt(portStr);
+         } 
+      }
+      
+      if (TestConfig.PROXY_USER == null) {
+          TestConfig.PROXY_USER = System.getenv().get("PROXY_USER");
+      }
+      
+      if (TestConfig.PROXY_PASSWORD == null) {
+          TestConfig.PROXY_PASSWORD = System.getenv().get("PROXY_PASSWORD");
+      }
     }
 
 }

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

@@ -39,4 +39,10 @@ public final class TestConfig {
     public static String STS_TEST_ROLE = null;
     public static String STS_TEST_BUCKET = null;
 
+    // OSS proxy test
+    public static String PROXY_HOST = null;
+    public static int PROXY_PORT = -1;
+    public static String PROXY_USER = null;
+    public static String PROXY_PASSWORD = null;
+    
 }