From a988c0af75d96fdf03337b47a68b3a7876abfbac Mon Sep 17 00:00:00 2001 From: Thomas <> Date: Thu, 12 May 2022 13:56:38 +0200 Subject: refact(ernp): change configuration keys for SSL keystore --- .../src/main/resources/application.properties | 30 +++++++++++++++++----- .../config/junit_config_1_springboot.properties | 10 ++++---- .../config/junit_config_2_springboot.properties | 10 ++++---- 3 files changed, 33 insertions(+), 17 deletions(-) (limited to 'connector') diff --git a/connector/src/main/resources/application.properties b/connector/src/main/resources/application.properties index 7b624d40..b4cb3bab 100644 --- a/connector/src/main/resources/application.properties +++ b/connector/src/main/resources/application.properties @@ -77,8 +77,13 @@ eidas.ms.auth.eIDAS.node_v2.loa.requested.minimum=http://eidas.europa.eu/LoA/hig #eidas.ms.auth.eIDAS.szrclient.useTestService=true #eidas.ms.auth.eIDAS.szrclient.endpoint.prod= #eidas.ms.auth.eIDAS.szrclient.endpoint.test=http://localhost:1234/demoszr +#eidas.ms.auth.eIDAS.szrclient.ssl.keyStore.type=jks #eidas.ms.auth.eIDAS.szrclient.ssl.keyStore.path=keys/junit.jks #eidas.ms.auth.eIDAS.szrclient.ssl.keyStore.password=password +#eidas.ms.auth.eIDAS.szrclient.ssl.key.alias= +#eidas.ms.auth.eIDAS.szrclient.ssl.key.password= + +#eidas.ms.auth.eIDAS.szrclient.ssl.trustStore.type= #eidas.ms.auth.eIDAS.szrclient.ssl.trustStore.path= #eidas.ms.auth.eIDAS.szrclient.ssl.trustStore.password= eidas.ms.auth.eIDAS.szrclient.timeout.connection=15 @@ -105,21 +110,32 @@ eidas.ms.auth.eIDAS.szrclient.eidasbind.mds.inject=false #eidas.ms.auth.eIDAS.zmrclient.ssl.keyStore.type=jks #eidas.ms.auth.eIDAS.zmrclient.ssl.keyStore.path=keys/junit.jks #eidas.ms.auth.eIDAS.zmrclient.ssl.keyStore.password=password +#eidas.ms.auth.eIDAS.zmrclient.ssl.key.alias= +#eidas.ms.auth.eIDAS.zmrclient.ssl.key.password= + +#eidas.ms.auth.eIDAS.zmrclient.ssl.trustStore.type= #eidas.ms.auth.eIDAS.zmrclient.ssl.trustStore.path= #eidas.ms.auth.eIDAS.zmrclient.ssl.trustStore.password= +eidas.ms.auth.eIDAS.zmrclient.timeout.connection=15 +eidas.ms.auth.eIDAS.zmrclient.timeout.response=30 + #eidas.ms.auth.eIDAS.zmrclient.req.organisation.behoerdennr=jUnit123456 -#eidas.ms.auth.eIDAS.zmrclient.req.update.reason.code=PERS_AENDERN -#eidas.ms.auth.eIDAS.zmrclient.req.update.reason.text=KITT for eIDAS Matching +eidas.ms.auth.eIDAS.zmrclient.req.update.reason.code=PERS_AENDERN +eidas.ms.auth.eIDAS.zmrclient.req.update.reason.text=KITT for eIDAS Matching +eidas.ms.auth.eIDAS.zmrclient.debug.logfullmessages=false + # ERnP communication #eidas.ms.auth.eIDAS.ernpclient.endpoint=http://localhost:1718/demoernp #eidas.ms.auth.eIDAS.ernpclient.req.organisation.behoerdennr=jUnit123456 -#eidas.ms.auth.eIDAS.client.common.ssl.keyStore.type=jks -#eidas.ms.auth.eIDAS.client.common.ssl.keyStore.path=../keystore/junit_test.jks -#eidas.ms.auth.eIDAS.client.common.ssl.keyStore.password=password -#eidas.ms.auth.eIDAS.client.common.ssl.key.alias=meta -#eidas.ms.auth.eIDAS.client.common.ssl.key.password=password +#eidas.ms.auth.eIDAS.ernpclient.ssl.keyStore.type=jks +#eidas.ms.auth.eIDAS.ernpclient.ssl.keyStore.path=../keystore/junit_test.jks +#eidas.ms.auth.eIDAS.ernpclient.ssl.keyStore.password=password +#eidas.ms.auth.eIDAS.ernpclient.ssl.key.alias=meta +#eidas.ms.auth.eIDAS.ernpclient.ssl.key.password=password +eidas.ms.client.http.connection.timeout.request=15 +eidas.ms.client.http.connection.timeout.socket=30 diff --git a/connector/src/test/resources/config/junit_config_1_springboot.properties b/connector/src/test/resources/config/junit_config_1_springboot.properties index d3f0d136..91e6d2bb 100644 --- a/connector/src/test/resources/config/junit_config_1_springboot.properties +++ b/connector/src/test/resources/config/junit_config_1_springboot.properties @@ -58,11 +58,11 @@ eidas.ms.auth.eIDAS.zmrclient.req.update.reason.code=EIDAS-KITT # ERnP communication eidas.ms.auth.eIDAS.ernpclient.endpoint=http://localhost:1718/demoernp eidas.ms.auth.eIDAS.ernpclient.req.organisation.behoerdennr=jUnit123456 -eidas.ms.auth.eIDAS.client.common.ssl.keyStore.type=jks -eidas.ms.auth.eIDAS.client.common.ssl.keyStore.path=keys/junit.jks -eidas.ms.auth.eIDAS.client.common.ssl.keyStore.password=password -eidas.ms.auth.eIDAS.client.common.ssl.key.alias=meta -eidas.ms.auth.eIDAS.client.common.ssl.key.password=password +eidas.ms.auth.eIDAS.ernpclient.ssl.keyStore.type=jks +eidas.ms.auth.eIDAS.ernpclient.ssl.keyStore.path=keys/junit.jks +eidas.ms.auth.eIDAS.ernpclient.ssl.keyStore.password=password +eidas.ms.auth.eIDAS.ernpclient.ssl.key.alias=meta +eidas.ms.auth.eIDAS.ernpclient.ssl.key.password=password diff --git a/connector/src/test/resources/config/junit_config_2_springboot.properties b/connector/src/test/resources/config/junit_config_2_springboot.properties index 71a573e0..1569f0f6 100644 --- a/connector/src/test/resources/config/junit_config_2_springboot.properties +++ b/connector/src/test/resources/config/junit_config_2_springboot.properties @@ -58,11 +58,11 @@ eidas.ms.auth.eIDAS.zmrclient.req.update.reason.code=EIDAS-KITT # ERnP communication eidas.ms.auth.eIDAS.ernpclient.endpoint=http://localhost:1718/demoernp eidas.ms.auth.eIDAS.ernpclient.req.organisation.behoerdennr=jUnit123456 -eidas.ms.auth.eIDAS.client.common.ssl.keyStore.type=jks -eidas.ms.auth.eIDAS.client.common.ssl.keyStore.path=keys/junit.jks -eidas.ms.auth.eIDAS.client.common.ssl.keyStore.password=password -eidas.ms.auth.eIDAS.client.common.ssl.key.alias=meta -eidas.ms.auth.eIDAS.client.common.ssl.key.password=password +eidas.ms.auth.eIDAS.ernpclient.ssl.keyStore.type=jks +eidas.ms.auth.eIDAS.ernpclient.ssl.keyStore.path=keys/junit.jks +eidas.ms.auth.eIDAS.ernpclient.ssl.keyStore.password=password +eidas.ms.auth.eIDAS.ernpclient.ssl.key.alias=meta +eidas.ms.auth.eIDAS.ernpclient.ssl.key.password=password ## PVP2 S-Profile end-point configuration -- cgit v1.2.3