diff options
author | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2019-12-09 09:22:54 +0100 |
---|---|---|
committer | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2019-12-09 09:22:54 +0100 |
commit | 0224cdf7be78cf0778f0b832a42c18c480c4b784 (patch) | |
tree | 20bc6a85c3116c0463715d2b48f210f863d674fa /connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config | |
parent | 5b42b580f2a105746ac2cdfd7bb48ef3d0a806bd (diff) | |
download | National_eIDAS_Gateway-0224cdf7be78cf0778f0b832a42c18c480c4b784.tar.gz National_eIDAS_Gateway-0224cdf7be78cf0778f0b832a42c18c480c4b784.tar.bz2 National_eIDAS_Gateway-0224cdf7be78cf0778f0b832a42c18c480c4b784.zip |
switch to EAAF-Components 1.1.0-SNAPSHOT
Diffstat (limited to 'connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config')
2 files changed, 18 insertions, 18 deletions
diff --git a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/BasicConfigurationProvider.java b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/BasicConfigurationProvider.java index 4793e085..4a9bc8e4 100644 --- a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/BasicConfigurationProvider.java +++ b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/BasicConfigurationProvider.java @@ -34,9 +34,9 @@ import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants; -import at.gv.egiz.eaaf.core.api.idp.ISPConfiguration; -import at.gv.egiz.eaaf.core.exceptions.EAAFConfigurationException; -import at.gv.egiz.eaaf.core.exceptions.EAAFException; +import at.gv.egiz.eaaf.core.api.idp.ISpConfiguration; +import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException; +import at.gv.egiz.eaaf.core.exceptions.EaafException; import at.gv.egiz.eaaf.core.impl.idp.conf.AbstractConfigurationImpl; import at.gv.egiz.eaaf.core.impl.utils.KeyValueUtils; @@ -44,15 +44,15 @@ import at.gv.egiz.eaaf.core.impl.utils.KeyValueUtils; public class BasicConfigurationProvider extends AbstractConfigurationImpl{ private static final Logger log = LoggerFactory.getLogger(BasicConfigurationProvider.class); - private Map<String, ISPConfiguration> spConfigCache = new HashMap<String, ISPConfiguration>(); + private Map<String, ISpConfiguration> spConfigCache = new HashMap<String, ISpConfiguration>(); - public BasicConfigurationProvider(String configPath) throws EAAFConfigurationException { + public BasicConfigurationProvider(String configPath) throws EaafConfigurationException { super(configPath); } @Override - public ISPConfiguration getServiceProviderConfiguration(String entityId) throws EAAFConfigurationException { + public ISpConfiguration getServiceProviderConfiguration(String entityId) throws EaafConfigurationException { if (!spConfigCache.containsKey(entityId)) { log.debug("SP: " + entityId + " is NOT cached. Starting load operation ... "); Map<String, String> allSPs = getBasicConfigurationWithPrefix(MSeIDASNodeConstants.PROP_CONFIG_SP_LIST_PREFIX); @@ -84,8 +84,8 @@ public class BasicConfigurationProvider extends AbstractConfigurationImpl{ } @Override - public <T> T getServiceProviderConfiguration(String entityId, Class<T> decorator) throws EAAFConfigurationException { - ISPConfiguration spConfig = getServiceProviderConfiguration(entityId); + public <T> T getServiceProviderConfiguration(String entityId, Class<T> decorator) throws EaafConfigurationException { + ISpConfiguration spConfig = getServiceProviderConfiguration(entityId); if (spConfig != null && decorator != null) { if (decorator.isInstance(spConfig)) return (T)spConfig; @@ -99,12 +99,12 @@ public class BasicConfigurationProvider extends AbstractConfigurationImpl{ } @Override - public String validateIDPURL(URL url) throws EAAFException { + public String validateIdpUrl(URL url) throws EaafException { log.trace("Validate requested URL: " + url); String urlPrefixFromConfig = getBasicConfiguration(MSeIDASNodeConstants.PROP_CONFIG_APPLICATION_PUBLIC_URL_PREFIX); if (StringUtils.isEmpty(urlPrefixFromConfig)) { log.warn("Application config containts NO URL prefix"); - throw new EAAFConfigurationException("config.27", + throw new EaafConfigurationException("config.27", new Object[] {"Application config containts NO " + getApplicationSpecificKeyPrefix() + MSeIDASNodeConstants.PROP_CONFIG_APPLICATION_PUBLIC_URL_PREFIX }); diff --git a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/ServiceProviderConfiguration.java b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/ServiceProviderConfiguration.java index 7667c5f3..f5b52fa4 100644 --- a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/ServiceProviderConfiguration.java +++ b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/ServiceProviderConfiguration.java @@ -34,18 +34,18 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants; -import at.gv.egiz.eaaf.core.api.data.EAAFConstants; +import at.gv.egiz.eaaf.core.api.data.EaafConstants; import at.gv.egiz.eaaf.core.api.idp.IConfiguration; -import at.gv.egiz.eaaf.core.exceptions.EAAFException; -import at.gv.egiz.eaaf.core.impl.idp.conf.SPConfigurationImpl; +import at.gv.egiz.eaaf.core.exceptions.EaafException; +import at.gv.egiz.eaaf.core.impl.idp.conf.SpConfigurationImpl; -public class ServiceProviderConfiguration extends SPConfigurationImpl { +public class ServiceProviderConfiguration extends SpConfigurationImpl { private static final long serialVersionUID = 1L; private static final Logger log = LoggerFactory.getLogger(ServiceProviderConfiguration.class); - private List<String> minimumLoA = Arrays.asList(EAAFConstants.EIDAS_LOA_HIGH); + private List<String> minimumLoA = Arrays.asList(EaafConstants.EIDAS_LOA_HIGH); private String bPKTargetIdentifier; - private String loaMachtingMode = EAAFConstants.EIDAS_LOA_MATCHING_MINIMUM; + private String loaMachtingMode = EaafConstants.EIDAS_LOA_MATCHING_MINIMUM; public ServiceProviderConfiguration(Map<String, String> spConfig, IConfiguration authConfig) { super(spConfig, authConfig); @@ -139,7 +139,7 @@ public class ServiceProviderConfiguration extends SPConfigurationImpl { * @param bPKTargetIdentifier * @throws EAAFException If the bPKTargetIdentifier is NOT ALLOWED for this service provider */ - public void setbPKTargetIdentifier(String bPKTargetIdentifier) throws EAAFException { + public void setbPKTargetIdentifier(String bPKTargetIdentifier) throws EaafException { String allowedTargetIdentifierRegExPattern = getConfigurationValue( MSeIDASNodeConstants.PROP_CONFIG_SP_POLICY_ALLOWED_TARGETS, MSeIDASNodeConstants.POLICY_DEFAULT_ALLOWED_TARGETS); @@ -153,7 +153,7 @@ public class ServiceProviderConfiguration extends SPConfigurationImpl { } else { log.warn("Requested bPK-target: " + bPKTargetIdentifier + " does NOT match regex pattern."); - throw new EAAFException("auth.37", new Object[] {bPKTargetIdentifier, getUniqueIdentifier()}); + throw new EaafException("auth.37", new Object[] {bPKTargetIdentifier, getUniqueIdentifier()}); } |