From 4104117bc718d3b1c92129b4351697d0bc459397 Mon Sep 17 00:00:00 2001 From: haburger Date: Fri, 29 Nov 2024 06:39:30 +0000 Subject: [PATCH] new configuration version --- ...8s-nevisauth-ac27dd7daad0ca2b7229bfaf.yaml | 2 +- .../conf/OpOnbrdng-PreProcessing.groovy | 6 ++++ .../opt/nevisauth/default/conf/esauth4.xml | 2 ++ ...nevislogrend-8401da6318c6915d689cdfc9.yaml | 2 +- .../resources/conf/default.properties | 28 +++++++++++++------ 5 files changed, 30 insertions(+), 10 deletions(-) diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/auth/etc/nevis/k8s-nevisauth-ac27dd7daad0ca2b7229bfaf.yaml b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/auth/etc/nevis/k8s-nevisauth-ac27dd7daad0ca2b7229bfaf.yaml index 5150313..1b34f06 100644 --- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/auth/etc/nevis/k8s-nevisauth-ac27dd7daad0ca2b7229bfaf.yaml +++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/auth/etc/nevis/k8s-nevisauth-ac27dd7daad0ca2b7229bfaf.yaml @@ -45,7 +45,7 @@ spec: podDisruptionBudget: maxUnavailable: "50%" git: - tag: "r-868174843070c36c5da54e3a43d558da046b6ce7" + tag: "r-47502e417486789dcc0d887ec040d4cac6e4865d" dir: "DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/auth" credentials: "git-credentials" keystores: diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/auth/var/opt/nevisauth/default/conf/OpOnbrdng-PreProcessing.groovy b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/auth/var/opt/nevisauth/default/conf/OpOnbrdng-PreProcessing.groovy index 8818237..78a31e7 100644 --- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/auth/var/opt/nevisauth/default/conf/OpOnbrdng-PreProcessing.groovy +++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/auth/var/opt/nevisauth/default/conf/OpOnbrdng-PreProcessing.groovy @@ -55,6 +55,12 @@ if (inargs['cd'] != null) { // 2b) clean the url, if necessary if (request.currentResource.replaceAll('^https:\\/\\/[^\\/]+\\/AUTH\\/ONBOARDING\\/', '').length() > 0) { + if (inargs['language'] && inargs['language'] != session['ch.nevis.session.user.language']) { + // language change, set the language cookie + def langCookie = "LANG=${inargs['language']}; Domain=${parameters.get('cookie.domain')}; Path=/" + response.setHeader('Set-Cookie', langCookie) + } + response.setStatus(AuthResponse.AUTH_CONTINUE) response.setTransferDestination('/AUTH/ONBOARDING/') response.setIsRedirectTransfer(true) diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/auth/var/opt/nevisauth/default/conf/esauth4.xml b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/auth/var/opt/nevisauth/default/conf/esauth4.xml index c86b996..0028528 100644 --- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/auth/var/opt/nevisauth/default/conf/esauth4.xml +++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/auth/var/opt/nevisauth/default/conf/esauth4.xml @@ -142,6 +142,8 @@ + + diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/etc/nevis/k8s-nevislogrend-8401da6318c6915d689cdfc9.yaml b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/etc/nevis/k8s-nevislogrend-8401da6318c6915d689cdfc9.yaml index e776563..4595e16 100644 --- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/etc/nevis/k8s-nevislogrend-8401da6318c6915d689cdfc9.yaml +++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/etc/nevis/k8s-nevislogrend-8401da6318c6915d689cdfc9.yaml @@ -44,7 +44,7 @@ spec: podDisruptionBudget: maxUnavailable: "50%" git: - tag: "r-868174843070c36c5da54e3a43d558da046b6ce7" + tag: "r-47502e417486789dcc0d887ec040d4cac6e4865d" dir: "DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend" credentials: "git-credentials" podSecurity: diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/resources/conf/default.properties b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/resources/conf/default.properties index d23fdf5..a3c4334 100644 --- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/resources/conf/default.properties +++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/resources/conf/default.properties @@ -13,14 +13,26 @@ application.language.source.3=gui # source: pattern://6df66943ca713eed2a25d935 application.language.source.4=browser # source: pattern://6df66943ca713eed2a25d935 +velocity.input.encoding=UTF-8 +# source: pattern://6df66943ca713eed2a25d935 +velocity.output.encoding=UTF-8 +# source: pattern://6df66943ca713eed2a25d935 +application.inputs.htmlencode=false +# source: pattern://6df66943ca713eed2a25d935 +application.inputs.htmlencode.guielems=false +# source: pattern://6df66943ca713eed2a25d935 +application.render.content.type=text/html; charset=UTF-8 +# source: pattern://6df66943ca713eed2a25d935 +cache.revalidate.delay=-1 +# source: pattern://6df66943ca713eed2a25d935, pattern://8401da6318c6915d689cdfc9 +application.language.cookie.de=LANG:de:.agov-w.azure.adnovum.net +# source: pattern://6df66943ca713eed2a25d935, pattern://8401da6318c6915d689cdfc9 +application.language.cookie.fr=LANG:fr:.agov-w.azure.adnovum.net +# source: pattern://6df66943ca713eed2a25d935, pattern://8401da6318c6915d689cdfc9 +application.language.cookie.it=LANG:it:.agov-w.azure.adnovum.net +# source: pattern://6df66943ca713eed2a25d935, pattern://8401da6318c6915d689cdfc9 +application.language.cookie.en=LANG:en:.agov-w.azure.adnovum.net +# source: pattern://6df66943ca713eed2a25d935 application.languages=en,de,fr,it # source: pattern://6df66943ca713eed2a25d935 application.languages.default=en -# source: pattern://8401da6318c6915d689cdfc9 -application.language.cookie.en=LANG:en:agov-w.azure.adnovum.net -# source: pattern://8401da6318c6915d689cdfc9 -application.language.cookie.de=LANG:de:agov-w.azure.adnovum.net -# source: pattern://8401da6318c6915d689cdfc9 -application.language.cookie.fr=LANG:fr:agov-w.azure.adnovum.net -# source: pattern://8401da6318c6915d689cdfc9 -application.language.cookie.it=LANG:it:agov-w.azure.adnovum.net