diff options
13 files changed, 137 insertions, 141 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 6bf2d399..1cfeef37 100644 --- a/connector/src/test/resources/config/junit_config_1_springboot.properties +++ b/connector/src/test/resources/config/junit_config_1_springboot.properties @@ -82,39 +82,37 @@ 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 +#eidas.ms.modules.idaustriaclient.keystore.type=jks +#eidas.ms.modules.idaustriaclient.keystore.path=keys/junit.jks1 +#eidas.ms.modules.idaustriaclient.keystore.password=password +#eidas.ms.modules.idaustriaclient.key.metadata.alias=meta +#eidas.ms.modules.idaustriaclient.key.metadata.password=password +#eidas.ms.modules.idaustriaclient.key.signing.alias=sig +#eidas.ms.modules.idaustriaclient.key.signing.password=password +#eidas.ms.modules.idaustriaclient.metadata.validity=24 + +eidas.ms.modules.idaustriaclient.keystore.path=keys/junit_test.jks +eidas.ms.modules.idaustriaclient.keystore.password=password +eidas.ms.modules.idaustriaclient.keystore.type=jks + +eidas.ms.modules.idaustriaclient.metadata.sign.alias=meta +eidas.ms.modules.idaustriaclient.metadata.sign.password=password +eidas.ms.modules.idaustriaclient.request.sign.alias=sig +eidas.ms.modules.idaustriaclient.request.sign.password=password +eidas.ms.modules.idaustriaclient.response.encryption.alias=enc +eidas.ms.modules.idaustriaclient.response.encryption.password=password + +eidas.ms.modules.idaustriaclient.truststore.path=keys/junit_test.jks +eidas.ms.modules.idaustriaclient.truststore.password=password +eidas.ms.modules.idaustriaclient.truststore.type=jks + +eidas.ms.modules.idaustriaclient.node.entityId= +eidas.ms.modules.idaustriaclient.node.metadataUrl= + +eidas.ms.modules.idaustriaclient.metadata.organisation.name=JUnit +eidas.ms.modules.idaustriaclient.metadata.organisation.friendyname=For testing with jUnit +eidas.ms.modules.idaustriaclient.metadata.organisation.url=http://junit.test +eidas.ms.modules.idaustriaclient.metadata.contact.givenname=Max +eidas.ms.modules.idaustriaclient.metadata.contact.surname=Mustermann +eidas.ms.modules.idaustriaclient.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 da82b92b..4c2be39b 100644 --- a/connector/src/test/resources/config/junit_config_2_springboot.properties +++ b/connector/src/test/resources/config/junit_config_2_springboot.properties @@ -83,39 +83,37 @@ 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 +#eidas.ms.modules.idaustriaclient.keystore.type=jks +#eidas.ms.modules.idaustriaclient.keystore.path=keys/junit.jks1 +#eidas.ms.modules.idaustriaclient.keystore.password=password +#eidas.ms.modules.idaustriaclient.key.metadata.alias=meta +#eidas.ms.modules.idaustriaclient.key.metadata.password=password +#eidas.ms.modules.idaustriaclient.key.signing.alias=sig +#eidas.ms.modules.idaustriaclient.key.signing.password=password +#eidas.ms.modules.idaustriaclient.metadata.validity=24 + +eidas.ms.modules.idaustriaclient.keystore.path=keys/junit_test.jks +eidas.ms.modules.idaustriaclient.keystore.password=password +eidas.ms.modules.idaustriaclient.keystore.type=jks + +eidas.ms.modules.idaustriaclient.metadata.sign.alias=meta +eidas.ms.modules.idaustriaclient.metadata.sign.password=password +eidas.ms.modules.idaustriaclient.request.sign.alias=sig +eidas.ms.modules.idaustriaclient.request.sign.password=password +eidas.ms.modules.idaustriaclient.response.encryption.alias=enc +eidas.ms.modules.idaustriaclient.response.encryption.password=password + +eidas.ms.modules.idaustriaclient.truststore.path=keys/junit_test.jks +eidas.ms.modules.idaustriaclient.truststore.password=password +eidas.ms.modules.idaustriaclient.truststore.type=jks + +eidas.ms.modules.idaustriaclient.node.entityId= +eidas.ms.modules.idaustriaclient.node.metadataUrl= + +eidas.ms.modules.idaustriaclient.metadata.organisation.name=JUnit +eidas.ms.modules.idaustriaclient.metadata.organisation.friendyname=For testing with jUnit +eidas.ms.modules.idaustriaclient.metadata.organisation.url=http://junit.test +eidas.ms.modules.idaustriaclient.metadata.contact.givenname=Max +eidas.ms.modules.idaustriaclient.metadata.contact.surname=Mustermann +eidas.ms.modules.idaustriaclient.metadata.contact.email=max@junit.test diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/mobilesig/AhExtendedPvpAttributeDefinitions.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/idAustriaClient/AhExtendedPvpAttributeDefinitions.java index af9a2972..8dea6df3 100644 --- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/mobilesig/AhExtendedPvpAttributeDefinitions.java +++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/idAustriaClient/AhExtendedPvpAttributeDefinitions.java @@ -1,4 +1,4 @@ -package at.asitplus.eidas.specific.modules.auth.eidas.v2.mobilesig; +package at.asitplus.eidas.specific.modules.auth.eidas.v2.idAustriaClient; import at.gv.egiz.eaaf.core.api.data.ExtendedPvpAttributeDefinitions; diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/mobilesig/AuthHandlerConstants.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/idAustriaClient/AuthHandlerConstants.java index 60219759..9c6929c2 100644 --- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/mobilesig/AuthHandlerConstants.java +++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/idAustriaClient/AuthHandlerConstants.java @@ -1,4 +1,4 @@ -package at.asitplus.eidas.specific.modules.auth.eidas.v2.mobilesig; +package at.asitplus.eidas.specific.modules.auth.eidas.v2.idAustriaClient; public class AuthHandlerConstants { diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/mobilesig/IAhSpConfiguration.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/idAustriaClient/IAhSpConfiguration.java index d8e873c0..2a54f541 100644 --- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/mobilesig/IAhSpConfiguration.java +++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/idAustriaClient/IAhSpConfiguration.java @@ -1,4 +1,4 @@ -package at.asitplus.eidas.specific.modules.auth.eidas.v2.mobilesig; +package at.asitplus.eidas.specific.modules.auth.eidas.v2.idAustriaClient; import java.util.List; 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/idAustriaClient/IdAustriaClientAuthConstants.java index ef7f667c..22910614 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/idAustriaClient/IdAustriaClientAuthConstants.java @@ -1,4 +1,4 @@ -package at.asitplus.eidas.specific.modules.auth.eidas.v2.mobilesig; +package at.asitplus.eidas.specific.modules.auth.eidas.v2.idAustriaClient; import at.gv.egiz.eaaf.core.api.data.EaafConstants; @@ -11,26 +11,26 @@ import java.util.Collections; import java.util.List; -public class EidasCentralAuthConstants { +public class IdAustriaClientAuthConstants { - private EidasCentralAuthConstants() { + private IdAustriaClientAuthConstants() { } public static final String SAML2_STATUSCODE_USERSTOP = "1005"; - public static final String MODULE_NAME_FOR_LOGGING = "eIDAS central authentication"; + public static final String MODULE_NAME_FOR_LOGGING = "ID Austria Client"; public static final int METADATA_VALIDUNTIL_IN_HOURS = 24; // public static final String HTTP_PARAM_CENTRAL_EIDAS_AUTH_SELECTION = // AuthHandlerConstants.HTTP_PARAM_EIDAS_PROCESS; - public static final String ENDPOINT_POST = "/sp/eidas/post"; - public static final String ENDPOINT_REDIRECT = "/sp/eidas/redirect"; - public static final String ENDPOINT_METADATA = "/sp/eidas/metadata"; + public static final String ENDPOINT_POST = "/idAustriaSp/post"; + public static final String ENDPOINT_REDIRECT = "/idAustriaSp/redirect"; + public static final String ENDPOINT_METADATA = "/idAustriaSp/metadata"; - public static final String CONFIG_PROPS_PREFIX = "modules.eidascentralauth."; + public static final String CONFIG_PROPS_PREFIX = "modules.idaustriaclient."; 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"; 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/idAustriaClient/IdAustriaClientAuthCredentialProvider.java index 81ef82ed..1aa85e71 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/idAustriaClient/IdAustriaClientAuthCredentialProvider.java @@ -1,4 +1,4 @@ -package at.asitplus.eidas.specific.modules.auth.eidas.v2.mobilesig; +package at.asitplus.eidas.specific.modules.auth.eidas.v2.idAustriaClient; import at.gv.egiz.eaaf.core.api.idp.IConfiguration; import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException; @@ -14,7 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; * @author tlenz * */ -public class EidasCentralAuthCredentialProvider extends AbstractCredentialProvider { +public class IdAustriaClientAuthCredentialProvider extends AbstractCredentialProvider { @Autowired IConfiguration authConfig; @@ -26,13 +26,13 @@ public class EidasCentralAuthCredentialProvider extends AbstractCredentialProvid final KeyStoreConfiguration keyStoreConfig = new KeyStoreConfiguration(); keyStoreConfig.setFriendlyName(FRIENDLYNAME); keyStoreConfig.setKeyStoreType( - authConfig.getBasicConfiguration(EidasCentralAuthConstants.CONFIG_PROPS_KEYSTORE_TYPE, + authConfig.getBasicConfiguration(IdAustriaClientAuthConstants.CONFIG_PROPS_KEYSTORE_TYPE, KeyStoreType.PKCS12.getKeyStoreType())); keyStoreConfig.setKeyStoreName( - authConfig.getBasicConfiguration(EidasCentralAuthConstants.CONFIG_PROPS_KEYSTORE_NAME)); + authConfig.getBasicConfiguration(IdAustriaClientAuthConstants.CONFIG_PROPS_KEYSTORE_NAME)); keyStoreConfig.setSoftKeyStoreFilePath(getKeyStoreFilePath()); keyStoreConfig.setSoftKeyStorePassword( - authConfig.getBasicConfiguration(EidasCentralAuthConstants.CONFIG_PROPS_KEYSTORE_PASSWORD)); + authConfig.getBasicConfiguration(IdAustriaClientAuthConstants.CONFIG_PROPS_KEYSTORE_PASSWORD)); return keyStoreConfig; @@ -40,10 +40,10 @@ public class EidasCentralAuthCredentialProvider extends AbstractCredentialProvid private String getKeyStoreFilePath() throws EaafConfigurationException { final String path = authConfig.getBasicConfiguration( - EidasCentralAuthConstants.CONFIG_PROPS_KEYSTORE_PATH); + IdAustriaClientAuthConstants.CONFIG_PROPS_KEYSTORE_PATH); if (path == null) { throw new EaafConfigurationException("module.eidasauth.00", - new Object[] { EidasCentralAuthConstants.CONFIG_PROPS_KEYSTORE_PATH }); + new Object[] { IdAustriaClientAuthConstants.CONFIG_PROPS_KEYSTORE_PATH }); } return path; @@ -59,7 +59,7 @@ public class EidasCentralAuthCredentialProvider extends AbstractCredentialProvid @Override public String getMetadataKeyAlias() { return authConfig.getBasicConfiguration( - EidasCentralAuthConstants.CONFIG_PROPS_SIGN_METADATA_ALIAS); + IdAustriaClientAuthConstants.CONFIG_PROPS_SIGN_METADATA_ALIAS); } /* @@ -72,7 +72,7 @@ public class EidasCentralAuthCredentialProvider extends AbstractCredentialProvid @Override public String getMetadataKeyPassword() { return authConfig.getBasicConfiguration( - EidasCentralAuthConstants.CONFIG_PROPS_SIGN_METADATA_KEY_PASSWORD); + IdAustriaClientAuthConstants.CONFIG_PROPS_SIGN_METADATA_KEY_PASSWORD); } /* @@ -85,7 +85,7 @@ public class EidasCentralAuthCredentialProvider extends AbstractCredentialProvid @Override public String getSignatureKeyAlias() { return authConfig.getBasicConfiguration( - EidasCentralAuthConstants.CONFIG_PROPS_SIGN_SIGNING_ALIAS); + IdAustriaClientAuthConstants.CONFIG_PROPS_SIGN_SIGNING_ALIAS); } /* @@ -98,7 +98,7 @@ public class EidasCentralAuthCredentialProvider extends AbstractCredentialProvid @Override public String getSignatureKeyPassword() { return authConfig.getBasicConfiguration( - EidasCentralAuthConstants.CONFIG_PROPS_SIGN_SIGNING_KEY_PASSWORD); + IdAustriaClientAuthConstants.CONFIG_PROPS_SIGN_SIGNING_KEY_PASSWORD); } /* @@ -111,7 +111,7 @@ public class EidasCentralAuthCredentialProvider extends AbstractCredentialProvid @Override public String getEncryptionKeyAlias() { return authConfig.getBasicConfiguration( - EidasCentralAuthConstants.CONFIG_PROPS_ENCRYPTION_ALIAS); + IdAustriaClientAuthConstants.CONFIG_PROPS_ENCRYPTION_ALIAS); } /* @@ -124,7 +124,7 @@ public class EidasCentralAuthCredentialProvider extends AbstractCredentialProvid @Override public String getEncryptionKeyPassword() { return authConfig.getBasicConfiguration( - EidasCentralAuthConstants.CONFIG_PROPS_ENCRYPTION_KEY_PASSWORD); + IdAustriaClientAuthConstants.CONFIG_PROPS_ENCRYPTION_KEY_PASSWORD); } } diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/mobilesig/EidasCentralAuthMetadataConfiguration.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/idAustriaClient/IdAustriaClientAuthMetadataConfiguration.java index ca71807f..4b5861e9 100644 --- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/mobilesig/EidasCentralAuthMetadataConfiguration.java +++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/idAustriaClient/IdAustriaClientAuthMetadataConfiguration.java @@ -1,4 +1,4 @@ -package at.asitplus.eidas.specific.modules.auth.eidas.v2.mobilesig; +package at.asitplus.eidas.specific.modules.auth.eidas.v2.idAustriaClient; import java.util.ArrayList; @@ -33,12 +33,12 @@ import lombok.extern.slf4j.Slf4j; * */ @Slf4j -public class EidasCentralAuthMetadataConfiguration implements IPvpMetadataBuilderConfiguration { +public class IdAustriaClientAuthMetadataConfiguration implements IPvpMetadataBuilderConfiguration { private Collection<RequestedAttribute> additionalAttributes = null; private final String authUrl; - private final EidasCentralAuthCredentialProvider credentialProvider; + private final IdAustriaClientAuthCredentialProvider credentialProvider; private final IPvp2BasicConfiguration pvpConfiguration; /** @@ -48,9 +48,9 @@ public class EidasCentralAuthMetadataConfiguration implements IPvpMetadataBuilde * @param credentialProvider Credentials used by PVP2 S-Profile end-point * @param pvpConfiguration Basic PVP2 S-Profile end-point configuration */ - public EidasCentralAuthMetadataConfiguration(String authUrl, - EidasCentralAuthCredentialProvider credentialProvider, - IPvp2BasicConfiguration pvpConfiguration) { + public IdAustriaClientAuthMetadataConfiguration(String authUrl, + IdAustriaClientAuthCredentialProvider credentialProvider, + IPvp2BasicConfiguration pvpConfiguration) { this.authUrl = authUrl; this.credentialProvider = credentialProvider; this.pvpConfiguration = pvpConfiguration; @@ -65,7 +65,7 @@ public class EidasCentralAuthMetadataConfiguration implements IPvpMetadataBuilde */ @Override public int getMetadataValidUntil() { - return EidasCentralAuthConstants.METADATA_VALIDUNTIL_IN_HOURS; + return IdAustriaClientAuthConstants.METADATA_VALIDUNTIL_IN_HOURS; } @@ -117,7 +117,7 @@ public class EidasCentralAuthMetadataConfiguration implements IPvpMetadataBuilde */ @Override public String getEntityID() { - return authUrl + EidasCentralAuthConstants.ENDPOINT_METADATA; + return authUrl + IdAustriaClientAuthConstants.ENDPOINT_METADATA; } @@ -268,7 +268,7 @@ public class EidasCentralAuthMetadataConfiguration implements IPvpMetadataBuilde */ @Override public String getSpAssertionConsumerServicePostBindingUrl() { - return authUrl + EidasCentralAuthConstants.ENDPOINT_POST; + return authUrl + IdAustriaClientAuthConstants.ENDPOINT_POST; } /* @@ -280,7 +280,7 @@ public class EidasCentralAuthMetadataConfiguration implements IPvpMetadataBuilde */ @Override public String getSpAssertionConsumerServiceRedirectBindingUrl() { - return authUrl + EidasCentralAuthConstants.ENDPOINT_REDIRECT; + return authUrl + IdAustriaClientAuthConstants.ENDPOINT_REDIRECT; } /* @@ -360,12 +360,12 @@ public class EidasCentralAuthMetadataConfiguration implements IPvpMetadataBuilde AuthHandlerConstants.PROP_CONFIG_LEGACY_ALLOW, false)) { log.trace("Build required attributes for legacy operaton ... "); injectDefinedAttributes(requestedAttributes, - EidasCentralAuthConstants.DEFAULT_REQUIRED_PVP_ATTRIBUTES_WITHOUT_EID); + IdAustriaClientAuthConstants.DEFAULT_REQUIRED_PVP_ATTRIBUTES_WITHOUT_EID); } else { log.trace("Build required attributes for E-ID operaton ... "); injectDefinedAttributes(requestedAttributes, - EidasCentralAuthConstants.DEFAULT_REQUIRED_PVP_ATTRIBUTES); + IdAustriaClientAuthConstants.DEFAULT_REQUIRED_PVP_ATTRIBUTES); } @@ -409,7 +409,7 @@ public class EidasCentralAuthMetadataConfiguration implements IPvpMetadataBuilde */ @Override public String getSpNameForLogging() { - return EidasCentralAuthConstants.MODULE_NAME_FOR_LOGGING; + return IdAustriaClientAuthConstants.MODULE_NAME_FOR_LOGGING; } /* diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/mobilesig/EidasCentralAuthMetadataController.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/idAustriaClient/IdAustriaClientAuthMetadataController.java index 90e1e674..87886397 100644 --- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/mobilesig/EidasCentralAuthMetadataController.java +++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/idAustriaClient/IdAustriaClientAuthMetadataController.java @@ -1,4 +1,4 @@ -package at.asitplus.eidas.specific.modules.auth.eidas.v2.mobilesig; +package at.asitplus.eidas.specific.modules.auth.eidas.v2.idAustriaClient; import java.io.IOException; @@ -37,14 +37,14 @@ import lombok.extern.slf4j.Slf4j; */ @Slf4j @Controller -public class EidasCentralAuthMetadataController extends AbstractController { +public class IdAustriaClientAuthMetadataController extends AbstractController { private static final String ERROR_CODE_INTERNAL_00 = "eaaf.core.00"; @Autowired PvpMetadataBuilder metadatabuilder; @Autowired - EidasCentralAuthCredentialProvider credentialProvider; + IdAustriaClientAuthCredentialProvider credentialProvider; @Autowired IPvp2BasicConfiguration pvpConfiguration; @@ -52,10 +52,10 @@ public class EidasCentralAuthMetadataController extends AbstractController { * Default construction with logging. * */ - public EidasCentralAuthMetadataController() { + public IdAustriaClientAuthMetadataController() { super(); log.debug("Registering servlet " + getClass().getName() - + " with mappings '" + EidasCentralAuthConstants.ENDPOINT_METADATA + + " with mappings '" + IdAustriaClientAuthConstants.ENDPOINT_METADATA + "'."); } @@ -68,7 +68,7 @@ public class EidasCentralAuthMetadataController extends AbstractController { * @throws IOException In case of an I/O error * @throws EaafException In case of a metadata generation error */ - @RequestMapping(value = EidasCentralAuthConstants.ENDPOINT_METADATA, + @RequestMapping(value = IdAustriaClientAuthConstants.ENDPOINT_METADATA, method = { RequestMethod.GET }) public void getSpMetadata(HttpServletRequest req, HttpServletResponse resp) throws IOException, EaafException { @@ -77,8 +77,8 @@ public class EidasCentralAuthMetadataController extends AbstractController { final String authUrl = getAuthUrlFromHttpContext(req); // initialize metadata builder configuration - final EidasCentralAuthMetadataConfiguration metadataConfig = - new EidasCentralAuthMetadataConfiguration(authUrl, credentialProvider, pvpConfiguration); + final IdAustriaClientAuthMetadataConfiguration metadataConfig = + new IdAustriaClientAuthMetadataConfiguration(authUrl, credentialProvider, pvpConfiguration); metadataConfig.setAdditionalRequiredAttributes(getAdditonalRequiredAttributes()); // build metadata @@ -127,7 +127,7 @@ public class EidasCentralAuthMetadataController extends AbstractController { // load attributes from configuration final Map<String, String> addReqAttributes = authConfig.getBasicConfigurationWithPrefix( - EidasCentralAuthConstants.CONFIG_PROPS_REQUIRED_PVP_ATTRIBUTES_LIST); + IdAustriaClientAuthConstants.CONFIG_PROPS_REQUIRED_PVP_ATTRIBUTES_LIST); for (final String el : addReqAttributes.values()) { if (StringUtils.isNotEmpty(el)) { log.trace("Parse additional attr. definition: " + el); diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/mobilesig/EidasCentralAuthMetadataProvider.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/idAustriaClient/IdAustriaClientAuthMetadataProvider.java index b920e789..c0bfa290 100644 --- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/mobilesig/EidasCentralAuthMetadataProvider.java +++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/idAustriaClient/IdAustriaClientAuthMetadataProvider.java @@ -1,4 +1,4 @@ -package at.asitplus.eidas.specific.modules.auth.eidas.v2.mobilesig; +package at.asitplus.eidas.specific.modules.auth.eidas.v2.idAustriaClient; import java.io.IOException; import java.security.KeyStore; @@ -40,7 +40,7 @@ import lombok.extern.slf4j.Slf4j; * */ @Slf4j -public class EidasCentralAuthMetadataProvider extends AbstractChainingMetadataProvider { +public class IdAustriaClientAuthMetadataProvider extends AbstractChainingMetadataProvider { private static final String FRIENDLYNAME_METADATA_TRUSTSTORE = "'eIDAS_client metadata truststore'"; private static final String PROVIDER_ID_PATTERN = "eIDAS resolver: {0}"; @@ -127,7 +127,7 @@ public class EidasCentralAuthMetadataProvider extends AbstractChainingMetadataPr private void initializeFileSystemMetadata() { try { final String metadataUrl = basicConfig.getBasicConfiguration( - EidasCentralAuthConstants.CONFIG_PROPS_NODE_METADATAURL); + IdAustriaClientAuthConstants.CONFIG_PROPS_NODE_METADATAURL); if (StringUtils.isNotEmpty(metadataUrl)) { log.info("Use not recommended metadata-provider initialization!" + " SAML2 'Well-Known-Location' is the preferred methode."); @@ -148,14 +148,14 @@ public class EidasCentralAuthMetadataProvider extends AbstractChainingMetadataPr final KeyStoreConfiguration trustStoreConfig = new KeyStoreConfiguration(); trustStoreConfig.setFriendlyName(FRIENDLYNAME_METADATA_TRUSTSTORE); trustStoreConfig.setKeyStoreType(basicConfig.getBasicConfiguration( - EidasCentralAuthConstants.CONFIG_PROPS_TRUSTSTORE_TYPE, + IdAustriaClientAuthConstants.CONFIG_PROPS_TRUSTSTORE_TYPE, KeyStoreType.JKS.getKeyStoreType())); trustStoreConfig.setKeyStoreName(basicConfig.getBasicConfiguration( - EidasCentralAuthConstants.CONFIG_PROPS_TRUSTSTORE_NAME)); + IdAustriaClientAuthConstants.CONFIG_PROPS_TRUSTSTORE_NAME)); trustStoreConfig.setSoftKeyStoreFilePath(basicConfig.getBasicConfiguration( - EidasCentralAuthConstants.CONFIG_PROPS_TRUSTSTORE_PATH)); + IdAustriaClientAuthConstants.CONFIG_PROPS_TRUSTSTORE_PATH)); trustStoreConfig.setSoftKeyStorePassword(basicConfig.getBasicConfiguration( - EidasCentralAuthConstants.CONFIG_PROPS_TRUSTSTORE_PASSWORD)); + IdAustriaClientAuthConstants.CONFIG_PROPS_TRUSTSTORE_PASSWORD)); // validate configuration trustStoreConfig.validate(); diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/mobilesig/EidasCentralAuthRequestBuilderConfiguration.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/idAustriaClient/IdAustriaClientAuthRequestBuilderConfiguration.java index 723654eb..ddaf872d 100644 --- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/mobilesig/EidasCentralAuthRequestBuilderConfiguration.java +++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/idAustriaClient/IdAustriaClientAuthRequestBuilderConfiguration.java @@ -1,4 +1,4 @@ -package at.asitplus.eidas.specific.modules.auth.eidas.v2.mobilesig; +package at.asitplus.eidas.specific.modules.auth.eidas.v2.idAustriaClient; import java.util.List; @@ -11,7 +11,7 @@ import org.opensaml.saml.saml2.core.NameIDType; import org.opensaml.saml.saml2.metadata.EntityDescriptor; import org.w3c.dom.Element; -public class EidasCentralAuthRequestBuilderConfiguration implements IPvpAuthnRequestBuilderConfiguruation { +public class IdAustriaClientAuthRequestBuilderConfiguration implements IPvpAuthnRequestBuilderConfiguruation { private boolean isPassive; private String spEntityId; @@ -186,7 +186,7 @@ public class EidasCentralAuthRequestBuilderConfiguration implements IPvpAuthnReq */ @Override public String getSpNameForLogging() { - return EidasCentralAuthConstants.MODULE_NAME_FOR_LOGGING; + return IdAustriaClientAuthConstants.MODULE_NAME_FOR_LOGGING; } /* diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateMobilePhoneSignatureRequestTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateMobilePhoneSignatureRequestTask.java index 3f2ae1f2..5f242c1b 100644 --- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateMobilePhoneSignatureRequestTask.java +++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateMobilePhoneSignatureRequestTask.java @@ -23,11 +23,11 @@ package at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks; -import at.asitplus.eidas.specific.modules.auth.eidas.v2.mobilesig.EidasCentralAuthConstants; -import at.asitplus.eidas.specific.modules.auth.eidas.v2.mobilesig.EidasCentralAuthCredentialProvider; -import at.asitplus.eidas.specific.modules.auth.eidas.v2.mobilesig.EidasCentralAuthMetadataProvider; -import at.asitplus.eidas.specific.modules.auth.eidas.v2.mobilesig.EidasCentralAuthRequestBuilderConfiguration; -import at.asitplus.eidas.specific.modules.auth.eidas.v2.mobilesig.IAhSpConfiguration; +import at.asitplus.eidas.specific.modules.auth.eidas.v2.idAustriaClient.IdAustriaClientAuthConstants; +import at.asitplus.eidas.specific.modules.auth.eidas.v2.idAustriaClient.IdAustriaClientAuthCredentialProvider; +import at.asitplus.eidas.specific.modules.auth.eidas.v2.idAustriaClient.IdAustriaClientAuthMetadataProvider; +import at.asitplus.eidas.specific.modules.auth.eidas.v2.idAustriaClient.IdAustriaClientAuthRequestBuilderConfiguration; +import at.asitplus.eidas.specific.modules.auth.eidas.v2.idAustriaClient.IAhSpConfiguration; import at.gv.egiz.eaaf.core.api.IRequest; import at.gv.egiz.eaaf.core.api.data.ExtendedPvpAttributeDefinitions; import at.gv.egiz.eaaf.core.api.data.PvpAttributeDefinitions; @@ -72,9 +72,9 @@ public class GenerateMobilePhoneSignatureRequestTask extends AbstractAuthServlet @Autowired PvpAuthnRequestBuilder authnReqBuilder; @Autowired - EidasCentralAuthCredentialProvider credential; + IdAustriaClientAuthCredentialProvider credential; @Autowired - EidasCentralAuthMetadataProvider metadataService; + IdAustriaClientAuthMetadataProvider metadataService; // @Autowired // ITransactionStorage transactionStorage; @@ -107,18 +107,18 @@ public class GenerateMobilePhoneSignatureRequestTask extends AbstractAuthServlet } // setup AuthnRequestBuilder configuration - final EidasCentralAuthRequestBuilderConfiguration authnReqConfig = - new EidasCentralAuthRequestBuilderConfiguration(); + final IdAustriaClientAuthRequestBuilderConfiguration authnReqConfig = + new IdAustriaClientAuthRequestBuilderConfiguration(); final SecureRandomIdentifierGenerationStrategy gen = new SecureRandomIdentifierGenerationStrategy(); authnReqConfig.setRequestId(gen.generateIdentifier()); authnReqConfig.setIdpEntity(entityDesc); authnReqConfig.setPassive(false); authnReqConfig.setSignCred(credential.getMessageSigningCredential()); - authnReqConfig.setSpEntityID(pendingReq.getAuthUrl() + EidasCentralAuthConstants.ENDPOINT_METADATA); + authnReqConfig.setSpEntityID(pendingReq.getAuthUrl() + IdAustriaClientAuthConstants.ENDPOINT_METADATA); authnReqConfig.setRequestedLoA(authConfig.getBasicConfiguration( - EidasCentralAuthConstants.CONFIG_PROPS_REQUIRED_LOA, - EidasCentralAuthConstants.CONFIG_DEFAULT_LOA_EIDAS_LEVEL)); + IdAustriaClientAuthConstants.CONFIG_PROPS_REQUIRED_LOA, + IdAustriaClientAuthConstants.CONFIG_DEFAULT_LOA_EIDAS_LEVEL)); authnReqConfig.setScopeRequesterId( pendingReq.getServiceProviderConfiguration(IAhSpConfiguration.class) 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 dd0e1345..c6d69c5d 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 @@ -135,13 +135,13 @@ scope="prototype" /> <bean id="eidasCentralAuthCredentialProvider" - class="at.asitplus.eidas.specific.modules.auth.eidas.v2.mobilesig.EidasCentralAuthCredentialProvider" /> + class="at.asitplus.eidas.specific.modules.auth.eidas.v2.idAustriaClient.IdAustriaClientAuthCredentialProvider" /> <bean id="eidasCentralAuthMetadataProvider" - class=" at.asitplus.eidas.specific.modules.auth.eidas.v2.mobilesig.EidasCentralAuthMetadataProvider" /> + class=" at.asitplus.eidas.specific.modules.auth.eidas.v2.idAustriaClient.IdAustriaClientAuthMetadataProvider" /> <bean id="eidasCentralAuthMetadataController" - class=" at.asitplus.eidas.specific.modules.auth.eidas.v2.mobilesig.EidasCentralAuthMetadataController" /> + class=" at.asitplus.eidas.specific.modules.auth.eidas.v2.idAustriaClient.IdAustriaClientAuthMetadataController" /> </beans>
\ No newline at end of file |