diff options
| author | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2018-07-20 12:52:33 +0200 |
|---|---|---|
| committer | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2018-07-20 12:52:33 +0200 |
| commit | cca12e684850ae48dabb8805bbb0699863a89e40 (patch) | |
| tree | adce911de2201705bbc31b79deb355dec96a6f2a /connector/src/main/java | |
| parent | cfbed130bfd2c57ce15d34feb628d1cf26a15429 (diff) | |
| download | National_eIDAS_Gateway-cca12e684850ae48dabb8805bbb0699863a89e40.tar.gz National_eIDAS_Gateway-cca12e684850ae48dabb8805bbb0699863a89e40.tar.bz2 National_eIDAS_Gateway-cca12e684850ae48dabb8805bbb0699863a89e40.zip | |
some EventCode updates
Diffstat (limited to 'connector/src/main/java')
3 files changed, 8 insertions, 3 deletions
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/logger/RevisionLogger.java b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/logger/RevisionLogger.java index a4eaf9c4..4b8d7669 100644 --- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/logger/RevisionLogger.java +++ b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/logger/RevisionLogger.java @@ -55,7 +55,10 @@ public class RevisionLogger extends EventLogFactory implements IRevisionLogger { private void logEvent(Event event) { try { - getEventLog().logEvent(event); + if (event.getEventCode() >= 1100) + getEventLog().logEvent(event); + else + log.trace("Ignore Event: " + event.getEventCode() + " because session functionallity is not implemented"); } catch (EventLoggingException e) { log.warn("Event logging FAILED! Reason: " + e.getMessage()); diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/processes/tasks/EvaluateCountrySelectionTask.java b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/processes/tasks/EvaluateCountrySelectionTask.java index 3fe7d5a0..ff3dc252 100644 --- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/processes/tasks/EvaluateCountrySelectionTask.java +++ b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/processes/tasks/EvaluateCountrySelectionTask.java @@ -15,6 +15,7 @@ import at.gv.egiz.eaaf.core.api.data.EAAFConstants; import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext; import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException; import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask; +import at.gv.egiz.eidas.specific.connector.MSConnectorEventCodes; import at.gv.egiz.eidas.specific.connector.MSeIDASNodeConstants; /** @@ -34,6 +35,7 @@ public class EvaluateCountrySelectionTask extends AbstractAuthServletTask { String stopAuthFlag = request.getParameter(MSeIDASNodeConstants.REQ_PARAM_STOP_PROCESS); if (StringUtils.isNotEmpty(stopAuthFlag) && Boolean.parseBoolean(stopAuthFlag)) { log.info("Authentication process WAS stopped by entity. Stopping auth. process ... "); + revisionsLogger.logEvent(pendingReq, MSConnectorEventCodes.PROCESS_STOPPED_BY_USER); pendingReq.setAbortedByUser(true); pendingReq.setAuthenticated(false); diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/StatusMessageProvider.java b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/StatusMessageProvider.java index 4bcc1ee6..d1787e7d 100644 --- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/StatusMessageProvider.java +++ b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/StatusMessageProvider.java @@ -26,12 +26,12 @@ public class StatusMessageProvider implements IStatusMessenger { private static final String ERROR_NO_EXTERNALERROR_CODE = "No external error for internal error with number.={0}"; //internal messanges - private static final String DEFAULT_MESSAGE_RESOURCES = "resources/properties/id_messages"; + private static final String DEFAULT_MESSAGE_RESOURCES = "properties/status_messages_en"; private static final Locale DEFAULT_MESSAGE_LOCALES = new Locale("en", "GB"); private ResourceBundle messages; //external error codes - private static final String DEFAULT_EXTERNALERROR_RESOURCES = "resources/properties/protocol_response_statuscodes"; + private static final String DEFAULT_EXTERNALERROR_RESOURCES = "properties/external_statuscodes_map"; private static final Locale DEFAULT_EXTERNALERROR_LOCALES = new Locale("en", "GB"); private ResourceBundle externalError = null; |