Merge pull request #220 from longbai/proxy

add proxy

Author: longbai

src/main/java/com/qiniu/common/Config.java

@@ -1,5 +1,6 @@
 package com.qiniu.common;
 
+import com.qiniu.http.ProxyConfiguration;
 import qiniu.happydns.DnsClient;
 
 import java.nio.charset.Charset;
@@ -55,11 +56,14 @@ public final class Config {
      * 上传失败重试次数
      */
     public static int RETRY_MAX = 5;
-
     /**
      * 外部dns
      */
     public static DnsClient dns = null;
+    /**
+     * proxy
+     */
+    public static ProxyConfiguration proxy = null;
 
     private Config() {
     }

src/main/java/com/qiniu/http/Client.java

@@ -74,6 +74,13 @@ public List<InetAddress> lookup(String hostname) throws UnknownHostException {
                 }
             });
         }
+        final ProxyConfiguration p = Config.proxy;
+        if (p != null) {
+            builder.proxy(p.proxy());
+            if (p.user != null && p.password != null) {
+                builder.proxyAuthenticator(p.authenticator());
+            }
+        }
         builder.connectTimeout(Config.CONNECT_TIMEOUT, TimeUnit.SECONDS);
         builder.readTimeout(Config.RESPONSE_TIMEOUT, TimeUnit.SECONDS);
         builder.writeTimeout(Config.WRITE_TIMEOUT, TimeUnit.SECONDS);

src/main/java/com/qiniu/http/Proxy.java

@@ -0,0 +1,56 @@
+package com.qiniu.http;
+
+import okhttp3.Authenticator;
+import okhttp3.Credentials;
+import okhttp3.Route;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+
+/**
+ * http 代理
+ */
+public final class ProxyConfiguration {
+
+    public final String hostAddress;
+    public final int port;
+    public final String user;
+    public final String password;
+    public final Proxy.Type type;
+
+    /**
+     * @param hostAddress 服务器域名或IP，比如proxy.com, 192.168.1.1
+     * @param port        端口
+     * @param user        用户名，无则填null
+     * @param password    用户密码，无则填null
+     * @param type
+     */
+    public ProxyConfiguration(String hostAddress, int port, String user, String password, Proxy.Type type) {
+        this.hostAddress = hostAddress;
+        this.port = port;
+        this.user = user;
+        this.password = password;
+        this.type = type;
+    }
+
+    public ProxyConfiguration(String hostAddress, int port) {
+        this(hostAddress, port, null, null, Proxy.Type.HTTP);
+    }
+
+    Proxy proxy() {
+        return new Proxy(type, new InetSocketAddress(hostAddress, port));
+    }
+
+    Authenticator authenticator() {
+        return new Authenticator() {
+            @Override
+            public okhttp3.Request authenticate(Route route, okhttp3.Response response) throws IOException {
+                String credential = Credentials.basic(user, password);
+                return response.request().newBuilder().
+                        header("Proxy-Authorization", credential).
+                        header("Proxy-Connection", "Keep-Alive").build();
+            }
+        };
+    }
+}

src/main/java/com/qiniu/http/ProxyConfiguration.java

@@ -3,6 +3,7 @@
 import com.qiniu.common.Config;
 import com.qiniu.common.QiniuException;
 import com.qiniu.http.Client;
+import com.qiniu.http.ProxyConfiguration;
 import com.qiniu.http.Response;
 import org.junit.Assert;
 import org.junit.Test;
@@ -59,7 +60,9 @@ public void testDns() {
             Assert.fail();
         } catch (QiniuException e) {
             Assert.assertNotNull(e.response.reqId);
+            Assert.assertEquals(e.response.statusCode, 400);
         }
+        Config.dns = null;
     }
 
     @Test
@@ -94,4 +97,18 @@ public void testPost5() {
             Assert.fail();
         }
     }
+
+    @Test
+    public void testProxy() {
+        Config.proxy = new ProxyConfiguration("115.231.183.168", 80);
+        Response r = null;
+        try {
+            r = new Client().post("http://upproxy1.qiniu.com", "hello", null);
+            Assert.fail();
+        } catch (QiniuException e) {
+            Assert.assertNotNull(e.response.reqId);
+            Assert.assertEquals(e.response.statusCode, 400);
+        }
+        Config.proxy = null;
+    }
 }