1. assert http header for proxy 2. Test auth proxy in local

sjj3086786 · sjj3086786 · commit c6d5351aa64f · 2019-03-22T13:33:23.000+08:00
diff --git a/.travis.yml b/.travis.yml
@@ -13,12 +13,13 @@ branches: # build only on these branches
 
 install:
   # Install Proxy
-  - sudo rm -rf ~/.nvm - curl -sL "https://deb.nodesource.com/setup_7.x" | sudo -E bash -
+  - sudo rm -rf ~/.nvm - curl -sL "https://deb.nodesource.com/setup_11.x" | sudo -E bash -
   - sudo apt-get install -y nodejs
   - sudo ln -s /usr/bin/nodejs /usr/bin/node
   - sudo apt-get install -y npm
+  - sudo npm i -g n --force -g --registry=https://registry.npm.taobao.org
+  - sudo n latest
   - sudo npm install o_o -g --registry=https://registry.npm.taobao.org
-
 script:
   # Start Proxy
   - sudo o_o &
diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/clients/ApacheHttpClient.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/clients/ApacheHttpClient.java
@@ -190,6 +190,9 @@ private HttpUriRequest parseToHttpRequest(HttpRequest apiReq) throws IOException
 
         builder.addHeader(ACCEPT_ENCODING, "identity");
 
+        // calcProxy will modify the "Proxy-Authorization" header of the request
+        HttpHost proxy = calcProxy(apiReq);
+
         for (Map.Entry<String, String> entry : apiReq.getSysHeaders().entrySet()) {
             if ("Content-Length".equalsIgnoreCase(entry.getKey())) {
                 continue;
@@ -208,7 +211,6 @@ private HttpUriRequest parseToHttpRequest(HttpRequest apiReq) throws IOException
         } else {
             readTimeout = (int) clientConfig.getReadTimeoutMillis();
         }
-        HttpHost proxy = calcProxy(apiReq);
         RequestConfig requestConfig = RequestConfig.custom().setProxy(proxy).setConnectTimeout(connectTimeout).setSocketTimeout(
                 readTimeout).setConnectionRequestTimeout((int) clientConfig.getWriteTimeoutMillis()).build();
         builder.setConfig(requestConfig);
diff --git a/java-sdk-function-test/src/test/java/com/aliyuncs/ProxyTest.java b/java-sdk-function-test/src/test/java/com/aliyuncs/ProxyTest.java
@@ -4,10 +4,12 @@
 import com.aliyuncs.ecs.model.v20140526.DescribeInstancesResponse;
 import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.http.HttpClientConfig;
+import com.aliyuncs.http.HttpResponse;
 import com.aliyuncs.http.clients.ApacheHttpClient;
 import com.aliyuncs.profile.DefaultProfile;
 import com.aliyuncs.profile.IClientProfile;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -22,8 +24,8 @@ private DefaultAcsClient getRightApacheProxyClientWithRegionId(String regionId)
         ApacheHttpClient.getInstance(HttpClientConfig.getDefault()).close();
         IClientProfile profile = DefaultProfile.getProfile(regionId, accesskeyId, accesskeySecret);
         HttpClientConfig clientConfig = HttpClientConfig.getDefault();
-        clientConfig.setHttpProxy("http://localhost:8989");
-        clientConfig.setHttpsProxy("http://localhost:8989");
+        clientConfig.setHttpProxy("http://test:test@localhost:8989");
+        clientConfig.setHttpsProxy("http://test:test@localhost:8989");
         profile.setHttpClientConfig(clientConfig);
         return new DefaultAcsClient(profile);
     }
@@ -69,6 +71,46 @@ private DefaultAcsClient getIgnoreWrongApacheProxyClientWithRegionId(String regi
         return new DefaultAcsClient(profile);
     }
 
