aboutsummaryrefslogtreecommitdiff
path: root/connector_lib/src/main
diff options
context:
space:
mode:
authorThomas Lenz <thomas.lenz@egiz.gv.at>2019-12-09 09:22:54 +0100
committerThomas Lenz <thomas.lenz@egiz.gv.at>2019-12-09 09:22:54 +0100
commit0224cdf7be78cf0778f0b832a42c18c480c4b784 (patch)
tree20bc6a85c3116c0463715d2b48f210f863d674fa /connector_lib/src/main
parent5b42b580f2a105746ac2cdfd7bb48ef3d0a806bd (diff)
downloadNational_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')
-rw-r--r--connector_lib/src/main/java/at/asitplus/eidas/specific/connector/MSeIDASNodeConstants.java4
-rw-r--r--connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/BasicConfigurationProvider.java20
-rw-r--r--connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/ServiceProviderConfiguration.java16
-rw-r--r--connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/DefaultVelocityGUIBuilderImpl.java14
-rw-r--r--connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/GuiBuilderConfigurationFactory.java (renamed from connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/GUIBuilderConfigurationFactory.java)12
-rw-r--r--connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/SpringMvcGuiFormBuilderImpl.java (renamed from connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/SpringMVCGUIFormBuilderImpl.java)20
-rw-r--r--connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/StaticGuiBuilderConfiguration.java10
7 files changed, 48 insertions, 48 deletions
diff --git a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/MSeIDASNodeConstants.java b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/MSeIDASNodeConstants.java
index 0835daf8..9e6c1a3b 100644
--- a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/MSeIDASNodeConstants.java
+++ b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/MSeIDASNodeConstants.java
@@ -27,7 +27,7 @@ package at.asitplus.eidas.specific.connector;
import java.util.Arrays;
import java.util.List;
-import at.gv.egiz.eaaf.core.api.data.EAAFConfigConstants;
+import at.gv.egiz.eaaf.core.api.data.EaafConfigConstants;
public class MSeIDASNodeConstants {
// ************ configuration properties ************
@@ -59,7 +59,7 @@ public class MSeIDASNodeConstants {
public static final String PROP_EIDAS_REQUEST_LOA_MINIMUM_LEVEL = "auth.eIDAS.node_v2.loa.requested.minimum";
public static final String PROP_CONFIG_SP_LIST_PREFIX = "sp.";
- public static final String PROP_CONFIG_SP_UNIQUEIDENTIFIER = EAAFConfigConstants.SERVICE_UNIQUEIDENTIFIER;
+ public static final String PROP_CONFIG_SP_UNIQUEIDENTIFIER = EaafConfigConstants.SERVICE_UNIQUEIDENTIFIER;
public static final String PROP_CONFIG_SP_FRIENDLYNAME = "friendlyName";
public static final String PROP_CONFIG_SP_PVP2_METADATA_URL = "pvp2.metadata.url";
public static final String PROP_CONFIG_SP_PVP2_METADATA_TRUSTSTORE = "pvp2.metadata.truststore";
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()});
}
diff --git a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/DefaultVelocityGUIBuilderImpl.java b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/DefaultVelocityGUIBuilderImpl.java
index e618e68d..802a22ff 100644
--- a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/DefaultVelocityGUIBuilderImpl.java
+++ b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/DefaultVelocityGUIBuilderImpl.java
@@ -28,23 +28,23 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
-import at.gv.egiz.eaaf.core.api.gui.IVelocityGUIBuilderConfiguration;
-import at.gv.egiz.eaaf.core.exceptions.GUIBuildException;
-import at.gv.egiz.eaaf.core.impl.gui.AbstractVelocityGUIFormBuilderImpl;
+import at.gv.egiz.eaaf.core.api.gui.IVelocityGuiBuilderConfiguration;
+import at.gv.egiz.eaaf.core.exceptions.GuiBuildException;
+import at.gv.egiz.eaaf.core.impl.gui.AbstractVelocityGuiFormBuilderImpl;
@Service("DefaultVelocityGUIBuilderImpl")
-public class DefaultVelocityGUIBuilderImpl extends AbstractVelocityGUIFormBuilderImpl {
+public class DefaultVelocityGUIBuilderImpl extends AbstractVelocityGuiFormBuilderImpl {
private static final Logger log = LoggerFactory.getLogger(DefaultVelocityGUIBuilderImpl.class);
private static final String CLASSPATH_HTMLTEMPLATES_DIR = "templates/";
- public DefaultVelocityGUIBuilderImpl() throws GUIBuildException {
+ public DefaultVelocityGUIBuilderImpl() throws GuiBuildException {
super();
}
@Override
- protected InputStream getInternalTemplate(IVelocityGUIBuilderConfiguration config) throws GUIBuildException {
+ protected InputStream getInternalTemplate(IVelocityGuiBuilderConfiguration config) throws GuiBuildException {
String viewName = config.getViewName();
log.debug("GUI template:" + viewName + " is not found in configuration directory. "
+ " Load template from project library ... ");
@@ -55,7 +55,7 @@ public class DefaultVelocityGUIBuilderImpl extends AbstractVelocityGUIFormBuilde
} catch (Exception e1) {
log.error("GUI template:" + pathLocation + " is NOT loadable from classpath!", e1);
- throw new GUIBuildException("GUI template:" + pathLocation + " is NOT loadable from classpath!", e1);
+ throw new GuiBuildException("GUI template:" + pathLocation + " is NOT loadable from classpath!", e1);
}
}
diff --git a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/GUIBuilderConfigurationFactory.java b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/GuiBuilderConfigurationFactory.java
index e0ce6b3e..14198892 100644
--- a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/GUIBuilderConfigurationFactory.java
+++ b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/GuiBuilderConfigurationFactory.java
@@ -32,22 +32,22 @@ import org.springframework.stereotype.Service;
import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
import at.gv.egiz.eaaf.core.api.IRequest;
-import at.gv.egiz.eaaf.core.api.gui.IGUIBuilderConfiguration;
-import at.gv.egiz.eaaf.core.api.gui.IGUIBuilderConfigurationFactory;
-import at.gv.egiz.eaaf.core.api.gui.IVelocityGUIBuilderConfiguration;
+import at.gv.egiz.eaaf.core.api.gui.IGuiBuilderConfiguration;
+import at.gv.egiz.eaaf.core.api.gui.IGuiBuilderConfigurationFactory;
+import at.gv.egiz.eaaf.core.api.gui.IVelocityGuiBuilderConfiguration;
import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
@Service("GUIBuilderConfigurationFactory")
-public class GUIBuilderConfigurationFactory implements IGUIBuilderConfigurationFactory {
+public class GuiBuilderConfigurationFactory implements IGuiBuilderConfigurationFactory {
@Autowired(required=true) private IConfiguration basicConfig;
@Override
- public IGUIBuilderConfiguration getDefaultErrorGUI(String authURL) {
+ public IGuiBuilderConfiguration getDefaultErrorGui(String authURL) {
return new StaticGuiBuilderConfiguration(basicConfig, authURL, MSeIDASNodeConstants.TEMPLATE_HTML_ERROR, null);
}
@Override
- public IVelocityGUIBuilderConfiguration getSPSpecificSAML2PostConfiguration(IRequest pendingReq, String viewName, URI configRootContextDir)
+ public IVelocityGuiBuilderConfiguration getSpSpecificSaml2PostConfiguration(IRequest pendingReq, String viewName, URI configRootContextDir)
throws MalformedURLException {
return new StaticGuiBuilderConfiguration(basicConfig, pendingReq,MSeIDASNodeConstants.TEMPLATE_HTML_PVP_POSTBINDING , null);
}
diff --git a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/SpringMVCGUIFormBuilderImpl.java b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/SpringMvcGuiFormBuilderImpl.java
index 84218611..63028db2 100644
--- a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/SpringMVCGUIFormBuilderImpl.java
+++ b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/SpringMvcGuiFormBuilderImpl.java
@@ -16,26 +16,26 @@ import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.View;
import org.springframework.web.servlet.ViewResolver;
-import at.gv.egiz.eaaf.core.api.gui.IGUIBuilderConfiguration;
-import at.gv.egiz.eaaf.core.api.gui.ISpringMVCGUIFormBuilder;
-import at.gv.egiz.eaaf.core.exceptions.GUIBuildException;
+import at.gv.egiz.eaaf.core.api.gui.IGuiBuilderConfiguration;
+import at.gv.egiz.eaaf.core.api.gui.ISpringMvcGuiFormBuilder;
+import at.gv.egiz.eaaf.core.exceptions.GuiBuildException;
-public class SpringMVCGUIFormBuilderImpl implements ISpringMVCGUIFormBuilder {
- private static final Logger log = LoggerFactory.getLogger(SpringMVCGUIFormBuilderImpl.class);
+public class SpringMvcGuiFormBuilderImpl implements ISpringMvcGuiFormBuilder {
+ private static final Logger log = LoggerFactory.getLogger(SpringMvcGuiFormBuilderImpl.class);
private @Autowired(required=false) ViewResolver[] viewResolvers;
private @Autowired(required=false) LocaleResolver localeResolver;
@Override
- public void build(HttpServletRequest httpReq, HttpServletResponse httpResp, IGUIBuilderConfiguration config,
- String loggerName) throws GUIBuildException {
+ public void build(HttpServletRequest httpReq, HttpServletResponse httpResp, IGuiBuilderConfiguration config,
+ String loggerName) throws GuiBuildException {
build(httpReq, httpResp, config, null, loggerName);
}
@Override
- public void build(HttpServletRequest httpReq, HttpServletResponse httpResp, IGUIBuilderConfiguration config,
- String contentType, String loggerName) throws GUIBuildException {
+ public void build(HttpServletRequest httpReq, HttpServletResponse httpResp, IGuiBuilderConfiguration config,
+ String contentType, String loggerName) throws GuiBuildException {
try {
final ModelAndView mav = new ModelAndView(config.getViewName());
if (config.getViewParameters() != null)
@@ -45,7 +45,7 @@ public class SpringMVCGUIFormBuilderImpl implements ISpringMVCGUIFormBuilder {
} catch (final Exception e) {
log.info("Can NOT generate GUI for illustration", e);
- throw new GUIBuildException(e.getMessage(), e);
+ throw new GuiBuildException(e.getMessage(), e);
}
diff --git a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/StaticGuiBuilderConfiguration.java b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/StaticGuiBuilderConfiguration.java
index f3211598..db35c6e6 100644
--- a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/StaticGuiBuilderConfiguration.java
+++ b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/StaticGuiBuilderConfiguration.java
@@ -40,13 +40,13 @@ import org.slf4j.LoggerFactory;
import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
import at.gv.egiz.eaaf.core.api.IRequest;
import at.gv.egiz.eaaf.core.api.gui.GroupDefinition;
-import at.gv.egiz.eaaf.core.api.gui.IVelocityGUIBuilderConfiguration;
+import at.gv.egiz.eaaf.core.api.gui.IVelocityGuiBuilderConfiguration;
import at.gv.egiz.eaaf.core.api.gui.ModifyableGuiBuilderConfiguration;
import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
-import at.gv.egiz.eaaf.core.impl.gui.AbstractGUIFormBuilderConfiguration;
+import at.gv.egiz.eaaf.core.impl.gui.AbstractGuiFormBuilderConfiguration;
import at.gv.egiz.eaaf.core.impl.utils.FileUtils;
-public class StaticGuiBuilderConfiguration extends AbstractGUIFormBuilderConfiguration implements IVelocityGUIBuilderConfiguration, ModifyableGuiBuilderConfiguration {
+public class StaticGuiBuilderConfiguration extends AbstractGuiFormBuilderConfiguration implements IVelocityGuiBuilderConfiguration, ModifyableGuiBuilderConfiguration {
private static final Logger log = LoggerFactory.getLogger(StaticGuiBuilderConfiguration.class);
private IRequest pendingReq = null;
@@ -58,7 +58,7 @@ public class StaticGuiBuilderConfiguration extends AbstractGUIFormBuilderConfigu
}
public StaticGuiBuilderConfiguration(IConfiguration basicConfig, IRequest pendingReq, String viewName, String formSubmitEndpoint) {
- super(pendingReq.getAuthURL(), viewName, formSubmitEndpoint);
+ super(pendingReq.getAuthUrl(), viewName, formSubmitEndpoint);
this.pendingReq = pendingReq;
this.basicConfig = basicConfig;
@@ -80,7 +80,7 @@ public class StaticGuiBuilderConfiguration extends AbstractGUIFormBuilderConfigu
public InputStream getTemplate(String viewName) {
String templateURL = MSeIDASNodeConstants.FILESYSTEM_TEMPLATE_DIR + viewName;
try {
- String absURL = FileUtils.makeAbsoluteURL(templateURL, this.basicConfig.getConfigurationRootDirectory());
+ String absURL = FileUtils.makeAbsoluteUrl(templateURL, this.basicConfig.getConfigurationRootDirectory());
if (!absURL.startsWith("file:")) {
log.warn("Path to template looks like NOT absolut: " + absURL + ". Template loading FAILED");