From 121c85856693230a0373f1eb8bab8fbf152ca8f4 Mon Sep 17 00:00:00 2001 From: haburger Date: Tue, 11 Mar 2025 10:08:34 +0000 Subject: [PATCH] new configuration version --- .../k8s-nevisauth-7022472ae407577ae604bbb8.yaml | 2 +- .../opt/nevisauth/default/conf/checkloa.groovy | 15 +++++++++------ .../var/opt/nevisauth/default/conf/esauth4.xml | 4 ++-- 3 files changed, 12 insertions(+), 9 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 8515a22..bd2d2d4 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-e2938d9f50d18f0c7df1e51a7cc98a1e4fe2f6fa" + tag: "r-e00a9c4734572d2d12c47637bd8775b8447b2904" 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/checkloa.groovy b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/checkloa.groovy index ca33274..dc2bc6c 100644 --- a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/checkloa.groovy +++ b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/checkloa.groovy @@ -170,6 +170,15 @@ try { } } } + + LOG.debug('CheckLoa: Highest role Level ' + highestRoleLevelNumber.toString() +' contextclassref ' + requestedRoleLevelNumber.toString()) + LOG.debug('CheckLoa: Compare ' + (highestRoleLevelNumber>=requestedRoleLevelNumber)) + + //set attribute Actual Role Level + session.setAttribute('agov.actualRoleLevel', '' + highestRoleLevelNumber) + LOG.debug('CheckLoa: actual role level (agov) '+ highestRoleLevelNumber) + + // Best Token Available only if account's AQlevel is high enough if ((session.getAttribute('agov.appAddressRequired') == 'true') && (highestRoleLevelNumber < 200)) { LOG.debug("Best Token: Address requested but account has to low AQ (${highestRoleLevelNumber})") @@ -179,12 +188,6 @@ try { LOG.debug("Best Token: SVNr requested but account has to low AQ (${highestRoleLevelNumber})") session.setAttribute('agov.appSvnrAllowed', 'false') } - LOG.debug('CheckLoa: Highest role Level' + highestRoleLevelNumber.toString() +' contextclassref' + requestedRoleLevelNumber.toString()) - LOG.debug('CheckLoa: Compare' + (highestRoleLevelNumber>=requestedRoleLevelNumber)) - - //set attribute Actual Role Level - session.setAttribute('agov.actualRoleLevel', '' + highestRoleLevelNumber) - LOG.debug('CheckLoa: actual role level (agov) '+ highestRoleLevelNumber) if (highestRoleLevelNumber > 0) { // set attribute contextClassRefToSet diff --git a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/esauth4.xml b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/esauth4.xml index 4016cc2..dc48929 100644 --- a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/esauth4.xml +++ b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/esauth4.xml @@ -168,9 +168,9 @@ - + - +