Merge branch 'RESTAPI-1295-change-logs-jwt' into 'master'

Change JWT logging See merge request firecrest/firecrest!323
eth-cscs · Oct 17, 2024 · fc42ecc · fc42ecc
2 parents 75c1f06 + 102633e
commit fc42ecc
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/deploy/demo/common/common.env b/deploy/demo/common/common.env
@@ -59,7 +59,8 @@ F7T_SYSTEMS_PUBLIC_NAME='cluster;cluster'
 #                                {'name':'SCRATCH', 'path':'/home', 'description':'Home filesystem'}] }"
 F7T_FILESYSTEMS="{
                    'cluster': [{'name':'HOME', 'path':'/home', 'description':'Users home filesystem'} , 
-                               {'name':'SCRATCH', 'path':'/scratch', 'description':'Scratch filesystem'}] 
+                               {'name':'SCRATCH', 'path':'/scratch', 'description':'Scratch filesystem'},
+                               {'name':'PROJECT', 'path':'/project', 'description':'Projects filesystem'}, ] 
                  } "  
 #internal machines that microservices connect to (in correlation with SYSTEMS_PUBLIC)
 F7T_SYSTEMS_INTERNAL_ADDR='192.168.220.12:22;192.168.220.12:22'

diff --git a/deploy/k8s/values-dev.yaml b/deploy/k8s/values-dev.yaml
@@ -15,7 +15,8 @@ F7T_CERTIFICATOR_HOST: svc-certificator
 F7T_COMPUTE_HOST: svc-compute
 F7T_FILESYSTEMS: "{
                    'cluster': [{'name':'HOME', 'path':'/home', 'description':'Users home filesystem'} , 
-                               {'name':'SCRATCH', 'path':'/scratch', 'description':'Scratch filesystem'}] 
+                               {'name':'SCRATCH', 'path':'/scratch', 'description':'Scratch filesystem'},
+                               {'name':'PROJECT', 'path':'/project', 'description':'Projects filesystem'}, ] 
                  } "
 F7T_GUNICORN_SSL: --ciphers TLS_AES_256_GCM_SHA384,TLS_CHACHA20_POLY1305_SHA256,TLS_AES_128_GCM_SHA256,DHE-RSA-AES256-GCM-SHA384,ECDHE-RSA-AES256-GCM-SHA384,ECDHE-RSA-AES128-GCM-SHA256 --ssl-version TLSv1_2 --keyfile /f7t-ssl.key --certfile /f7t-ssl.crt
 F7T_JAEGER_AGENT: svc-jaeger

diff --git a/src/common/cscs_api_common.py b/src/common/cscs_api_common.py
@@ -167,7 +167,8 @@ def check_header(header):
 
             except jwt.exceptions.InvalidSignatureError:
                 decoding_reason = "JWT token has invalid signature"
-                logging.error(decoding_reason, exc_info=False)
+                if DEBUG_MODE:
+                    logging.debug(decoding_reason, exc_info=False)
                 # try next key
                 continue
             except jwt.exceptions.ExpiredSignatureError:
@@ -245,15 +246,16 @@ def get_username(header):
                                          algorithms=[auth_pubkey["alg"]],
                                          audience=AUTH_AUDIENCE)
                 if DEBUG_MODE:
-                    logging.info("Correctly decoded")
+                    logging.debug("Correctly decoded")
 
                 # if token is correctly decoded, exit the loop
                 decoding_result = True
                 decoding_reason = ""
 
             except jwt.exceptions.InvalidSignatureError:
                 decoding_reason = "JWT token has invalid signature"
-                logging.error(decoding_reason, exc_info=False)
+                if DEBUG_MODE:
+                    logging.debug(decoding_reason, exc_info=False)
                 # try next key
                 continue
             except jwt.exceptions.ExpiredSignatureError:

diff --git a/src/tests/automated_tests/unit/test_unit_status.py b/src/tests/automated_tests/unit/test_unit_status.py
@@ -39,7 +39,7 @@ def test_status_system(system, headers):
 for system in SYSTEMS:
 	STATUS_CODES_SYSTEMS.append((system,200))
 	STATUS_CODES_FS.append((system,"HOME",200))
-	STATUS_CODES_FS.append((system,"SCRATCH",400))
+	STATUS_CODES_FS.append((system,"PROJECT",400))
 
 STATUS_CODES_SYSTEMS.append(("not-a-system",404))