Merge remote-tracking branch 'upstream/master'

Author: Doha2012

httpclient/pom.xml

@@ -173,7 +173,7 @@
 		<mockito.version>1.10.8</mockito.version>
 
 		<httpcore.version>4.3.3</httpcore.version>
-		<httpclient.version>4.3.4</httpclient.version>
+		<httpclient.version>4.3.6</httpclient.version>
 
 		<rest-assured.version>2.4.0</rest-assured.version>
 

…ttpclient/HttpsClientLiveManualTest.java …g/httpclient/HttpsClientSslLiveTest.javahttpclient/src/test/java/org/baeldung/httpclient/HttpsClientLiveManualTest.java renamed to httpclient/src/test/java/org/baeldung/httpclient/HttpsClientSslLiveTest.java httpclient/src/test/java/org/baeldung/httpclient/HttpsClientLiveManualTest.java renamed to httpclient/src/test/java/org/baeldung/httpclient/HttpsClientSslLiveTest.java

@@ -7,7 +7,7 @@
 import java.security.GeneralSecurityException;
 import java.security.cert.X509Certificate;
 
-import javax.net.ssl.SSLPeerUnverifiedException;
+import javax.net.ssl.SSLException;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.client.ClientProtocolException;
@@ -25,24 +25,25 @@
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.impl.conn.PoolingClientConnectionManager;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * This test requires a localhost server over HTTPS <br>
  * It should only be manually run, not part of the automated build
  * */
-public class HttpsClientLiveManualTest {
+public class HttpsClientSslLiveTest {
+
+    // "https://localhost:8443/spring-security-rest-basic-auth/api/bars/1" // local
+    // "https://mms.nw.ru/" // hosted
+    private static final String HOST_WITH_SSL = "https://mms.nw.ru/";
 
     // tests
 
-    @Test(expected = SSLPeerUnverifiedException.class)
-    @Ignore("Only for a server that has HTTPS enabled (on 8443)")
+    @Test(expected = SSLException.class)
     public final void whenHttpsUrlIsConsumed_thenException() throws ClientProtocolException, IOException {
         final CloseableHttpClient httpClient = HttpClientBuilder.create().build();
 
-        final String urlOverHttps = "https://localhost:8443/spring-security-rest-basic-auth/api/bars/1";
-        final HttpGet getMethod = new HttpGet(urlOverHttps);
+        final HttpGet getMethod = new HttpGet(HOST_WITH_SSL);
         final HttpResponse response = httpClient.execute(getMethod);
         assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
     }
@@ -58,13 +59,34 @@ public final boolean isTrusted(final X509Certificate[] certificate, final String
         };
         final SSLSocketFactory sf = new SSLSocketFactory(acceptingTrustStrategy, SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
         final SchemeRegistry registry = new SchemeRegistry();
-        registry.register(new Scheme("https", 8443, sf));
+        registry.register(new Scheme("https", 443, sf));
+        final ClientConnectionManager ccm = new PoolingClientConnectionManager(registry);
+
+        final CloseableHttpClient httpClient = new DefaultHttpClient(ccm);
+
+        final HttpGet getMethod = new HttpGet(HOST_WITH_SSL);
+        final HttpResponse response = httpClient.execute(getMethod);
+        assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
+
+        httpClient.close();
+    }
+
+    @Test
+    public final void givenHttpClientAfter4_3_whenAcceptingAllCertificates_thenCanConsumeHttpsUriWithSelfSignedCertificate() throws IOException, GeneralSecurityException {
+        final TrustStrategy acceptingTrustStrategy = new TrustStrategy() {
+            @Override
+            public final boolean isTrusted(final X509Certificate[] certificate, final String authType) {
+                return true;
+            }
+        };
+        final SSLSocketFactory sf = new SSLSocketFactory(acceptingTrustStrategy, SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
+        final SchemeRegistry registry = new SchemeRegistry();
+        registry.register(new Scheme("https", 443, sf));
         final ClientConnectionManager ccm = new PoolingClientConnectionManager(registry);
 
         final CloseableHttpClient httpClient = new DefaultHttpClient(ccm);
 
-        final String urlOverHttps = "https://localhost:8443/spring-security-rest-basic-auth/api/bars/1";
-        final HttpGet getMethod = new HttpGet(urlOverHttps);
+        final HttpGet getMethod = new HttpGet(HOST_WITH_SSL);
         final HttpResponse response = httpClient.execute(getMethod);
         assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
 
@@ -80,8 +102,7 @@ public final void givenHttpClientPost4_3_whenAcceptingAllCertificates_thenCanCon
 
         // new
 
-        final String urlOverHttps = "https://localhost:8443/spring-security-rest-basic-auth/api/bars/1";
-        final HttpGet getMethod = new HttpGet(urlOverHttps);
+        final HttpGet getMethod = new HttpGet(HOST_WITH_SSL);
         final HttpResponse response = httpClient.execute(getMethod);
         assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
     }