From 1ee6f1e152f3ff29d3f09c8078711fc6cb65a148 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 24 Feb 2020 12:12:21 +0100 Subject: fix wrong or missing error messages --- .../core/impl/idp/auth/builder/AbstractAuthenticationDataBuilder.java | 2 +- eaaf_core/src/main/resources/messages/eaaf_core_messages.properties | 2 ++ .../java/at/gv/egiz/eaaf/core/impl/credential/EaafKeyStoreFactory.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/AbstractAuthenticationDataBuilder.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/AbstractAuthenticationDataBuilder.java index 8f87cbfa..3fab0a4e 100644 --- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/AbstractAuthenticationDataBuilder.java +++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/AbstractAuthenticationDataBuilder.java @@ -445,7 +445,7 @@ public abstract class AbstractAuthenticationDataBuilder implements IAuthenticati if (StringUtils.isEmpty(authData.getIdentificationValue()) && StringUtils.isEmpty(pvpBpkValue) && StringUtils.isEmpty(authData.getBpk()) && pvpEncBpkAttr == null) { log.info( - "Can not build authData, because moaSession include no bPK, encrypted bPK or baseID"); + "Can not build authData, because session include no bPK, encrypted bPK or baseID"); throw new EaafBuilderException("builder.08", new Object[] { "No " + PvpAttributeDefinitions.BPK_FRIENDLY_NAME + " or " + PvpAttributeDefinitions.EID_SOURCE_PIN_FRIENDLY_NAME + " or " diff --git a/eaaf_core/src/main/resources/messages/eaaf_core_messages.properties b/eaaf_core/src/main/resources/messages/eaaf_core_messages.properties index 5a508ccf..1916a7fc 100644 --- a/eaaf_core/src/main/resources/messages/eaaf_core_messages.properties +++ b/eaaf_core/src/main/resources/messages/eaaf_core_messages.properties @@ -1,4 +1,6 @@ eaaf.core.00=Requested URL: {0} is NOT allowed by configuration. +builder.08=Authentication process could NOT completed. Reason: {0} + diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/EaafKeyStoreFactory.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/EaafKeyStoreFactory.java index f69efd49..40bf7175 100644 --- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/EaafKeyStoreFactory.java +++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/EaafKeyStoreFactory.java @@ -171,7 +171,7 @@ public class EaafKeyStoreFactory { final Resource ressource = resourceLoader.getResource(absKeyStorePath); if (!ressource.exists()) { throw new EaafConfigurationException(ERRORCODE_05, - new Object[] { CONFIG_PROP_HSM_FACADE_SSLTRUST, + new Object[] { config.getFriendlyName(), "File not found at: " + absKeyStorePath }); } -- cgit v1.2.3