diff options
6 files changed, 84 insertions, 2 deletions
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 e63cda7b..6bf2d399 100644 --- a/connector/src/test/resources/config/junit_config_1_springboot.properties +++ b/connector/src/test/resources/config/junit_config_1_springboot.properties @@ -81,3 +81,40 @@ eidas.ms.sp.1.pvp2.metadata.url=http://junit.test/metadata eidas.ms.sp.1.policy.allowed.requested.targets=test eidas.ms.sp.1.policy.hasBaseIdTransferRestriction=true +## PVP2 S-Profile client configuration +#eidas.ms.modules.eidascentralauth.keystore.type=jks +#eidas.ms.modules.eidascentralauth.keystore.path=keys/junit.jks1 +#eidas.ms.modules.eidascentralauth.keystore.password=password +#eidas.ms.modules.eidascentralauth.key.metadata.alias=meta +#eidas.ms.modules.eidascentralauth.key.metadata.password=password +#eidas.ms.modules.eidascentralauth.key.signing.alias=sig +#eidas.ms.modules.eidascentralauth.key.signing.password=password +#eidas.ms.modules.eidascentralauth.metadata.validity=24 + +#file:src/test/resources/config/junit_config_1_springboot.properties +#eidas.ms.modules.eidascentralauth.keystore.path=src/test/resources/config/junit_test.jks +eidas.ms.modules.eidascentralauth.keystore.path=keys/junit_test.jks +eidas.ms.modules.eidascentralauth.keystore.password=password +eidas.ms.modules.eidascentralauth.keystore.type=jks + +eidas.ms.modules.eidascentralauth.metadata.sign.alias=meta +eidas.ms.modules.eidascentralauth.metadata.sign.password=password +eidas.ms.modules.eidascentralauth.request.sign.alias=sig +eidas.ms.modules.eidascentralauth.request.sign.password=password +eidas.ms.modules.eidascentralauth.response.encryption.alias=enc +eidas.ms.modules.eidascentralauth.response.encryption.password=password + +eidas.ms.modules.eidascentralauth.truststore.path=src/test/resources/config/junit_test.jks +eidas.ms.modules.eidascentralauth.truststore.password=password +eidas.ms.modules.eidascentralauth.truststore.type=jks + +eidas.ms.modules.eidascentralauth.node.entityId= +eidas.ms.modules.eidascentralauth.node.metadataUrl= + +eidas.ms.modules.eidascentralauth.metadata.organisation.name=JUnit +eidas.ms.modules.eidascentralauth.metadata.organisation.friendyname=For testing with jUnit +eidas.ms.modules.eidascentralauth.metadata.organisation.url=http://junit.test +eidas.ms.modules.eidascentralauth.metadata.contact.givenname=Max +eidas.ms.modules.eidascentralauth.metadata.contact.surname=Mustermann +eidas.ms.modules.eidascentralauth.metadata.contact.email=max@junit.test + 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 ecb22dec..da82b92b 100644 --- a/connector/src/test/resources/config/junit_config_2_springboot.properties +++ b/connector/src/test/resources/config/junit_config_2_springboot.properties @@ -81,3 +81,41 @@ eidas.ms.sp.1.pvp2.metadata.url=http://junit.test/metadata eidas.ms.sp.1.policy.allowed.requested.targets=test eidas.ms.sp.1.policy.hasBaseIdTransferRestriction=true + +## PVP2 S-Profile client configuration +#eidas.ms.modules.eidascentralauth.keystore.type=jks +#eidas.ms.modules.eidascentralauth.keystore.path=keys/junit.jks1 +#eidas.ms.modules.eidascentralauth.keystore.password=password +#eidas.ms.modules.eidascentralauth.key.metadata.alias=meta +#eidas.ms.modules.eidascentralauth.key.metadata.password=password +#eidas.ms.modules.eidascentralauth.key.signing.alias=sig +#eidas.ms.modules.eidascentralauth.key.signing.password=password +#eidas.ms.modules.eidascentralauth.metadata.validity=24 + +#file:src/test/resources/config/junit_config_1_springboot.properties +#eidas.ms.modules.eidascentralauth.keystore.path=src/test/resources/config/junit_test.jks +eidas.ms.modules.eidascentralauth.keystore.path=keys/junit_test.jks +eidas.ms.modules.eidascentralauth.keystore.password=password +eidas.ms.modules.eidascentralauth.keystore.type=jks + +eidas.ms.modules.eidascentralauth.metadata.sign.alias=meta +eidas.ms.modules.eidascentralauth.metadata.sign.password=password +eidas.ms.modules.eidascentralauth.request.sign.alias=sig +eidas.ms.modules.eidascentralauth.request.sign.password=password +eidas.ms.modules.eidascentralauth.response.encryption.alias=enc +eidas.ms.modules.eidascentralauth.response.encryption.password=password + +eidas.ms.modules.eidascentralauth.truststore.path=src/test/resources/config/junit_test.jks +eidas.ms.modules.eidascentralauth.truststore.password=password +eidas.ms.modules.eidascentralauth.truststore.type=jks + +eidas.ms.modules.eidascentralauth.node.entityId= +eidas.ms.modules.eidascentralauth.node.metadataUrl= + +eidas.ms.modules.eidascentralauth.metadata.organisation.name=JUnit +eidas.ms.modules.eidascentralauth.metadata.organisation.friendyname=For testing with jUnit +eidas.ms.modules.eidascentralauth.metadata.organisation.url=http://junit.test +eidas.ms.modules.eidascentralauth.metadata.contact.givenname=Max +eidas.ms.modules.eidascentralauth.metadata.contact.surname=Mustermann +eidas.ms.modules.eidascentralauth.metadata.contact.email=max@junit.test + diff --git a/connector/src/test/resources/config/keys/junit_test.jks b/connector/src/test/resources/config/keys/junit_test.jks Binary files differnew file mode 100644 index 00000000..ee6254a9 --- /dev/null +++ b/connector/src/test/resources/config/keys/junit_test.jks diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/mobilesig/EidasCentralAuthConstants.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/mobilesig/EidasCentralAuthConstants.java index e4d520b4..ef7f667c 100644 --- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/mobilesig/EidasCentralAuthConstants.java +++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/mobilesig/EidasCentralAuthConstants.java @@ -34,7 +34,7 @@ public class EidasCentralAuthConstants { public static final String CONFIG_PROPS_KEYSTORE_TYPE = CONFIG_PROPS_PREFIX + "keystore.type"; public static final String CONFIG_PROPS_KEYSTORE_NAME = CONFIG_PROPS_PREFIX + "keystore.name"; public static final String CONFIG_PROPS_KEYSTORE_PATH = CONFIG_PROPS_PREFIX + "keystore.path"; - public static final String CONFIG_PROPS_KEYSTOREPASSWORD = CONFIG_PROPS_PREFIX + "keystore.password"; + public static final String CONFIG_PROPS_KEYSTORE_PASSWORD = CONFIG_PROPS_PREFIX + "keystore.password"; public static final String CONFIG_PROPS_SIGN_METADATA_KEY_PASSWORD = CONFIG_PROPS_PREFIX + "metadata.sign.password"; public static final String CONFIG_PROPS_SIGN_METADATA_ALIAS = CONFIG_PROPS_PREFIX diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/mobilesig/EidasCentralAuthCredentialProvider.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/mobilesig/EidasCentralAuthCredentialProvider.java index 13c84bc5..81ef82ed 100644 --- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/mobilesig/EidasCentralAuthCredentialProvider.java +++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/mobilesig/EidasCentralAuthCredentialProvider.java @@ -32,7 +32,7 @@ public class EidasCentralAuthCredentialProvider extends AbstractCredentialProvid authConfig.getBasicConfiguration(EidasCentralAuthConstants.CONFIG_PROPS_KEYSTORE_NAME)); keyStoreConfig.setSoftKeyStoreFilePath(getKeyStoreFilePath()); keyStoreConfig.setSoftKeyStorePassword( - authConfig.getBasicConfiguration(EidasCentralAuthConstants.CONFIG_PROPS_KEYSTOREPASSWORD)); + authConfig.getBasicConfiguration(EidasCentralAuthConstants.CONFIG_PROPS_KEYSTORE_PASSWORD)); return keyStoreConfig; diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml index e1e3aedd..dd0e1345 100644 --- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml +++ b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml @@ -137,4 +137,11 @@ <bean id="eidasCentralAuthCredentialProvider" class="at.asitplus.eidas.specific.modules.auth.eidas.v2.mobilesig.EidasCentralAuthCredentialProvider" /> + <bean id="eidasCentralAuthMetadataProvider" + class=" at.asitplus.eidas.specific.modules.auth.eidas.v2.mobilesig.EidasCentralAuthMetadataProvider" /> + + <bean id="eidasCentralAuthMetadataController" + class=" at.asitplus.eidas.specific.modules.auth.eidas.v2.mobilesig.EidasCentralAuthMetadataController" /> + + </beans>
\ No newline at end of file |