Added check for F7T_AUTH_HEADER_NAME env var in src code

eth-cscs · Nov 13, 2023 · a5306c0 · a5306c0
1 parent c9ef36d
commit a5306c0
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 12 deletions.
diff --git a/deploy/demo/common/common.env b/deploy/demo/common/common.env
@@ -3,7 +3,7 @@
 # name of header key used to get authentication:
 # possible values: "Authorization" ("X-Userinfo" was disabled)
 # Authorization:  JWT token as generated by Keycloak: {"Authorization:", "Bearer fjfk..."}
-# F7T_AUTH_HEADER_NAME=Authorization
+F7T_AUTH_HEADER_NAME=Authorization
 # If F7T_AUTH_HEADER_NAME = Authorization, it can also check REALM_RSA_PUBLIC_KEY: RSA key from KeyCloak Realm which signs token.
 # F7T_REALM_RSA_PUBLIC_KEY="MII....QAB"
 # use 1 line without headers ("-----BEGIN PUBLIC KEY-----", "-----END PUBLIC KEY-----")

diff --git a/deploy/k8s/config/templates/cm.common.yaml b/deploy/k8s/config/templates/cm.common.yaml
@@ -1,6 +1,7 @@
 apiVersion: v1
 data:
   F7T_DEBUG_MODE: "{{ .Values.global.F7T_DEBUG_MODE  }}"
+  F7T_AUTH_HEADER_NAME: "{{ .Values.F7T_AUTH_HEADER_NAME }}"
   F7T_AUTH_REQUIRED_SCOPE: "{{ .Values.F7T_AUTH_REQUIRED_SCOPE }}"
   F7T_AUTH_ROLE: "{{ .Values.F7T_AUTH_ROLE }}"
   F7T_AUTH_TOKEN_AUD: "{{ .Values.F7T_AUTH_TOKEN_AUD }}"

diff --git a/deploy/k8s/values-dev.yaml b/deploy/k8s/values-dev.yaml
@@ -7,6 +7,7 @@ F7T_POLICY_PATH: v1/data/f7t/authz
 F7T_CA_KEY_PATH: /ca-key
 F7T_PUB_USER_KEY_PATH: /user-key.pub
 # common
+F7T_AUTH_HEADER_NAME: Authorization
 F7T_AUTH_REQUIRED_SCOPE: firecrest
 F7T_AUTH_ROLE: firecrest-sa
 F7T_AUTH_TOKEN_AUD: ""

diff --git a/src/certificator/certificator.py b/src/certificator/certificator.py
@@ -29,7 +29,7 @@ def get_boolean_var(var):
     # 1
     return var.upper() == "TRUE" or var.upper() == "YES" or var == "1"
 
-AUTH_HEADER_NAME = 'Authorization'
+AUTH_HEADER_NAME = os.environ.get("F7T_AUTH_HEADER_NAME","Authorization")
 
 AUTH_AUDIENCE = os.environ.get("F7T_AUTH_TOKEN_AUD", '').strip('\'"')
 ALLOWED_USERS = os.environ.get("F7T_AUTH_ALLOWED_USERS", '').strip('\'"').split(";")

diff --git a/src/common/common.env.template b/src/common/common.env.template
@@ -3,7 +3,7 @@
 # name of header key used to get authentication:
 # possible values: "Authorization" ("X-Userinfo" was disabled)
 # Authorization:  JWT token as generated by Keycloak: {"Authorization:", "Bearer fjfk..."}
-# F7T_AUTH_HEADER_NAME=Authorization
+F7T_AUTH_HEADER_NAME=Authorization
 # If F7T_AUTH_HEADER_NAME = Authorization, it can also check REALM_RSA_PUBLIC_KEY: RSA key from KeyCloak Realm which signs token.
 # F7T_REALM_RSA_PUBLIC_KEY="MII....QAB"
 # use 1 line without headers ("-----BEGIN PUBLIC KEY-----", "-----END PUBLIC KEY-----")

diff --git a/src/common/cscs_api_common.py b/src/common/cscs_api_common.py
@@ -39,7 +39,7 @@ def get_boolean_var(var):
 
 DEBUG_MODE = get_boolean_var(os.environ.get("F7T_DEBUG_MODE", False))
 
-AUTH_HEADER_NAME = 'Authorization'
+AUTH_HEADER_NAME = os.environ.get("F7T_AUTH_HEADER_NAME","Authorization")
 
 REALM_RSA_PUBLIC_KEYS=os.environ.get("F7T_REALM_RSA_PUBLIC_KEY", '').strip('\'"').split(";")
 

diff --git a/src/compute/compute.py b/src/compute/compute.py
@@ -26,7 +26,7 @@
 
 from schedulers import Job
 
-AUTH_HEADER_NAME = 'Authorization'
+AUTH_HEADER_NAME = os.environ.get("F7T_AUTH_HEADER_NAME","Authorization")
 
 CERTIFICATOR_URL= os.environ.get("F7T_CERTIFICATOR_URL")
 TASKS_URL       = os.environ.get("F7T_TASKS_URL")

diff --git a/src/reservations/reservations.py b/src/reservations/reservations.py
@@ -19,7 +19,7 @@
 from jaeger_client import Config
 import opentracing
 
-AUTH_HEADER_NAME = 'Authorization'
+AUTH_HEADER_NAME = os.environ.get("F7T_AUTH_HEADER_NAME","Authorization")
 
 RESERVATIONS_PORT    = os.environ.get("F7T_RESERVATIONS_PORT", 5050)
 

diff --git a/src/status/status.py b/src/status/status.py
@@ -20,7 +20,7 @@
 import opentracing
 
 
-AUTH_HEADER_NAME = 'Authorization'
+AUTH_HEADER_NAME = os.environ.get("F7T_AUTH_HEADER_NAME","Authorization")
 
 SYSTEMS_PUBLIC  = os.environ.get("F7T_SYSTEMS_PUBLIC").strip('\'"').split(";")
 # ; separated for system (related with SYSTEMS_PUBLIC length, and for each filesystem mounted inside each system, separated with ":")

diff --git a/src/storage/storage.py b/src/storage/storage.py
@@ -39,7 +39,7 @@
 
 STORAGE_PORT     = os.environ.get("F7T_STORAGE_PORT", 5000)
 
-AUTH_HEADER_NAME = 'Authorization'
+AUTH_HEADER_NAME = os.environ.get("F7T_AUTH_HEADER_NAME","Authorization")
 
 # SYSTEMS_PUBLIC: list of allowed systems
 # remove quotes and split into array

diff --git a/src/tasks/tasks.py b/src/tasks/tasks.py
@@ -17,9 +17,7 @@
     get_boolean_var, setup_logging, validate_input
 import tasks_persistence as persistence
 
-
-
-AUTH_HEADER_NAME = 'Authorization'
+AUTH_HEADER_NAME = os.environ.get("F7T_AUTH_HEADER_NAME","Authorization")
 
 KONG_URL    = os.environ.get("F7T_KONG_URL")
 

diff --git a/src/utilities/utilities.py b/src/utilities/utilities.py
@@ -23,7 +23,7 @@
 CERTIFICATOR_URL = os.environ.get("F7T_CERTIFICATOR_URL")
 UTILITIES_PORT   = os.environ.get("F7T_UTILITIES_PORT", 5000)
 
-AUTH_HEADER_NAME = 'Authorization'
+AUTH_HEADER_NAME = os.environ.get("F7T_AUTH_HEADER_NAME","Authorization")
 
 UTILITIES_TIMEOUT = int(os.environ.get("F7T_UTILITIES_TIMEOUT", "5"))