aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Lenz <thomas.lenz@egiz.gv.at>2018-07-20 11:12:04 +0200
committerThomas Lenz <thomas.lenz@egiz.gv.at>2018-07-20 11:12:04 +0200
commitc7b3ba423d557eb435c8534917856ee17f8fbeba (patch)
tree5d0597550ecd1d297ed7c7f75e10ede126a8a355
parent31bc1246bb56fcd8807678e3f7516023bdfaed44 (diff)
downloadNational_eIDAS_Gateway-c7b3ba423d557eb435c8534917856ee17f8fbeba.tar.gz
National_eIDAS_Gateway-c7b3ba423d557eb435c8534917856ee17f8fbeba.tar.bz2
National_eIDAS_Gateway-c7b3ba423d557eb435c8534917856ee17f8fbeba.zip
some more fixes
-rw-r--r--connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/PVPEndPointCredentialProvider.java6
-rw-r--r--connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/PVPMetadataProvider.java4
-rw-r--r--connector/src/main/resources/properties/external_statuscodes_map.properties3
-rw-r--r--connector/src/main/resources/properties/status_messages_en.properties3
-rw-r--r--connector_lib/src/main/java/at/gv/egiz/eidas/specific/connector/config/BasicConfigurationProvider.java4
-rw-r--r--eidas_modules/authmodule-eIDAS-v2/src/main/java/at/gv/egiz/eidas/specific/modules/authmodule_eIDASv2/service/eIDASAttributeRegistry.java3
-rw-r--r--eidas_modules/authmodule-eIDAS-v2/src/main/java/at/gv/egiz/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTask.java3
7 files changed, 17 insertions, 9 deletions
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/PVPEndPointCredentialProvider.java b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/PVPEndPointCredentialProvider.java
index cd86c79a..f515ee5a 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/PVPEndPointCredentialProvider.java
+++ b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/PVPEndPointCredentialProvider.java
@@ -32,7 +32,8 @@ public class PVPEndPointCredentialProvider extends AbstractCredentialProvider {
String path = basicConfiguration.getBasicConfiguration(MSeIDASNodeConstants.PROP_CONFIG_PVP2_KEYSTORE_PATH);
if (StringUtils.isEmpty(path)) {
log.error(getFriendlyName() + " | Path to keyStore is NULL or EMPTY");
- throw new EAAFConfigurationException(getFriendlyName() + " | Path to keyStore is NULL or EMPTY");
+ throw new EAAFConfigurationException("config.27",
+ new Object[] {getFriendlyName() + " | Path to keyStore is NULL or EMPTY"});
}
@@ -42,7 +43,8 @@ public class PVPEndPointCredentialProvider extends AbstractCredentialProvider {
} catch (MalformedURLException e) {
log.error(getFriendlyName() + " | Path to keyStore NOT valid.", e);
- throw new EAAFConfigurationException(getFriendlyName() + " | Path to keyStore NOT valid.", e);
+ throw new EAAFConfigurationException("config.27",
+ new Object[] {getFriendlyName() + " | Path to keyStore NOT valid."}, e);
}
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/PVPMetadataProvider.java b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/PVPMetadataProvider.java
index 475b8407..41a44dba 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/PVPMetadataProvider.java
+++ b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/PVPMetadataProvider.java
@@ -81,8 +81,8 @@ public class PVPMetadataProvider extends AbstractChainingMetadataProvider{
} catch (PVP2MetadataException e) {
log.info("Can NOT initialize Metadata signature-verification filter. Reason: " + e.getMessage());
- throw new EAAFConfigurationException(
- "Can NOT initialize Metadata signature-verification filter. Reason: " + e.getMessage(), e);
+ throw new EAAFConfigurationException("config.27",
+ new Object[] {"Can NOT initialize Metadata signature-verification filter. Reason: " + e.getMessage()}, e);
}
diff --git a/connector/src/main/resources/properties/external_statuscodes_map.properties b/connector/src/main/resources/properties/external_statuscodes_map.properties
index 45f622c8..d2e2dab4 100644
--- a/connector/src/main/resources/properties/external_statuscodes_map.properties
+++ b/connector/src/main/resources/properties/external_statuscodes_map.properties
@@ -68,4 +68,5 @@ internal.02=9101
internal.03=9199
internal.04=9101
-config.27=9008 \ No newline at end of file
+config.27=9008
+config.30=9008 \ No newline at end of file
diff --git a/connector/src/main/resources/properties/status_messages_en.properties b/connector/src/main/resources/properties/status_messages_en.properties
index 7499f99d..a6985d0f 100644
--- a/connector/src/main/resources/properties/status_messages_en.properties
+++ b/connector/src/main/resources/properties/status_messages_en.properties
@@ -66,4 +66,5 @@ internal.02=Internal error. Can not access data cache.
internal.03=Internal error. Can not initialize a cryptographic method.
internal.04=Internal error. Can not access data cache (Reason: {0}).
-config.27=Configuration parameter processing failed. Reason:{0}
+config.27=Configuration parameter processing failed. Reason: {0}
+config.30=External configuration not found. File: {0}
diff --git a/connector_lib/src/main/java/at/gv/egiz/eidas/specific/connector/config/BasicConfigurationProvider.java b/connector_lib/src/main/java/at/gv/egiz/eidas/specific/connector/config/BasicConfigurationProvider.java
index b898dfef..4609c73a 100644
--- a/connector_lib/src/main/java/at/gv/egiz/eidas/specific/connector/config/BasicConfigurationProvider.java
+++ b/connector_lib/src/main/java/at/gv/egiz/eidas/specific/connector/config/BasicConfigurationProvider.java
@@ -82,7 +82,9 @@ public class BasicConfigurationProvider extends AbstractConfigurationImpl{
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("Application config containts NO URL prefix");
+ throw new EAAFConfigurationException("config.27",
+ new Object[] {"Application config containts NO "
+ + getApplicationSpecificKeyPrefix() + MSeIDASNodeConstants.PROP_CONFIG_APPLICATION_PUBLIC_URL_PREFIX });
}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/gv/egiz/eidas/specific/modules/authmodule_eIDASv2/service/eIDASAttributeRegistry.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/gv/egiz/eidas/specific/modules/authmodule_eIDASv2/service/eIDASAttributeRegistry.java
index b3855635..2bb3e0b0 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/gv/egiz/eidas/specific/modules/authmodule_eIDASv2/service/eIDASAttributeRegistry.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/gv/egiz/eidas/specific/modules/authmodule_eIDASv2/service/eIDASAttributeRegistry.java
@@ -35,7 +35,8 @@ public class eIDASAttributeRegistry {
try {
if (eidasAttributesFile.isEmpty()) {
log.error("Basic eIDAS addribute definition NOT defined");
- throw new EAAFConfigurationException("Basic eIDAS addribute definition NOT defined");
+ throw new EAAFConfigurationException("config.30",
+ new Object[] {"eidas-attributes.xml"});
}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/gv/egiz/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/gv/egiz/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTask.java
index da554249..ee126d0c 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/gv/egiz/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTask.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/gv/egiz/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTask.java
@@ -94,7 +94,8 @@ public class GenerateAuthnRequestTask extends AbstractAuthServletTask {
String issur = basicConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_NODE_ENTITYID);
if (StringUtils.isEmpty(issur)) {
log.error("Found NO 'eIDAS node issuer' in configuration. Authentication NOT possible!");
- throw new EAAFConfigurationException("Found NO 'eIDAS node issuer' in configuration. Authentication NOT possible!");
+ throw new EAAFConfigurationException("config.27",
+ new Object[] {"Application config containts NO " + Constants.CONIG_PROPS_EIDAS_NODE_ENTITYID });
}
authnRequestBuilder.issuer(issur);