From b1e841126ab730ece797c5806c4d0d96bf874f8a Mon Sep 17 00:00:00 2001 From: mamo Date: Mon, 18 Nov 2024 12:19:35 +0000 Subject: [PATCH] new configuration version --- .../k8s-nai-6ec6739e824c8e56d9633622.yaml | 3 +- ...e-proxy-auth-6ec6739e824c8e56d9633622.yaml | 18 +++ .../opt/nevisauth/default/conf/esauth4.xml | 150 +++++++++++++++++- .../k8s-npi-92e282d1dc2b69d9e4f91fc0.yaml | 2 +- .../WEB-INF/web.xml | 71 ++++++++- 5 files changed, 239 insertions(+), 5 deletions(-) create mode 100644 DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/nai/etc/nevis/k8s-nai-sh4r3d-keystore-proxy-auth-6ec6739e824c8e56d9633622.yaml diff --git a/DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/nai/etc/nevis/k8s-nai-6ec6739e824c8e56d9633622.yaml b/DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/nai/etc/nevis/k8s-nai-6ec6739e824c8e56d9633622.yaml index 3765e38..3c9d8e5 100644 --- a/DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/nai/etc/nevis/k8s-nai-6ec6739e824c8e56d9633622.yaml +++ b/DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/nai/etc/nevis/k8s-nai-6ec6739e824c8e56d9633622.yaml @@ -45,10 +45,11 @@ spec: podDisruptionBudget: maxUnavailable: "50%" git: - tag: "r-4999176cef2df770cdb17d2976058f09da7cdcad" + tag: "r-b6134cc4e5c3b82e00933bd3c57aa747efd989cd" dir: "DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/nai" credentials: "git-credentials" keystores: + - "nai-sh4r3d-keystore-proxy-auth" - "nai-default-identity" - "nai-sh4r3d-default-default-signer" truststores: diff --git a/DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/nai/etc/nevis/k8s-nai-sh4r3d-keystore-proxy-auth-6ec6739e824c8e56d9633622.yaml b/DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/nai/etc/nevis/k8s-nai-sh4r3d-keystore-proxy-auth-6ec6739e824c8e56d9633622.yaml new file mode 100644 index 0000000..fee9f43 --- /dev/null +++ b/DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/nai/etc/nevis/k8s-nai-sh4r3d-keystore-proxy-auth-6ec6739e824c8e56d9633622.yaml @@ -0,0 +1,18 @@ +apiVersion: "operator.nevis-security.ch/v1" +kind: "NevisKeyStore" +metadata: + name: "nai-sh4r3d-keystore-proxy-auth" + namespace: "adn-postit-tknxchng-01-dev" + labels: + deploymentTarget: "nai" + annotations: + projectKey: "DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT" + patternId: "6ec6739e824c8e56d9633622" +spec: + cn: "New_OAuth_2.0_Authorization_Server_OpenID_Provider-signer" + usage: "signer" + san: + dns: + - "nai" + - "nai.adn-postit-tknxchng-01-dev" + email: [] diff --git a/DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/nai/var/opt/nevisauth/default/conf/esauth4.xml b/DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/nai/var/opt/nevisauth/default/conf/esauth4.xml index fb35e47..13ef9ad 100644 --- a/DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/nai/var/opt/nevisauth/default/conf/esauth4.xml +++ b/DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/nai/var/opt/nevisauth/default/conf/esauth4.xml @@ -42,6 +42,11 @@ + + + + + @@ -55,10 +60,14 @@ + + + + @@ -285,7 +294,7 @@ - + @@ -294,6 +303,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -301,6 +341,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/npi/etc/nevis/k8s-npi-92e282d1dc2b69d9e4f91fc0.yaml b/DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/npi/etc/nevis/k8s-npi-92e282d1dc2b69d9e4f91fc0.yaml index 0e49224..ff2858c 100644 --- a/DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/npi/etc/nevis/k8s-npi-92e282d1dc2b69d9e4f91fc0.yaml +++ b/DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/npi/etc/nevis/k8s-npi-92e282d1dc2b69d9e4f91fc0.yaml @@ -46,7 +46,7 @@ spec: podDisruptionBudget: maxUnavailable: "50%" git: - tag: "r-3d141afd3ffc3d627e8f33a1c77ed93cd66a0b52" + tag: "r-b6134cc4e5c3b82e00933bd3c57aa747efd989cd" dir: "DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/npi" credentials: "git-credentials" keystores: diff --git a/DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/npi/var/opt/nevisproxy/default/host-cossa.agov-w.azure.adnovum.net/WEB-INF/web.xml b/DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/npi/var/opt/nevisproxy/default/host-cossa.agov-w.azure.adnovum.net/WEB-INF/web.xml index 0cc199b..be84dd5 100644 --- a/DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/npi/var/opt/nevisproxy/default/host-cossa.agov-w.azure.adnovum.net/WEB-INF/web.xml +++ b/DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/npi/var/opt/nevisproxy/default/host-cossa.agov-w.azure.adnovum.net/WEB-INF/web.xml @@ -99,6 +99,33 @@ /var/opt/nevisproxy/default/host-cossa.agov-w.azure.adnovum.net/WEB-INF/security_cossa_realm_tokenintrospection.conf + + + OAuth_Preflighted_CORS_New OAuth 2.0 Authorization Server / OpenID Provider + ch::nevis::isiweb4::filter::lua::LuaFilter + + + Script + + function inputHeader(request, response) + response:setHeader("Access-Control-Allow-Origin", "*") + response:setHeader("Access-Control-Allow-Credentials", "true") + response:setHeader("Access-Control-Allow-Methods", "GET, POST, PUT, OPTIONS") + response:setHeader("Access-Control-Allow-Headers", "Authorization") + response:setHeader("Access-Control-Expose-Headers", "*") + response:setHeader("Access-Control-Max-Age", "600") + if request:getMethod() == "OPTIONS" then + response:send(204) + end + end + + + + + Script.InputHeaderFunctionName + inputHeader + + Qos @@ -188,6 +215,26 @@ SessionHandler_cossa_realm /token/* + + + SessionHandler_cossa_realm + /oauth/authorize + + + + SessionHandler_cossa_realm + /oauth/token + + + + OAuth_Preflighted_CORS_New OAuth 2.0 Authorization Server / OpenID Provider + /oauth/authorize + + + + OAuth_Preflighted_CORS_New OAuth 2.0 Authorization Server / OpenID Provider + /oauth/token + ModSecurity_cossa_realm_TokenIntrospection @@ -199,6 +246,16 @@ /token/* + + AuthenticationService_cossa_realm + /oauth/authorize + + + + AuthenticationService_cossa_realm + /oauth/token + + ch::nevis::isiweb4::listener::SessionListener @@ -334,10 +391,10 @@ true - + Hosting_Default - + ch::nevis::isiweb4::servlet::defaults::DefaultServlet @@ -408,11 +465,21 @@ NevisLogrendConnector_nli /nevislogrend/* + + + Hosting_Default + /oauth/authorize + Connector_cossa_realm_TokenIntrospection /oauth/introspect2/* + + + Hosting_Default + /oauth/token + Hosting_Default