Fix proxy authentication failure - add Authenticator method

Author: Javen

src/cn/jpush/api/common/HttpProxy.java

@@ -6,6 +6,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.base.Preconditions;
+
 public class HttpProxy {
     private static final Logger LOG = LoggerFactory.getLogger(NativeHttpClient.class);
 
@@ -24,6 +26,9 @@ public HttpProxy(String host, int port) {
     public HttpProxy(String host, int port, String username, String password) {
         this(host, port);
 
+        Preconditions.checkArgument(! (null == username), "username should not be null");
+        Preconditions.checkArgument(! (null == password), "password should not be null");
+        
         this.username = username;
         this.password = password;
         authenticationNeeded = true;
@@ -44,4 +49,12 @@ public boolean isAuthenticationNeeded() {
     public String getProxyAuthorization() {
         return ServiceHelper.getBasicAuthorization(username, password);
     }
+    
+    public String getUsername() {
+        return this.username;
+    }
+    
+    public String getPassword() {
+        return this.password;
+    }
 }

src/cn/jpush/api/common/NativeHttpClient.java

@@ -4,7 +4,9 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
+import java.net.Authenticator;
 import java.net.HttpURLConnection;
+import java.net.PasswordAuthentication;
 import java.net.SocketTimeoutException;
 import java.net.URL;
 import java.security.cert.CertificateException;
@@ -96,6 +98,8 @@ private ResponseWrapper _sendRequest(String url, String content,
 			    conn = (HttpURLConnection) aUrl.openConnection(_proxy.getNetProxy());
 			    if (_proxy.isAuthenticationNeeded()) {
 			        conn.setRequestProperty("Proxy-Authorization", _proxy.getProxyAuthorization());
+			        Authenticator.setDefault(new SimpleProxyAuthenticator(
+			                _proxy.getUsername(), _proxy.getPassword()));
 			    }
 			} else {
 			    conn = (HttpURLConnection) aUrl.openConnection();
@@ -234,7 +238,7 @@ protected void initSSL() {
 	}
 
 
-	public static class SimpleHostnameVerifier implements HostnameVerifier {
+	private static class SimpleHostnameVerifier implements HostnameVerifier {
 
 	    @Override
 	    public boolean verify(String hostname, SSLSession session) {
@@ -243,7 +247,7 @@ public boolean verify(String hostname, SSLSession session) {
 
 	}
 
-	public static class SimpleTrustManager implements TrustManager, X509TrustManager {
+	private static class SimpleTrustManager implements TrustManager, X509TrustManager {
 
 	    @Override
 	    public void checkClientTrusted(X509Certificate[] chain, String authType)
@@ -262,5 +266,20 @@ public X509Certificate[] getAcceptedIssuers() {
 	        return null;
 	    }
 	}
+	
+    private static class SimpleProxyAuthenticator extends java.net.Authenticator {
+        private String username;
+        private String password;
 
+        public SimpleProxyAuthenticator(String username, String password) {
+            this.username = username;
+            this.password = password;
+        }
+        
+        protected PasswordAuthentication getPasswordAuthentication() {
+            return new PasswordAuthentication(
+                    this.username,
+                    this.password.toCharArray());
+        }
+    }
 }

src/cn/jpush/api/push/PushClient.java

@@ -111,7 +111,6 @@ public PushResult sendPush(String payloadString) throws APIConnectionException,
         try {
             _jsonParser.parse(payloadString);
         } catch (JsonParseException e) {
-            e.printStackTrace();
             Preconditions.checkArgument(false, "payloadString should be a valid JSON string.");
         }
 

test/cn/jpush/api/push/PushClientTest.java

@@ -4,6 +4,7 @@
 
 import cn.jpush.api.common.APIConnectionException;
 import cn.jpush.api.common.APIRequestException;
+import cn.jpush.api.common.HttpProxy;
 
 public class PushClientTest {
     private static final String appKey ="dd1066407b044738b6479275";
@@ -35,6 +36,11 @@ public void test_empty_string() {
         }
     }    
 
+    @Test(expected = IllegalArgumentException.class)
+    public void test_empty_password() {
+        new HttpProxy("127.0.0.1", 8080, "", null);
+    }    
+