+    private DefaultAcsClient getRightAuthProxyApacheClientWithRegionId(String regionId) throws ClientException, IOException {
+        ApacheHttpClient.getInstance(HttpClientConfig.getDefault()).close();
+        IClientProfile profile = DefaultProfile.getProfile(regionId, accesskeyId, accesskeySecret);
+        HttpClientConfig clientConfig = HttpClientConfig.getDefault();
+        clientConfig.setHttpProxy("http://username:right@localhost:3000");
+        clientConfig.setHttpsProxy("http://username:right@localhost:3000");
+        profile.setHttpClientConfig(clientConfig);
+        return new DefaultAcsClient(profile);
+    }
+
+    private DefaultAcsClient getWrongAuthProxyApacheClientWithRegionId(String regionId) throws ClientException, IOException {
+        ApacheHttpClient.getInstance(HttpClientConfig.getDefault()).close();
+        IClientProfile profile = DefaultProfile.getProfile(regionId, accesskeyId, accesskeySecret);
+        HttpClientConfig clientConfig = HttpClientConfig.getDefault();
+        clientConfig.setHttpProxy("http://username:wrong@localhost:3000");
+        clientConfig.setHttpsProxy("http://username:wrong@localhost:3000");
+        profile.setHttpClientConfig(clientConfig);
+        return new DefaultAcsClient(profile);
+    }
+
+    private DefaultAcsClient getRightAuthCompatibleProxyClientWithRegionId(String regionId) throws ClientException, IOException {
+        IClientProfile profile = DefaultProfile.getProfile(regionId, accesskeyId, accesskeySecret);
+        HttpClientConfig clientConfig = HttpClientConfig.getDefault();
+        clientConfig.setCompatibleMode(true);
+        clientConfig.setHttpProxy("http://username:right@localhost:3000");
+        clientConfig.setHttpsProxy("http://username:right@localhost:3000");
+        profile.setHttpClientConfig(clientConfig);
+        return new DefaultAcsClient(profile);
+    }
+
+    private DefaultAcsClient getWrongAuthCompatibleProxyClientWithRegionId(String regionId) throws ClientException, IOException {
+        IClientProfile profile = DefaultProfile.getProfile(regionId, accesskeyId, accesskeySecret);
+        HttpClientConfig clientConfig = HttpClientConfig.getDefault();
+        clientConfig.setCompatibleMode(true);
+        clientConfig.setHttpProxy("http://username:wrong@localhost:3000");
+        clientConfig.setHttpsProxy("http://username:wrong@localhost:3000");
+        profile.setHttpClientConfig(clientConfig);
+        return new DefaultAcsClient(profile);
+    }
+
     @Test
     public void apacheRightProxyTest() throws ClientException, IOException {
         DescribeInstancesRequest request = new DescribeInstancesRequest();
@@ -77,6 +119,15 @@ public void apacheRightProxyTest() throws ClientException, IOException {
         Assert.assertTrue(0 <= response.getTotalCount());
     }
 
+    @Test
+    public void apacheRightProxyAssertHeaderTest() throws ClientException, IOException {
+        DescribeInstancesRequest request = new DescribeInstancesRequest();
+        HttpResponse response = getRightApacheProxyClientWithRegionId(regionId).doAction(request);
+        Assert.assertNotNull(response);
+        Assert.assertEquals("HTTP/1.1 o_o", response.getHeaderValue("Via"));
+
+    }
+
     @Test
     public void apacheWrongProxyTest() throws ClientException, IOException {
         thrown.expect(ClientException.class);
@@ -87,6 +138,14 @@ public void apacheWrongProxyTest() throws ClientException, IOException {
         Assert.assertTrue(0 <= response.getTotalCount());
     }
 
+    @Test
+    public void compatibleRightProxyAssertHeaderTest() throws ClientException, IOException {
+        DescribeInstancesRequest request = new DescribeInstancesRequest();
+        HttpResponse response = getRightCompatibleProxyClientWithRegionId(regionId).doAction(request);
+        Assert.assertNotNull(response);
+        Assert.assertEquals("HTTP/1.1 o_o", response.getHeaderValue("Via"));
+    }
+
     @Test
     public void compatibleRightProxyTest() throws ClientException, IOException {
         DescribeInstancesRequest request = new DescribeInstancesRequest();
@@ -113,4 +172,50 @@ public void ignoreWrongApacheProxyTest() throws IOException, ClientException {
         Assert.assertTrue(0 <= response.getTotalCount());
     }
 
+    @Test
+    public void ignoreWrongApacheProxyAssertHeaderTest() throws IOException, ClientException {
+        DescribeInstancesRequest request = new DescribeInstancesRequest();
+        HttpResponse response = getIgnoreWrongApacheProxyClientWithRegionId(regionId).doAction(request);
+        Assert.assertNotNull(response);
+        Assert.assertNull(response.getHeaderValue("Via"));
+    }
+
+    // only test auth proxy server in local environment
+    @Ignore
+    @Test
+    public void apacheRightAuthLocalProxyTest() throws ClientException, IOException {
+        DescribeInstancesRequest request = new DescribeInstancesRequest();
+        HttpResponse response = getRightAuthProxyApacheClientWithRegionId(regionId).doAction(request);
+        Assert.assertEquals(200, response.getStatus());
+
+    }
+
+    // only test auth proxy server in local environment
+    @Ignore
+    @Test
+    public void apacheWrongAuthLocalProxyTest() throws ClientException, IOException {
+        DescribeInstancesRequest request = new DescribeInstancesRequest();
+        HttpResponse response = getWrongAuthProxyApacheClientWithRegionId(regionId).doAction(request);
+        Assert.assertEquals(401, response.getStatus());
+
+    }
+
+    // only test auth proxy server in local environment
+    @Ignore
+    @Test
+    public void compatibleRightAuthLocalProxyTest() throws ClientException, IOException {
+        DescribeInstancesRequest request = new DescribeInstancesRequest();
+        HttpResponse response = getRightAuthCompatibleProxyClientWithRegionId(regionId).doAction(request);
+        Assert.assertEquals(200, response.getStatus());
+    }
+
+    // only test auth proxy server in local environment
+    @Ignore
+    @Test
+    public void compatibleWrongAuthLocalProxyTest() throws ClientException, IOException {
+        DescribeInstancesRequest request = new DescribeInstancesRequest();
+        HttpResponse response = getWrongAuthCompatibleProxyClientWithRegionId(regionId).doAction(request);
+        Assert.assertEquals(401, response.getStatus());
+    }
+
 }
