Skip to content

Commit f58149a

Browse files
author
eugenp
committed
upgrades to spring security 3.2 - testing work as well
1 parent 56240e0 commit f58149a

14 files changed

Lines changed: 30 additions & 59 deletions

File tree

‎spring-rest/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
<properties>
140140
<!-- Spring -->
141141
<org.springframework.version>3.2.6.RELEASE</org.springframework.version>
142-
<org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
142+
<org.springframework.security.version>3.2.0.RELEASE</org.springframework.security.version>
143143

144144
<!-- persistence -->
145145
<hibernate.version>4.3.0.Final</hibernate.version>

‎spring-security-rest-basic-auth/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@
287287
<properties>
288288
<!-- Spring -->
289289
<org.springframework.version>3.2.6.RELEASE</org.springframework.version>
290-
<org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
290+
<org.springframework.security.version>3.2.0.RELEASE</org.springframework.security.version>
291291

292292
<!-- persistence -->
293293
<hibernate.version>4.3.0.Final</hibernate.version>

‎spring-security-rest-basic-auth/src/main/resources/webSecurityConfig.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
33
xsi:schemaLocation="
44
http://www.springframework.org/schema/security
5-
http://www.springframework.org/schema/security/spring-security-3.1.xsd
5+
http://www.springframework.org/schema/security/spring-security-3.2.xsd
66
http://www.springframework.org/schema/beans
77
http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
88

‎spring-security-rest-basic-auth/src/test/java/org/baeldung/client/ClientLiveTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import org.apache.http.impl.client.DefaultHttpClient;
1616
import org.baeldung.client.spring.ClientConfig;
1717
import org.baeldung.web.dto.Foo;
18+
import org.junit.Ignore;
1819
import org.junit.Test;
1920
import org.junit.runner.RunWith;
2021
import org.springframework.beans.factory.annotation.Autowired;
@@ -54,6 +55,7 @@ public final void whenHttpsUrlIsConsumed_thenException() {
5455
}
5556

