From c1722aa8e4919f68c8b0b1c28e6c35da7cab2c7b Mon Sep 17 00:00:00 2001 From: haburger Date: Fri, 10 Jan 2025 16:24:44 +0000 Subject: [PATCH] new configuration version --- .../nevis/k8s-nevisauth-7022472ae407577ae604bbb8.yaml | 2 +- .../nevisauth/default/conf/recovery-processing.groovy | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/etc/nevis/k8s-nevisauth-7022472ae407577ae604bbb8.yaml b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/etc/nevis/k8s-nevisauth-7022472ae407577ae604bbb8.yaml index 467d9a2..089383c 100644 --- a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/etc/nevis/k8s-nevisauth-7022472ae407577ae604bbb8.yaml +++ b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/etc/nevis/k8s-nevisauth-7022472ae407577ae604bbb8.yaml @@ -45,7 +45,7 @@ spec: podDisruptionBudget: maxUnavailable: "50%" git: - tag: "r-6c62b8946330d7c4f2ed7d6bb4e18322c0a85ad9" + tag: "r-c47f1e3863ed593d0e24a21d8b1aca887d66fef6" dir: "DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth" credentials: "git-credentials" keystores: diff --git a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/recovery-processing.groovy b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/recovery-processing.groovy index 6dce281..88512ee 100644 --- a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/recovery-processing.groovy +++ b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/recovery-processing.groovy @@ -89,7 +89,6 @@ def userHasNewLoginFactor() { String userExtId = session.get('ch.adnovum.nevisidm.user.extId') String baseEndPoint = "$baseUrl/api/core/v1/$clientExtId/users/$userExtId" - def result = false response.setSessionAttribute('agov.recovery.newLoginFactor', 'NONE') try { @@ -97,27 +96,25 @@ def userHasNewLoginFactor() { def accessApp = credInfoArray['items'].find( it -> it.stateName == "active") if (accessApp) { - result = true; response.setSessionAttribute('agov.recovery.accessapp', accessApp.properties.fidouaf_name) response.setSessionAttribute('agov.recovery.accessapp.dispatchTargetId', accessApp.identification.replaceAll('dispatch_target_', '')) response.setSessionAttribute('agov.recovery.newLoginFactor', 'ACCESS_APP') - return + return true } credInfoArray = new JsonSlurper().parseText(idmRestClient.get("$baseEndPoint/fido2")) def fido2Key = credInfoArray['items'].find( it -> it.stateName == "active") if (fido2Key) { - result = true; response.setSessionAttribute('agov.recovery.securityKey', fido2Key.userFriendlyName) response.setSessionAttribute('agov.recovery.newLoginFactor', 'FIDO2') - return + return true } } catch(Exception e) { LOG.error(e.toString()) } - return result + return false }