Disable TLS v1.3 for integration tests

Author: adrienlauer

pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.poms</groupId>
         <artifactId>parent-internal</artifactId>
-        <version>3.4.5</version>
+        <version>3.4.6</version>
     </parent>
 
     <groupId>org.seedstack.seed</groupId>
@@ -43,6 +43,8 @@
         <compatibility.version>3.1.0</compatibility.version>
 
         <bintray.package>seed</bintray.package>
+        <!-- TODO remove the limitation to TLSv1.2 below once built on JDK 12 -->
+        <itArgLine>-Djdk.tls.client.protocols="TLSv1,TLSv1.1,TLSv1.2"</itArgLine>
     </properties>
 
     <modules>

web/security/src/test/java/org/seedstack/seed/web/security/WebSecurityIT.java

@@ -11,14 +11,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.restassured.RestAssured;
-import io.restassured.config.HttpClientConfig;
 import io.restassured.config.SSLConfig;
 import io.restassured.http.ContentType;
 import io.restassured.specification.RequestSpecification;
 import java.security.KeyStore;
 import javax.inject.Inject;
 import javax.inject.Named;
-import org.apache.http.params.CoreConnectionPNames;
 import org.junit.After;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -115,10 +113,6 @@ public void loginSuccessShouldRedirect() {
 
     private RequestSpecification givenRelaxedSSL() {
         return RestAssured.given()
-                .config(RestAssured.config()
-                        .sslConfig(SSLConfig.sslConfig().relaxedHTTPSValidation("SSL"))
-                        .httpClient(HttpClientConfig.httpClientConfig()
-                                .setParam(CoreConnectionPNames.SO_TIMEOUT, 5000))
-                );
+                .config(RestAssured.config().sslConfig(SSLConfig.sslConfig().relaxedHTTPSValidation()));
     }
 }

web/security/src/test/java/org/seedstack/seed/web/security/XsrfIT.java

@@ -9,11 +9,9 @@
 package org.seedstack.seed.web.security;
 
 import io.restassured.RestAssured;
-import io.restassured.config.HttpClientConfig;
 import io.restassured.config.SSLConfig;
 import io.restassured.response.Response;
 import io.restassured.specification.RequestSpecification;
-import org.apache.http.params.CoreConnectionPNames;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.seedstack.seed.Configuration;
@@ -106,10 +104,6 @@ private Response initiateSession() {
 
     private RequestSpecification givenRelaxedSSL() {
         return RestAssured.given()
-                .config(RestAssured.config()
-                        .sslConfig(SSLConfig.sslConfig().relaxedHTTPSValidation("SSL"))
-                        .httpClient(HttpClientConfig.httpClientConfig()
-                                .setParam(CoreConnectionPNames.SO_TIMEOUT, 5000))
-                );
+                .config(RestAssured.config().sslConfig(SSLConfig.sslConfig().relaxedHTTPSValidation()));
     }
 }

web/undertow/src/test/java/org/seedstack/seed/undertow/HttpsIT.java

@@ -9,21 +9,15 @@
 package org.seedstack.seed.undertow;
 
 import io.restassured.RestAssured;
-import io.restassured.config.HttpClientConfig;
 import io.restassured.config.SSLConfig;
 import io.restassured.specification.ResponseSpecification;
-import org.apache.http.params.CoreConnectionPNames;
 import org.seedstack.seed.testing.ConfigurationProfiles;
 
 @ConfigurationProfiles("https")
 public class HttpsIT extends AbstractUndertowIT {
     ResponseSpecification expect() {
         return RestAssured.given()
-                .config(RestAssured.config()
-                        .sslConfig(SSLConfig.sslConfig().relaxedHTTPSValidation("SSL"))
-                        .httpClient(HttpClientConfig.httpClientConfig()
-                                .setParam(CoreConnectionPNames.SO_TIMEOUT, 5000))
-                )
+                .config(RestAssured.config().sslConfig(SSLConfig.sslConfig().relaxedHTTPSValidation()))
                 .expect();
     }
 }

web/undertow/src/test/java/org/seedstack/seed/undertow/RefreshIT.java

@@ -10,11 +10,9 @@
 
 import com.google.inject.Injector;
 import io.restassured.RestAssured;
-import io.restassured.config.HttpClientConfig;
 import io.restassured.config.SSLConfig;
 import io.restassured.response.Response;
 import io.restassured.specification.ResponseSpecification;
-import org.apache.http.params.CoreConnectionPNames;
 import org.assertj.core.api.Assertions;
 import org.junit.After;
 import org.junit.Before;
@@ -62,11 +60,7 @@ private void checkServer(int port) {
 
     private ResponseSpecification expect() {
         return RestAssured.given()
-                .config(RestAssured.config().sslConfig(SSLConfig
-                        .sslConfig().relaxedHTTPSValidation("SSL"))
-                        .httpClient(HttpClientConfig.httpClientConfig()
-                                .setParam(CoreConnectionPNames.SO_TIMEOUT, 5000))
-                )
+                .config(RestAssured.config().sslConfig(SSLConfig.sslConfig().relaxedHTTPSValidation()))
                 .expect();
     }
 }