From 2f89e46e31661a688b9372a7586f8d64afcf0df4 Mon Sep 17 00:00:00 2001 From: Thomas <> Date: Tue, 30 Jan 2024 07:18:10 +0100 Subject: chore(core): add some more logging improve session-linking between eIDAS-Node and MS-specific parts --- .../modules/auth/eidas/v2/tasks/GenerateAuthnRequestTask.java | 4 +++- .../auth/eidas/v2/tasks/ReceiveAuthnResponseAlternativeTask.java | 2 +- .../modules/auth/eidas/v2/tasks/ReceiveAuthnResponseTask.java | 6 +++--- .../msproxyservice/protocol/EidasProxyServiceController.java | 6 ++++-- .../msproxyservice/protocol/ProxyServiceAuthenticationAction.java | 3 ++- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateAuthnRequestTask.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateAuthnRequestTask.java index f2318386..607d3de5 100644 --- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateAuthnRequestTask.java +++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateAuthnRequestTask.java @@ -37,8 +37,8 @@ import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Component; import org.springframework.web.util.UriComponentsBuilder; -import at.asitplus.eidas.specific.core.MsEventCodes; import at.asitplus.eidas.specific.core.MsEidasNodeConstants; +import at.asitplus.eidas.specific.core.MsEventCodes; import at.asitplus.eidas.specific.core.gui.StaticGuiBuilderConfiguration; import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants; import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidPreProcessingException; @@ -137,6 +137,8 @@ public class GenerateAuthnRequestTask extends AbstractAuthServletTask { } + log.info("Requesting authentication from EidasNode: {} with Id:{}", + lightAuthnReq.getCitizenCountryCode(), lightAuthnReq.getId()); revisionsLogger.logEvent(pendingReq, MsEventCodes.EIDAS_NODE_CONNECTED, lightAuthnReq.getId()); log.info("Allowed LoA: {}", StringUtils.join(pendingReq.getServiceProviderConfiguration().getRequiredLoA(),", ")); diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAuthnResponseAlternativeTask.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAuthnResponseAlternativeTask.java index b05ce69d..aabfd16a 100644 --- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAuthnResponseAlternativeTask.java +++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAuthnResponseAlternativeTask.java @@ -128,7 +128,7 @@ public class ReceiveAuthnResponseAlternativeTask extends AbstractAuthServletTask log.warn("NO eIDAS response-message found."); throw new EidasSAuthenticationException("eidas.01", null); } - log.debug("Receive eIDAS response with RespId: {} for ReqId: {}", + log.info("Receive eIDAS response with RespId: {} for ReqId: {}", eidasResponse.getId(), eidasResponse.getInResponseToId()); log.trace("Full eIDAS-Resp: {}", eidasResponse); return eidasResponse; diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAuthnResponseTask.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAuthnResponseTask.java index a736ae08..ad07cd25 100644 --- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAuthnResponseTask.java +++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAuthnResponseTask.java @@ -35,8 +35,8 @@ import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Component; import org.springframework.web.util.UriComponentsBuilder; -import at.asitplus.eidas.specific.core.MsEventCodes; import at.asitplus.eidas.specific.core.MsEidasNodeConstants; +import at.asitplus.eidas.specific.core.MsEventCodes; import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants; import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidasSAuthenticationException; import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidasValidationException; @@ -98,7 +98,7 @@ public class ReceiveAuthnResponseTask extends AbstractAuthServletTask { try { final ILightResponse eidasResponse = extractEidasResponse(request); String stagingEndpoint = pendingReq.getRawData( - MsEidasNodeConstants.EXECCONTEXT_PARAM_MSCONNECTOR_STAGING, String.class); + MsEidasNodeConstants.EXECCONTEXT_PARAM_MSCONNECTOR_STAGING, String.class); if (StringUtils.isNotEmpty(stagingEndpoint)) { log.info("Find ms-connector staging to: {}. Forwarding to that endpoint ... ", stagingEndpoint); forwardToOtherStage(response, executionContext, eidasResponse, stagingEndpoint); @@ -159,7 +159,7 @@ public class ReceiveAuthnResponseTask extends AbstractAuthServletTask { log.warn("NO eIDAS response-message found."); throw new EidasSAuthenticationException("eidas.01", null); } - log.debug("Receive eIDAS response with RespId: {} for ReqId: {}", + log.info("Receive eIDAS response with RespId: {} for ReqId: {}", eidasResponse.getId(), eidasResponse.getInResponseToId()); log.trace("Full eIDAS-Resp: {}", eidasResponse); revisionsLogger.logEvent(pendingReq, MsEventCodes.RESPONSE_FROM_EIDAS_NODE, eidasResponse.getId()); diff --git a/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/EidasProxyServiceController.java b/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/EidasProxyServiceController.java index 886c7025..189f48cf 100644 --- a/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/EidasProxyServiceController.java +++ b/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/EidasProxyServiceController.java @@ -133,8 +133,10 @@ public class EidasProxyServiceController extends AbstractController implements I } - log.debug("Received eIDAS auth. request from: {}, Initializing authentication environment ... ", - eidasRequest.getSpCountryCode() != null ? eidasRequest.getSpCountryCode() : "'missing SP-country'"); + log.info( + "Received eIDAS auth. request from: {} with Id:{}, Initializing authentication environment ... ", + eidasRequest.getSpCountryCode() != null ? eidasRequest.getSpCountryCode() : "'missing SP-country'", + eidasRequest.getId()); log.trace("Received eIDAS requst: {}", eidasRequest); // create pendingRequest object diff --git a/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/ProxyServiceAuthenticationAction.java b/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/ProxyServiceAuthenticationAction.java index df8da81c..24eb2191 100644 --- a/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/ProxyServiceAuthenticationAction.java +++ b/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/ProxyServiceAuthenticationAction.java @@ -119,7 +119,8 @@ public class ProxyServiceAuthenticationAction implements IAction { logProvidedAttributes(eidasResp); forwardToEidasProxy(pendingReq, httpReq, httpResp, eidasResp); - revisionsLogger.logEvent(pendingReq, MsEventCodes.EIDAS_OUTGOING_RESPOND); + log.info("Authentication finished. Responde to EidasNode with Id:{}", eidasResp.getId()); + revisionsLogger.logEvent(pendingReq, MsEventCodes.EIDAS_OUTGOING_RESPOND, eidasResp.getId()); return sloInformation; -- cgit v1.2.3