From a24ff398864c4a575469ab9df2813494a3a0a1ce Mon Sep 17 00:00:00 2001 From: haburger Date: Thu, 13 Feb 2025 09:04:08 +0000 Subject: [PATCH] new configuration version --- .../nevis/k8s-nevisauth-7022472ae407577ae604bbb8.yaml | 2 +- .../nevisauth/default/conf/ensureRecoveryCode.groovy | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 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 59720ac..ac9e00f 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-b7543a0cfa5709d415da026ee75c467a9ce59430" + tag: "r-76635afaaedd25f5d24c9c5946e952dafbf121e4" 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/ensureRecoveryCode.groovy b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/ensureRecoveryCode.groovy index f687276..48ced44 100644 --- a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/ensureRecoveryCode.groovy +++ b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/ensureRecoveryCode.groovy @@ -39,21 +39,26 @@ if (Arrays.stream(response.getActualRoles()).filter( r -> r.matches('^.*AGOV-Loi return } - -// 1b) check if user has a credential +// 1a) check if user has a credential if ( recoveryCredential != null ) { LOG.debug("Account '${user}' has an active recovery code, no need to create new code") response.setResult('done') return } -// 1c) check if a recovery is ongoing (nothing to do) +// 1b) check if a recovery is ongoing (nothing to do) if (Arrays.stream(response.getActualRoles()).filter( r -> r.contains('AGOV-AccountStatus.recovery')).findAny().isPresent()) { LOG.debug("Account '${user}' is in recovery, no need to create new code") response.setResult('done') return } +// 1c) don't do it for mobile phones (BUNDBITBK-4445) +if (userAgent =~ /(iPhone|Android)/ ) { + LOG.debug("User '${user}' used a mobile phone, recovery code creation skipped") + response.setResult('done') + return +} // 2) set cookie for recoveryCode if (outargs.containsKey('out.JWTToken')) {