This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new e7181a5 [SYNCOPE-1455] Fix test certificate expiration
e7181a5 is described below
commit e7181a592f04a4eb2cb81b021d33318b6e4f7797
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Tue Jun 30 16:20:18 2020 +0200
[SYNCOPE-1455] Fix test certificate expiration
---
.../java/org/apache/syncope/sra/AbstractTest.java | 2 +-
.../org/apache/syncope/sra/RouteProviderTest.java | 8 ++++----
.../org/apache/syncope/sra/TLSRouteProviderTest.java | 10 ++++++----
sra/src/test/resources/client_pavel.p12 | Bin 5557 -> 0 bytes
sra/src/test/resources/keyStore.p12 | Bin 4173 -> 3892 bytes
sra/src/test/resources/trustStore.jks | Bin 1484 -> 1170 bytes
sra/src/test/resources/user.p12 | Bin 0 -> 3914 bytes
7 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/sra/src/test/java/org/apache/syncope/sra/AbstractTest.java
b/sra/src/test/java/org/apache/syncope/sra/AbstractTest.java
index 271f3de..b7526e0 100644
--- a/sra/src/test/java/org/apache/syncope/sra/AbstractTest.java
+++ b/sra/src/test/java/org/apache/syncope/sra/AbstractTest.java
@@ -52,7 +52,7 @@ public abstract class AbstractTest {
protected ConfigurableApplicationContext ctx;
@Value("${local.server.port}")
- protected int gatewayPort;
+ protected int sraPort;
@Value("${wiremock.server.port}")
protected int wiremockPort;
diff --git a/sra/src/test/java/org/apache/syncope/sra/RouteProviderTest.java
b/sra/src/test/java/org/apache/syncope/sra/RouteProviderTest.java
index bc89129..a5c0049 100644
--- a/sra/src/test/java/org/apache/syncope/sra/RouteProviderTest.java
+++ b/sra/src/test/java/org/apache/syncope/sra/RouteProviderTest.java
@@ -546,7 +546,7 @@ public class RouteProviderTest extends AbstractTest {
route.setKey("linkRewrite");
route.setTarget(URI.create("http://localhost:"; + wiremockPort));
route.getFilters().add(new
SRARouteFilter.Builder().factory(SRARouteFilterFactory.LINK_REWRITE).
- args("http://localhost:"; + gatewayPort).build());
+ args("http://localhost:"; + sraPort).build());
SyncopeCoreTestingServer.ROUTES.put(route.getKey(), route);
routeRefresher.refresh();
@@ -555,12 +555,12 @@ public class RouteProviderTest extends AbstractTest {
expectStatus().isOk().
expectBody().consumeWith(exchange -> {
assertTrue(new String(exchange.getResponseBody()).
- contains("<a href=\"http://localhost:"; +
gatewayPort + "/absolute\">"));
+ contains("<a href=\"http://localhost:"; + sraPort +
"/absolute\">"));
});
route.getFilters().clear();
route.getFilters().add(new
SRARouteFilter.Builder().factory(SRARouteFilterFactory.LINK_REWRITE).
- args("http://localhost:"; + gatewayPort + ",true").build());
+ args("http://localhost:"; + sraPort + ",true").build());
SyncopeCoreTestingServer.ROUTES.put(route.getKey(), route);
routeRefresher.refresh();
@@ -569,7 +569,7 @@ public class RouteProviderTest extends AbstractTest {
expectStatus().isOk().
expectBody().consumeWith(exchange -> {
assertTrue(new String(exchange.getResponseBody()).
- contains("<a href=\"http://localhost:"; +
gatewayPort + "/absolute\">"));
+ contains("<a href=\"http://localhost:"; + sraPort +
"/absolute\">"));
});
}
diff --git a/sra/src/test/java/org/apache/syncope/sra/TLSRouteProviderTest.java
b/sra/src/test/java/org/apache/syncope/sra/TLSRouteProviderTest.java
index 8733a24..3c82278 100644
--- a/sra/src/test/java/org/apache/syncope/sra/TLSRouteProviderTest.java
+++ b/sra/src/test/java/org/apache/syncope/sra/TLSRouteProviderTest.java
@@ -67,7 +67,7 @@ public class TLSRouteProviderTest extends AbstractTest {
HttpClient httpClient = HttpClient.create().
secure(sslContextSpec ->
sslContextSpec.sslContext(sslContext));
ClientHttpConnector connector = new
ReactorClientHttpConnector(httpClient);
- return
WebTestClient.bindToServer(connector).baseUrl("https://localhost:"; +
gatewayPort).build();
+ return
WebTestClient.bindToServer(connector).baseUrl("https://localhost:"; +
sraPort).build();
}
@BeforeEach
@@ -85,7 +85,7 @@ public class TLSRouteProviderTest extends AbstractTest {
CertificateException, UnrecoverableKeyException,
KeyManagementException {
KeyStore store = KeyStore.getInstance("PKCS12");
- store.load(getClass().getResourceAsStream("/client_pavel.p12"),
"password".toCharArray());
+ store.load(getClass().getResourceAsStream("/user.p12"),
"password".toCharArray());
KeyManagerFactory kmf =
KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
kmf.init(store, "password".toCharArray());
@@ -104,7 +104,8 @@ public class TLSRouteProviderTest extends AbstractTest {
route.getPredicates().add(new SRARoutePredicate.Builder().
factory(SRARoutePredicateFactory.METHOD).args("GET").build());
route.getPredicates().add(new SRARoutePredicate.Builder().
-
factory(SRARoutePredicateFactory.PATH).args("/getWithClientAuth").cond(SRARoutePredicateCond.AND).build());
+
factory(SRARoutePredicateFactory.PATH).args("/getWithClientAuth").
+ cond(SRARoutePredicateCond.AND).build());
route.getFilters().add(new SRARouteFilter.Builder().
factory(SRARouteFilterFactory.CLIENT_CERTS_TO_REQUEST_HEADER).build());
@@ -134,7 +135,8 @@ public class TLSRouteProviderTest extends AbstractTest {
route.getPredicates().add(new SRARoutePredicate.Builder().
factory(SRARoutePredicateFactory.METHOD).args("GET").build());
route.getPredicates().add(new SRARoutePredicate.Builder().
-
factory(SRARoutePredicateFactory.PATH).args("/withoutClientCert").cond(SRARoutePredicateCond.AND).build());
+
factory(SRARoutePredicateFactory.PATH).args("/withoutClientCert").cond(SRARoutePredicateCond.AND).
+ build());
route.getFilters().add(new SRARouteFilter.Builder().
factory(SRARouteFilterFactory.CLIENT_CERTS_TO_REQUEST_HEADER).build());
diff --git a/sra/src/test/resources/client_pavel.p12
b/sra/src/test/resources/client_pavel.p12
deleted file mode 100644
index b7958f2..0000000
Binary files a/sra/src/test/resources/client_pavel.p12 and /dev/null differ
diff --git a/sra/src/test/resources/keyStore.p12
b/sra/src/test/resources/keyStore.p12
index 85505b9..e9d70b6 100644
Binary files a/sra/src/test/resources/keyStore.p12 and
b/sra/src/test/resources/keyStore.p12 differ
diff --git a/sra/src/test/resources/trustStore.jks
b/sra/src/test/resources/trustStore.jks
index 6000a06..6fa6b49 100644
Binary files a/sra/src/test/resources/trustStore.jks and
b/sra/src/test/resources/trustStore.jks differ
diff --git a/sra/src/test/resources/user.p12 b/sra/src/test/resources/user.p12
new file mode 100644
index 0000000..08ea127
Binary files /dev/null and b/sra/src/test/resources/user.p12 differ