5657
@Test
58+
@Ignore("Only to run against a Server with HTTPS enabled (on 8443)")
5759
public final void givenAcceptingAllCertificates_whenHttpsUrlIsConsumed_thenException() throws GeneralSecurityException {
5860
final HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory();
5961
final DefaultHttpClient httpClient = (DefaultHttpClient) requestFactory.getHttpClient();

‎spring-security-rest-basic-auth/src/test/java/org/baeldung/client/RawClientLiveTest.java‎

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@
1313

1414
import org.apache.http.HttpResponse;
1515
import org.apache.http.client.ClientProtocolException;
16+
import org.apache.http.client.config.RequestConfig;
1617
import org.apache.http.client.methods.HttpGet;
17-
import org.apache.http.client.params.ClientPNames;
1818
import org.apache.http.conn.ClientConnectionManager;
1919
import org.apache.http.conn.scheme.Scheme;
2020
import org.apache.http.conn.scheme.SchemeRegistry;
2121
import org.apache.http.conn.ssl.SSLSocketFactory;
2222
import org.apache.http.conn.ssl.TrustStrategy;
23+
import org.apache.http.impl.client.CloseableHttpClient;
2324
import org.apache.http.impl.client.DefaultHttpClient;
25+
import org.apache.http.impl.client.HttpClientBuilder;
2426
import org.apache.http.impl.conn.PoolingClientConnectionManager;
25-
import org.apache.http.params.CoreConnectionPNames;
26-
import org.apache.http.params.HttpConnectionParams;
27-
import org.apache.http.params.HttpParams;
27+
import org.junit.Ignore;
2828
import org.junit.Test;
2929

3030
public class RawClientLiveTest {
@@ -33,14 +33,12 @@ public class RawClientLiveTest {
3333

3434
@Test
3535
public final void whenSecuredRestApiIsConsumed_then200OK() throws ClientProtocolException, IOException {
36-
final DefaultHttpClient httpClient = new DefaultHttpClient();
36+
final CloseableHttpClient httpClient = HttpClientBuilder.create().build();
3737

3838
final int timeout = 20; // seconds
39-
final HttpParams httpParams = httpClient.getParams();
40-
configureViaRawApi(timeout, httpParams);
41-
// configureViaHighLevelApi(timeout, httpParams);
42-
39+
final RequestConfig requestConfig = RequestConfig.custom().setConnectionRequestTimeout(timeout).setConnectTimeout(timeout).setSocketTimeout(timeout).build();
4340
final HttpGet getMethod = new HttpGet("http://localhost:8080/spring-security-rest-basic-auth/api/bars/1");
41+
getMethod.setConfig(requestConfig);
4442

4543
final int hardTimeout = 5; // seconds
4644
final TimerTask task = new TimerTask() {
@@ -58,8 +56,9 @@ public void run() {
5856
}
5957

6058
@Test(expected = SSLPeerUnverifiedException.class)
59+
@Ignore("Only for a server that has HTTPS enabled (on 8443)")
6160
public final void whenHttpsUrlIsConsumed_thenException() throws ClientProtocolException, IOException {
62-
final DefaultHttpClient httpClient = new DefaultHttpClient();
61+
final CloseableHttpClient httpClient = HttpClientBuilder.create().build();
6362

6463
final String urlOverHttps = "https://localhost:8443/spring-security-rest-basic-auth/api/bars/1";
6564
final HttpGet getMethod = new HttpGet(urlOverHttps);
@@ -80,25 +79,12 @@ public final boolean isTrusted(final X509Certificate[] certificate, final String
8079
registry.register(new Scheme("https", 8443, sf));
8180
final ClientConnectionManager ccm = new PoolingClientConnectionManager(registry);
8281

83-
final DefaultHttpClient httpClient = new DefaultHttpClient(ccm);
82+
final CloseableHttpClient httpClient = new DefaultHttpClient(ccm);
8483

8584
final String urlOverHttps = "https://localhost:8443/spring-security-rest-basic-auth/api/bars/1";
8685
final HttpGet getMethod = new HttpGet(urlOverHttps);
8786
final HttpResponse response = httpClient.execute(getMethod);
8887
assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
8988
}
9089

91-
// util
92-
93-
final void configureViaHighLevelApi(final int timeout, final HttpParams httpParams) {
94-
HttpConnectionParams.setConnectionTimeout(httpParams, timeout * 1000); // http.connection.timeout
95-
HttpConnectionParams.setSoTimeout(httpParams, timeout * 1000); // http.socket.timeout
96-
httpParams.setParameter(ClientPNames.CONN_MANAGER_TIMEOUT, new Long(timeout * 1000));
97-
}
98-
99-
final void configureViaRawApi(final int timeout, final HttpParams httpParams) {
100-
httpParams.setParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, timeout * 1000);
101-
httpParams.setParameter(CoreConnectionPNames.SO_TIMEOUT, timeout * 1000);
102-
httpParams.setParameter(ClientPNames.CONN_MANAGER_TIMEOUT, new Long(timeout * 1000));
103-
}
10490
}

‎spring-security-rest-custom/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@
243243
<properties>
244244
<!-- Spring -->
245245
<org.springframework.version>3.2.6.RELEASE</org.springframework.version>
246-
<org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
246+
<org.springframework.security.version>3.2.0.RELEASE</org.springframework.security.version>
247247

248248
<!-- persistence -->
249249
<hibernate.version>4.3.0.Final</hibernate.version>

‎spring-security-rest-custom/src/main/resources/webSecurityConfig.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
33
xsi:schemaLocation="
44
http://www.springframework.org/schema/security
5-
http://www.springframework.org/schema/security/spring-security-3.1.xsd
5+
http://www.springframework.org/schema/security/spring-security-3.2.xsd
66
http://www.springframework.org/schema/beans
77
http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
88

‎spring-security-rest-digest-auth/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@
276276
<properties>
277277
<!-- Spring -->
278278
<org.springframework.version>3.2.6.RELEASE</org.springframework.version>
279-
<org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
279+
<org.springframework.security.version>3.2.0.RELEASE</org.springframework.security.version>
280280

281281
<!-- persistence -->
282282
<hibernate.version>4.3.0.Final</hibernate.version>

‎spring-security-rest-digest-auth/src/main/resources/webSecurityConfig.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
33
xsi:schemaLocation="
44
http://www.springframework.org/schema/security
5-
http://www.springframework.org/schema/security/spring-security-3.1.xsd
5+
http://www.springframework.org/schema/security/spring-security-3.2.xsd
66
http://www.springframework.org/schema/beans
77
http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
88

‎spring-security-rest-digest-auth/src/test/java/org/baeldung/client/RawClientLiveTest.java‎

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@
66

77
import org.apache.http.HttpResponse;
88
import org.apache.http.client.ClientProtocolException;
9+
import org.apache.http.client.config.RequestConfig;
910
import org.apache.http.client.methods.HttpGet;
10-
import org.apache.http.client.params.ClientPNames;
11-
import org.apache.http.impl.client.DefaultHttpClient;
12-
import org.apache.http.params.CoreConnectionPNames;
13-
import org.apache.http.params.HttpConnectionParams;
14-
import org.apache.http.params.HttpParams;
11+
import org.apache.http.impl.client.CloseableHttpClient;
12+
import org.apache.http.impl.client.HttpClientBuilder;
1513
import org.baeldung.client.spring.ClientConfig;
1614
import org.junit.Test;
1715
import org.junit.runner.RunWith;
@@ -27,14 +25,12 @@ public class RawClientLiveTest {
2725

2826
@Test
2927
public final void whenSecuredRestApiIsConsumed_then200OK() throws ClientProtocolException, IOException {
30-
final DefaultHttpClient httpClient = new DefaultHttpClient();
28+
final CloseableHttpClient httpClient = HttpClientBuilder.create().build();
3129

3230
final int timeout = 20; // seconds
33-
final HttpParams httpParams = httpClient.getParams();
34-
configureViaRawApi(timeout, httpParams);
35-
// configureViaHighLevelApi(timeout, httpParams);
36-
37-
final HttpGet getMethod = new HttpGet("http://localhost:8080/spring-security-rest-digest-auth/api/bars/1");
31+
final RequestConfig requestConfig = RequestConfig.custom().setConnectionRequestTimeout(timeout).setConnectTimeout(timeout).setSocketTimeout(timeout).build();
32+
final HttpGet getMethod = new HttpGet("http://localhost:8080/spring-security-rest-basic-auth/api/bars/1");
33+
getMethod.setConfig(requestConfig);
3834

3935
final int hardTimeout = 5; // seconds
4036
final TimerTask task = new TimerTask() {
@@ -51,17 +47,4 @@ public void run() {
5147
System.out.println("HTTP Status of response: " + response.getStatusLine().getStatusCode());
5248
}
5349

54-
// util
55-
56-
final void configureViaHighLevelApi(final int timeout, final HttpParams httpParams) {
57-
HttpConnectionParams.setConnectionTimeout(httpParams, timeout * 1000); // http.connection.timeout
58-
HttpConnectionParams.setSoTimeout(httpParams, timeout * 1000); // http.socket.timeout
59-
httpParams.setParameter(ClientPNames.CONN_MANAGER_TIMEOUT, new Long(timeout * 1000));
60-
}
61-
62-
final void configureViaRawApi(final int timeout, final HttpParams httpParams) {
63-
httpParams.setParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, timeout * 1000);
64-
httpParams.setParameter(CoreConnectionPNames.SO_TIMEOUT, timeout * 1000);
65-
httpParams.setParameter(ClientPNames.CONN_MANAGER_TIMEOUT, new Long(timeout * 1000));
66-
}
6750
}

0 commit comments

Comments
 (0)