From f58149a0ccc79a6a5c697545c98f8d222161ab3f Mon Sep 17 00:00:00 2001 From: eugenp Date: Wed, 18 Dec 2013 13:16:19 +0200 Subject: [PATCH] upgrades to spring security 3.2 - testing work as well --- spring-rest/pom.xml | 2 +- spring-security-rest-basic-auth/pom.xml | 2 +- .../src/main/resources/webSecurityConfig.xml | 2 +- .../org/baeldung/client/ClientLiveTest.java | 2 ++ .../baeldung/client/RawClientLiveTest.java | 34 ++++++------------- spring-security-rest-custom/pom.xml | 2 +- .../src/main/resources/webSecurityConfig.xml | 2 +- spring-security-rest-digest-auth/pom.xml | 2 +- .../src/main/resources/webSecurityConfig.xml | 2 +- .../baeldung/client/RawClientLiveTest.java | 31 ++++------------- spring-security-rest-full/pom.xml | 2 +- .../src/main/resources/webSecurityConfig.xml | 2 +- spring-security-rest/pom.xml | 2 +- .../src/main/resources/webSecurityConfig.xml | 2 +- 14 files changed, 30 insertions(+), 59 deletions(-) diff --git a/spring-rest/pom.xml b/spring-rest/pom.xml index c205d6f5a7..66ad302bc6 100644 --- a/spring-rest/pom.xml +++ b/spring-rest/pom.xml @@ -139,7 +139,7 @@ 3.2.6.RELEASE - 3.1.4.RELEASE + 3.2.0.RELEASE 4.3.0.Final diff --git a/spring-security-rest-basic-auth/pom.xml b/spring-security-rest-basic-auth/pom.xml index ce6e807f08..c383ed6341 100644 --- a/spring-security-rest-basic-auth/pom.xml +++ b/spring-security-rest-basic-auth/pom.xml @@ -287,7 +287,7 @@ 3.2.6.RELEASE - 3.1.4.RELEASE + 3.2.0.RELEASE 4.3.0.Final diff --git a/spring-security-rest-basic-auth/src/main/resources/webSecurityConfig.xml b/spring-security-rest-basic-auth/src/main/resources/webSecurityConfig.xml index e30e9120a1..470ea8d44a 100644 --- a/spring-security-rest-basic-auth/src/main/resources/webSecurityConfig.xml +++ b/spring-security-rest-basic-auth/src/main/resources/webSecurityConfig.xml @@ -2,7 +2,7 @@ diff --git a/spring-security-rest-basic-auth/src/test/java/org/baeldung/client/ClientLiveTest.java b/spring-security-rest-basic-auth/src/test/java/org/baeldung/client/ClientLiveTest.java index e14fc1403e..4ca5ca9e64 100644 --- a/spring-security-rest-basic-auth/src/test/java/org/baeldung/client/ClientLiveTest.java +++ b/spring-security-rest-basic-auth/src/test/java/org/baeldung/client/ClientLiveTest.java @@ -15,6 +15,7 @@ import org.apache.http.conn.ssl.TrustStrategy; import org.apache.http.impl.client.DefaultHttpClient; import org.baeldung.client.spring.ClientConfig; import org.baeldung.web.dto.Foo; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -54,6 +55,7 @@ public class ClientLiveTest { } @Test + @Ignore("Only to run against a Server with HTTPS enabled (on 8443)") public final void givenAcceptingAllCertificates_whenHttpsUrlIsConsumed_thenException() throws GeneralSecurityException { final HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory(); final DefaultHttpClient httpClient = (DefaultHttpClient) requestFactory.getHttpClient(); diff --git a/spring-security-rest-basic-auth/src/test/java/org/baeldung/client/RawClientLiveTest.java b/spring-security-rest-basic-auth/src/test/java/org/baeldung/client/RawClientLiveTest.java index 61c782b00a..312222d9bb 100644 --- a/spring-security-rest-basic-auth/src/test/java/org/baeldung/client/RawClientLiveTest.java +++ b/spring-security-rest-basic-auth/src/test/java/org/baeldung/client/RawClientLiveTest.java @@ -13,18 +13,18 @@ import javax.net.ssl.SSLPeerUnverifiedException; import org.apache.http.HttpResponse; import org.apache.http.client.ClientProtocolException; +import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.params.ClientPNames; import org.apache.http.conn.ClientConnectionManager; import org.apache.http.conn.scheme.Scheme; import org.apache.http.conn.scheme.SchemeRegistry; import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.conn.ssl.TrustStrategy; +import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.impl.conn.PoolingClientConnectionManager; -import org.apache.http.params.CoreConnectionPNames; -import org.apache.http.params.HttpConnectionParams; -import org.apache.http.params.HttpParams; +import org.junit.Ignore; import org.junit.Test; public class RawClientLiveTest { @@ -33,14 +33,12 @@ public class RawClientLiveTest { @Test public final void whenSecuredRestApiIsConsumed_then200OK() throws ClientProtocolException, IOException { - final DefaultHttpClient httpClient = new DefaultHttpClient(); + final CloseableHttpClient httpClient = HttpClientBuilder.create().build(); final int timeout = 20; // seconds - final HttpParams httpParams = httpClient.getParams(); - configureViaRawApi(timeout, httpParams); - // configureViaHighLevelApi(timeout, httpParams); - + final RequestConfig requestConfig = RequestConfig.custom().setConnectionRequestTimeout(timeout).setConnectTimeout(timeout).setSocketTimeout(timeout).build(); final HttpGet getMethod = new HttpGet("http://localhost:8080/spring-security-rest-basic-auth/api/bars/1"); + getMethod.setConfig(requestConfig); final int hardTimeout = 5; // seconds final TimerTask task = new TimerTask() { @@ -58,8 +56,9 @@ public class RawClientLiveTest { } @Test(expected = SSLPeerUnverifiedException.class) + @Ignore("Only for a server that has HTTPS enabled (on 8443)") public final void whenHttpsUrlIsConsumed_thenException() throws ClientProtocolException, IOException { - final DefaultHttpClient httpClient = new DefaultHttpClient(); + 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); @@ -80,7 +79,7 @@ public class RawClientLiveTest { registry.register(new Scheme("https", 8443, sf)); final ClientConnectionManager ccm = new PoolingClientConnectionManager(registry); - final DefaultHttpClient httpClient = new DefaultHttpClient(ccm); + 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); @@ -88,17 +87,4 @@ public class RawClientLiveTest { assertThat(response.getStatusLine().getStatusCode(), equalTo(200)); } - // util - - final void configureViaHighLevelApi(final int timeout, final HttpParams httpParams) { - HttpConnectionParams.setConnectionTimeout(httpParams, timeout * 1000); // http.connection.timeout - HttpConnectionParams.setSoTimeout(httpParams, timeout * 1000); // http.socket.timeout - httpParams.setParameter(ClientPNames.CONN_MANAGER_TIMEOUT, new Long(timeout * 1000)); - } - - final void configureViaRawApi(final int timeout, final HttpParams httpParams) { - httpParams.setParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, timeout * 1000); - httpParams.setParameter(CoreConnectionPNames.SO_TIMEOUT, timeout * 1000); - httpParams.setParameter(ClientPNames.CONN_MANAGER_TIMEOUT, new Long(timeout * 1000)); - } } diff --git a/spring-security-rest-custom/pom.xml b/spring-security-rest-custom/pom.xml index 12abd6826e..b820175ec9 100644 --- a/spring-security-rest-custom/pom.xml +++ b/spring-security-rest-custom/pom.xml @@ -243,7 +243,7 @@ 3.2.6.RELEASE - 3.1.4.RELEASE + 3.2.0.RELEASE 4.3.0.Final diff --git a/spring-security-rest-custom/src/main/resources/webSecurityConfig.xml b/spring-security-rest-custom/src/main/resources/webSecurityConfig.xml index 3766574f34..e36bcd3a25 100644 --- a/spring-security-rest-custom/src/main/resources/webSecurityConfig.xml +++ b/spring-security-rest-custom/src/main/resources/webSecurityConfig.xml @@ -2,7 +2,7 @@ diff --git a/spring-security-rest-digest-auth/pom.xml b/spring-security-rest-digest-auth/pom.xml index 440f090173..8a1d800206 100644 --- a/spring-security-rest-digest-auth/pom.xml +++ b/spring-security-rest-digest-auth/pom.xml @@ -276,7 +276,7 @@ 3.2.6.RELEASE - 3.1.4.RELEASE + 3.2.0.RELEASE 4.3.0.Final diff --git a/spring-security-rest-digest-auth/src/main/resources/webSecurityConfig.xml b/spring-security-rest-digest-auth/src/main/resources/webSecurityConfig.xml index 2dbcf84eee..38321aeea1 100644 --- a/spring-security-rest-digest-auth/src/main/resources/webSecurityConfig.xml +++ b/spring-security-rest-digest-auth/src/main/resources/webSecurityConfig.xml @@ -2,7 +2,7 @@ diff --git a/spring-security-rest-digest-auth/src/test/java/org/baeldung/client/RawClientLiveTest.java b/spring-security-rest-digest-auth/src/test/java/org/baeldung/client/RawClientLiveTest.java index a535c246ef..93c3af3876 100644 --- a/spring-security-rest-digest-auth/src/test/java/org/baeldung/client/RawClientLiveTest.java +++ b/spring-security-rest-digest-auth/src/test/java/org/baeldung/client/RawClientLiveTest.java @@ -6,12 +6,10 @@ import java.util.TimerTask; import org.apache.http.HttpResponse; import org.apache.http.client.ClientProtocolException; +import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.params.ClientPNames; -import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.http.params.CoreConnectionPNames; -import org.apache.http.params.HttpConnectionParams; -import org.apache.http.params.HttpParams; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; import org.baeldung.client.spring.ClientConfig; import org.junit.Test; import org.junit.runner.RunWith; @@ -27,14 +25,12 @@ public class RawClientLiveTest { @Test public final void whenSecuredRestApiIsConsumed_then200OK() throws ClientProtocolException, IOException { - final DefaultHttpClient httpClient = new DefaultHttpClient(); + final CloseableHttpClient httpClient = HttpClientBuilder.create().build(); final int timeout = 20; // seconds - final HttpParams httpParams = httpClient.getParams(); - configureViaRawApi(timeout, httpParams); - // configureViaHighLevelApi(timeout, httpParams); - - final HttpGet getMethod = new HttpGet("http://localhost:8080/spring-security-rest-digest-auth/api/bars/1"); + final RequestConfig requestConfig = RequestConfig.custom().setConnectionRequestTimeout(timeout).setConnectTimeout(timeout).setSocketTimeout(timeout).build(); + final HttpGet getMethod = new HttpGet("http://localhost:8080/spring-security-rest-basic-auth/api/bars/1"); + getMethod.setConfig(requestConfig); final int hardTimeout = 5; // seconds final TimerTask task = new TimerTask() { @@ -51,17 +47,4 @@ public class RawClientLiveTest { System.out.println("HTTP Status of response: " + response.getStatusLine().getStatusCode()); } - // util - - final void configureViaHighLevelApi(final int timeout, final HttpParams httpParams) { - HttpConnectionParams.setConnectionTimeout(httpParams, timeout * 1000); // http.connection.timeout - HttpConnectionParams.setSoTimeout(httpParams, timeout * 1000); // http.socket.timeout - httpParams.setParameter(ClientPNames.CONN_MANAGER_TIMEOUT, new Long(timeout * 1000)); - } - - final void configureViaRawApi(final int timeout, final HttpParams httpParams) { - httpParams.setParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, timeout * 1000); - httpParams.setParameter(CoreConnectionPNames.SO_TIMEOUT, timeout * 1000); - httpParams.setParameter(ClientPNames.CONN_MANAGER_TIMEOUT, new Long(timeout * 1000)); - } } diff --git a/spring-security-rest-full/pom.xml b/spring-security-rest-full/pom.xml index 914cd5fd58..747550d4e3 100644 --- a/spring-security-rest-full/pom.xml +++ b/spring-security-rest-full/pom.xml @@ -223,7 +223,7 @@ 3.2.6.RELEASE - 3.1.4.RELEASE + 3.2.0.RELEASE 4.3.0.Final diff --git a/spring-security-rest-full/src/main/resources/webSecurityConfig.xml b/spring-security-rest-full/src/main/resources/webSecurityConfig.xml index de79430530..ce48352f3e 100644 --- a/spring-security-rest-full/src/main/resources/webSecurityConfig.xml +++ b/spring-security-rest-full/src/main/resources/webSecurityConfig.xml @@ -5,7 +5,7 @@ xmlns:beans="http://www.springframework.org/schema/beans" xsi:schemaLocation=" http://www.springframework.org/schema/security - http://www.springframework.org/schema/security/spring-security-3.1.xsd + http://www.springframework.org/schema/security/spring-security-3.2.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd"> diff --git a/spring-security-rest/pom.xml b/spring-security-rest/pom.xml index 11456654f5..a7eb3546b2 100644 --- a/spring-security-rest/pom.xml +++ b/spring-security-rest/pom.xml @@ -209,7 +209,7 @@ 3.2.6.RELEASE - 3.1.4.RELEASE + 3.2.0.RELEASE 4.3.0.Final diff --git a/spring-security-rest/src/main/resources/webSecurityConfig.xml b/spring-security-rest/src/main/resources/webSecurityConfig.xml index f53b15752c..841e609d49 100644 --- a/spring-security-rest/src/main/resources/webSecurityConfig.xml +++ b/spring-security-rest/src/main/resources/webSecurityConfig.xml @@ -3,7 +3,7 @@ xmlns:sec="http://www.springframework.org/schema/security" xsi:schemaLocation=" http://www.springframework.org/schema/security - http://www.springframework.org/schema/security/spring-security-3.1.xsd + http://www.springframework.org/schema/security/spring-security-3.2.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">