diff options
Diffstat (limited to 'modules/authmodule-eIDAS-v2')
6 files changed, 31 insertions, 7 deletions
diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/service/RegisterSearchService.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/service/RegisterSearchService.java index 5e1e4839..e180e87d 100644 --- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/service/RegisterSearchService.java +++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/service/RegisterSearchService.java @@ -34,7 +34,12 @@ import lombok.extern.slf4j.Slf4j; @Service("registerSearchService") public class RegisterSearchService { - private static final String LOG_MSG_RESULTS = "Matching operation: {} results: ZMR: {} | ERnP: {}"; + private static final Object ZMR = "ZMR"; + private static final Object ERNP = "ERnP"; + private static final String LOG_MSG_RESULTS = "Matching operation: {} results: " + + ZMR + ": {} | " + ERNP + ": {}"; + private static final String LOG_MSG_KITT = "Matching operation kitts entry on: {}"; + private final IZmrClient zmrClient; private final IErnpClient ernpClient; @@ -87,7 +92,7 @@ public class RegisterSearchService { final ErnpRegisterResult resultsErnp = ernpClient.searchWithPersonIdentifier( eidasData.getPseudonym(), eidasData.getCitizenCountryCode()); - log.debug(LOG_MSG_RESULTS, "seachByPersonalId", + log.info(LOG_MSG_RESULTS, "seachByPersonalId", resultsZmr.getPersonResult().size(), resultsErnp.getPersonResult().size()); return RegisterStatusResults.fromZmrAndErnp(resultsZmr, resultsErnp); @@ -118,7 +123,7 @@ public class RegisterSearchService { ernpClient.searchWithMds(eidasData.getGivenName(), eidasData.getFamilyName(), eidasData.getDateOfBirth(), eidasData.getCitizenCountryCode()); - log.debug(LOG_MSG_RESULTS, "seachByMDS", + log.info(LOG_MSG_RESULTS, "seachByMDS", resultsZmr.getPersonResult().size(), resultsErnp.getPersonResult().size()); return RegisterStatusResults.fromZmrAndErnp(resultsZmr, resultsErnp); @@ -145,7 +150,7 @@ public class RegisterSearchService { try { @Nullable final CountrySpecificDetailSearchProcessor ccSpecificProcessor = findSpecificProcessor(eidasData); if (ccSpecificProcessor != null) { - log.debug("Selecting country-specific search processor: {}", ccSpecificProcessor.getName()); + log.info("Selecting country-specific search processor: {}", ccSpecificProcessor.getName()); PersonSuchenRequest ccSpecificSearchReq = ccSpecificProcessor.generateSearchRequest(eidasData); // search in ZMR @@ -157,7 +162,7 @@ public class RegisterSearchService { ErnpRegisterResult resultErnp = ernpClient.searchCountrySpecific( ccSpecificSearchReq, eidasData.getCitizenCountryCode()); - log.debug(LOG_MSG_RESULTS, "seachByCountrySpecifics", + log.info(LOG_MSG_RESULTS, "seachByCountrySpecifics", resultsZmr.getPersonResult().size(), resultErnp.getPersonResult().size()); return RegisterStatusResults.fromZmrAndErnp(resultsZmr, resultErnp); @@ -194,7 +199,7 @@ public class RegisterSearchService { * because we only search for people with Austrian residence and they are in ZMR only */ - log.debug(LOG_MSG_RESULTS, "seachByResidence", + log.info(LOG_MSG_RESULTS, "seachByResidence", resultsZmr.getPersonResult().size(), 0); return RegisterStatusResults.fromZmr(resultsZmr); @@ -231,11 +236,13 @@ public class RegisterSearchService { RegisterResult entryZmr = registerResult.getResultsZmr().get(0); ZmrRegisterResult updateZmr = zmrClient .update(registerResult.getOperationStatus().getZmrProcessId(), entryZmr, initialEidasData); + log.info(LOG_MSG_KITT, ZMR); return RegisterStatusResults.fromZmr(updateZmr); } else { RegisterResult entryErnp = registerResult.getResultsErnp().get(0); ErnpRegisterResult updateErnp = ernpClient.update(entryErnp, initialEidasData); + log.info(LOG_MSG_KITT, ERNP); return RegisterStatusResults.fromErnp(registerResult.operationStatus, updateErnp); } @@ -305,6 +312,7 @@ public class RegisterSearchService { ZmrRegisterResult updateAlt = zmrClient.update( altSearchResult.getOperationStatus().getZmrProcessId(), entryZmr, altEidasData); + log.info(LOG_MSG_KITT, ZMR); return RegisterStatusResults.fromZmr(updateAlt); } else { @@ -316,6 +324,7 @@ public class RegisterSearchService { // update ZMR entry by using eIDAS information from alternative authentication ErnpRegisterResult updateAlt = ernpClient.update(entryErnp, altEidasData); + log.info(LOG_MSG_KITT, ERNP); return RegisterStatusResults.fromErnp(altSearchResult.getOperationStatus(), updateAlt); } } catch (final EidasSAuthenticationException e) { diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/AlternativeSearchTask.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/AlternativeSearchTask.java index dd46bfea..e4c68d25 100644 --- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/AlternativeSearchTask.java +++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/AlternativeSearchTask.java @@ -116,6 +116,7 @@ public class AlternativeSearchTask extends AbstractAuthServletTask { } else { //perform register search operation based on alterantive eIDAS data + log.info("Starting register search for alternative eIDAS authentication ... "); step11RegisterSearchWithPersonIdentifier(executionContext, altEidasData, intermediateMatchingState, initialEidasData); diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateAustrianResidenceGuiTask.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateAustrianResidenceGuiTask.java index dc57dd78..3c0303d2 100644 --- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateAustrianResidenceGuiTask.java +++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateAustrianResidenceGuiTask.java @@ -94,6 +94,11 @@ public class GenerateAustrianResidenceGuiTask extends AbstractLocaleAuthServletT ReceiveOtherLoginMethodGuiResponseTask.ALL_EXECUTIONCONTEXT_PARAMETERS.forEach( el -> executionContext.remove(el)); + log.info("Show address-search GUI matching {} matchting error", + MatchingTaskUtils.getExecutionContextFlag( + executionContext,Constants.CONTEXT_FLAG_ADVANCED_MATCHING_FAILED) + ? "with" : "without"); + guiBuilder.build(request, response, config, "Query Austrian residency"); } catch (final Exception e) { diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateMobilePhoneSignatureRequestTask.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateMobilePhoneSignatureRequestTask.java index 26282d5c..16e1eb94 100644 --- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateMobilePhoneSignatureRequestTask.java +++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateMobilePhoneSignatureRequestTask.java @@ -85,7 +85,7 @@ public class GenerateMobilePhoneSignatureRequestTask extends AbstractAuthServlet final String entityId = loadEntityId(); final EntityDescriptor entityDesc = loadEntityDescriptor(entityId); final IdAustriaClientAuthRequestBuilderConfiguration authnReqConfig = buildAuthnRequestConfig(entityDesc); - final String relayState = buildRelayState(); + final String relayState = buildRelayState(); authnReqBuilder.buildAuthnRequest(pendingReq, authnReqConfig, relayState, response); // also transmits! } catch (final Exception e) { throw new TaskExecutionException(pendingReq, "Generation of SAML2 AuthnRequest to ID Austria System FAILED", e); diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateOtherLoginMethodGuiTask.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateOtherLoginMethodGuiTask.java index 94b29b8e..9d4f7152 100644 --- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateOtherLoginMethodGuiTask.java +++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateOtherLoginMethodGuiTask.java @@ -106,6 +106,11 @@ public class GenerateOtherLoginMethodGuiTask extends AbstractLocaleAuthServletTa // store pending request before next step requestStoreage.storePendingRequest(pendingReq); + log.info("Show manual GUI matching {} option to add ERnP entry", + MatchingTaskUtils.getExecutionContextFlag( + executionContext,Constants.TRANSITION_TO_REQUESTING_NEW_ERNP_ENTRY_TASK) + ? "with" : "without"); + guiBuilder.build(request, response, config, "Other login methods selection form"); } catch (final Exception e) { diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveOtherLoginMethodGuiResponseTask.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveOtherLoginMethodGuiResponseTask.java index ec858116..5b966ffe 100644 --- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveOtherLoginMethodGuiResponseTask.java +++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveOtherLoginMethodGuiResponseTask.java @@ -117,10 +117,12 @@ public class ReceiveOtherLoginMethodGuiResponseTask extends AbstractLocaleAuthSe return; case EIDAS_LOGIN: + log.info("User selects alternative eIDAS authentication. Starting process ... "); executionContext.put(Constants.TRANSITION_TO_GENERATE_EIDAS_LOGIN, true); return; case MOBILE_PHONE_SIGNATURE_LOGIN: + log.info("User selects ID Austria authentication. Starting process ... "); executionContext.put(Constants.TRANSITION_TO_GENERATE_MOBILE_PHONE_SIGNATURE_REQUEST_TASK, true); return; @@ -133,6 +135,7 @@ public class ReceiveOtherLoginMethodGuiResponseTask extends AbstractLocaleAuthSe } + log.info("User selects no alternative authentication-methode. Switching to residence search ... "); executionContext.put(Constants.TRANSITION_TO_GENERATE_GUI_QUERY_AUSTRIAN_RESIDENCE_TASK, true); return; @@ -142,6 +145,7 @@ public class ReceiveOtherLoginMethodGuiResponseTask extends AbstractLocaleAuthSe return; case ADD_ME_AS_NEW: + log.info("User selects insert-into-ERnP option. Starting ERnP operation and complete prozess ... "); executionContext.put(Constants.TRANSITION_TO_CREATE_NEW_ERNP_ENTRY_TASK, true); executionContext.put(Constants.TRANSITION_TO_REQUESTING_NEW_ERNP_ENTRY_TASK, false); return; |