change header from Authorization to Proxy-Authorization for Proxy Authorization #596

Author: code4craft

webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpUriRequestConverter.java

@@ -2,6 +2,7 @@
 
 import org.apache.http.HttpHost;
 import org.apache.http.auth.AuthState;
+import org.apache.http.auth.ChallengeState;
 import org.apache.http.auth.UsernamePasswordCredentials;
 import org.apache.http.client.CookieStore;
 import org.apache.http.client.config.CookieSpecs;
@@ -41,7 +42,7 @@ private HttpClientContext convertHttpClientContext(Request request, Site site, P
         HttpClientContext httpContext = new HttpClientContext();
         if (proxy != null && proxy.getUsername() != null) {
             AuthState authState = new AuthState();
-            authState.update(new BasicScheme(), new UsernamePasswordCredentials(proxy.getUsername(), proxy.getPassword()));
+            authState.update(new BasicScheme(ChallengeState.PROXY), new UsernamePasswordCredentials(proxy.getUsername(), proxy.getPassword()));
             httpContext.setAttribute(HttpClientContext.PROXY_AUTH_STATE, authState);
         }
         if (request.getCookies() != null && !request.getCookies().isEmpty()) {

webmagic-core/src/test/java/us/codecraft/webmagic/downloader/HttpClientDownloaderTest.java

@@ -10,7 +10,6 @@
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
-import org.junit.Ignore;
 import org.junit.Test;
 import us.codecraft.webmagic.Page;
 import us.codecraft.webmagic.Request;
@@ -255,15 +254,21 @@ public void run() throws Exception {
         });
     }
 
-    @Ignore("need proxy server")
     @Test
-    public void test_download_by_SimpleProxyProvider(){
-        HttpClientDownloader httpClientDownloader = new HttpClientDownloader();
-        httpClientDownloader.setProxyProvider(SimpleProxyProvider.from(new Proxy("127.0.0.1", 1087)));
-        Request request = new Request();
-        request.setUrl("https://www.baidu.com");
-        Page page = httpClientDownloader.download(request, Site.me().toTask());
-        assertThat(page.isDownloadSuccess());
+    public void test_download_auth_by_SimpleProxyProvider() throws Exception {
+        HttpServer server = httpServer(13423);
+        server.get(eq(header("Proxy-Authorization"), "Basic dXNlcm5hbWU6cGFzc3dvcmQ=")).response("ok");
+        Runner.running(server, new Runnable() {
+            @Override
+            public void run() throws Exception {
+                HttpClientDownloader httpClientDownloader = new HttpClientDownloader();
+                httpClientDownloader.setProxyProvider(SimpleProxyProvider.from(new Proxy("127.0.0.1", 13423, "username", "password")));
+                Request request = new Request();
+                request.setUrl("http://www.baidu.com");
+                Page page = httpClientDownloader.download(request, Site.me().toTask());
+                assertThat(page.getRawText()).isEqualTo("ok");
+            }
+        });
     }
 
 }