kaqing 2.0.98__py3-none-any.whl → 2.0.203__py3-none-any.whl

adam/sso/authn_ad.py

@@ -1,6 +1,5 @@
 import json
 import re
-import traceback
 import jwt
 import requests
 from urllib.parse import urlparse, parse_qs
@@ -8,6 +7,7 @@ from urllib.parse import urlparse, parse_qs
 from adam.log import Log
 from adam.sso.authenticator import Authenticator
 from adam.sso.id_token import IdToken
+from adam.utils import debug, log_exc
 from .idp_login import IdpLogin
 from adam.config import Config
 
@@ -33,7 +33,7 @@ class AdAuthenticator(Authenticator):
 
         session = requests.Session()
         r = session.get(idp_uri)
-        Config().debug(f'{r.status_code} {idp_uri}')
+        debug(f'{r.status_code} {idp_uri}')
 
         config = self.validate_and_return_config(r)
 
@@ -52,7 +52,7 @@ class AdAuthenticator(Authenticator):
         r = session.post(login_uri, data=body, headers={
             'Content-Type': 'application/x-www-form-urlencoded'
         })
-        Config().debug(f'{r.status_code} {login_uri}')
+        debug(f'{r.status_code} {login_uri}')
 
         config = self.validate_and_return_config(r)
 
@@ -69,7 +69,7 @@ class AdAuthenticator(Authenticator):
         r = session.post(kmsi_uri, data=body, headers={
             'Content-Type': 'application/x-www-form-urlencoded'
         })
-        Config().debug(f'{r.status_code} {kmsi_uri}')
+        debug(f'{r.status_code} {kmsi_uri}')
 
         if (config := self.extract_config_object(r.text)):
             if 'sErrorCode' in config and config['sErrorCode'] == '50058':
@@ -101,7 +101,7 @@ class AdAuthenticator(Authenticator):
 
     def validate_and_return_config(self, r: requests.Response):
         if r.status_code < 200 or r.status_code >= 300:
-            Config().debug(r.text)
+            debug(r.text)
 
             return None
 
@@ -138,7 +138,7 @@ class AdAuthenticator(Authenticator):
 
     def parse_id_token(self, id_token: str) -> IdToken:
         jwks_url = Config().get('idps.ad.jwks-uri', '')
-        try:
+        with log_exc():
             jwks_client = jwt.PyJWKClient(jwks_url, cache_jwk_set=True, lifespan=360)
             signing_key = jwks_client.get_signing_key_from_jwt(id_token)
             data = jwt.decode(
@@ -163,7 +163,5 @@ class AdAuthenticator(Authenticator):
                 nbf=data['nbf'] if 'nbf' in data else 0,
                 exp=data['exp'] if 'exp' in data else 0
             )
-        except:
-            Config().debug(traceback.format_exc())
 
         return None

adam/sso/authn_okta.py

@@ -8,7 +8,7 @@ from adam.sso.id_token import IdToken
 
 from .idp_login import IdpLogin
 from adam.config import Config
-from adam.utils import log2
+from adam.utils import debug, log2, log_exc
 
 class OktaException(Exception):
     pass
@@ -49,7 +49,7 @@ class OktaAuthenticator(Authenticator):
 
         session = requests.Session()
         response = session.post(authn_uri, headers=headers, data=json.dumps(payload))
-        Config().debug(f'{response.status_code} {authn_uri}')
+        debug(f'{response.status_code} {authn_uri}')
         auth_response = response.json()
 
         if 'sessionToken' not in auth_response:
@@ -59,7 +59,7 @@ class OktaAuthenticator(Authenticator):
 
         url = f'{idp_uri}&sessionToken={session_token}'
         r = session.get(url)
-        Config().debug(f'{r.status_code} {url}')
+        debug(f'{r.status_code} {url}')
 
         id_token = OktaAuthenticator().extract(r.text, r'.*name=\"id_token\" value=\"(.*?)\".*')
         if not id_token:
@@ -95,7 +95,7 @@ class OktaAuthenticator(Authenticator):
             return None
 
         jwks_url = Config().get('idps.okta.jwks-uri', 'https://c3energy.okta.com/oauth2/v1/keys')
-        try:
+        with log_exc():
             jwks_client = jwt.PyJWKClient(jwks_url, cache_jwk_set=True, lifespan=360)
             signing_key = jwks_client.get_signing_key_from_jwt(id_token)
             data = jwt.decode(
@@ -121,7 +121,5 @@ class OktaAuthenticator(Authenticator):
                 nbf=data['nbf'] if 'nbf' in data else 0,
                 exp=data['exp'] if 'exp' in data else 0
             )
-        except:
-            pass
 
         return None

adam/sso/cred_cache.py

@@ -1,9 +1,9 @@
 import os
 from pathlib import Path
-import traceback
 from dotenv import load_dotenv
 
 from adam.config import Config
+from adam.utils import debug, log_exc
 from adam.utils_k8s.kube_context import KubeContext
 
 class CredCache:
@@ -34,10 +34,8 @@ class CredCache:
     def cache(self, username: str, password: str = None):
         if os.path.exists(self.env_f):
             with open(self.env_f, 'w') as file:
-                try:
+                with log_exc():
                     file.truncate()
-                except:
-                    Config().debug(traceback.format_exc())
 
         updated = []
         updated.append(f'IDP_USERNAME={username}')
@@ -56,4 +54,4 @@ class CredCache:
             if password:
                 self.overrides['IDP_PASSWORD'] = password
 
-            Config().debug(f'Cached username: {username}, password: {password}, try load: {self.get_username()}')
+            debug(f'Cached username: {username}, password: {password}, try load: {self.get_username()}')

adam/sso/idp.py

@@ -3,7 +3,6 @@ import getpass
 import os
 import sys
 import termios
-import traceback
 from typing import Callable, TypeVar
 import requests
 from kubernetes import config
@@ -15,7 +14,7 @@ from .cred_cache import CredCache
 from .idp_session import IdpSession
 from .idp_login import IdpLogin
 from adam.config import Config
-from adam.utils import log, log2
+from adam.utils import debug, log, log_exc
 
 T = TypeVar('T')
 
@@ -31,6 +30,8 @@ class Idp:
     def login(app_host: str, username: str = None, idp_uri: str = None, forced = False, use_token_from_env = True, use_cached_creds = True, verify = True) -> IdpLogin:
         session: IdpSession = IdpSession.create(username, app_host, app_host, idp_uri=idp_uri)
 
+        debug(f'Idp.login({username})')
+
         if use_token_from_env:
             if l0 := session.login_from_env_var():
                 return l0
@@ -39,11 +40,9 @@ class Idp:
                 token_server = Config().get('app.login.token-server-url', 'http://localhost:{port}').replace('{port}', port)
                 res: requests.Response = requests.get(token_server)
                 if res.status_code == 200 and res.text:
-                    try:
+                    with log_exc():
                         # may fail if the idp token is not complete
                         return session.login_from_token(res.text)
-                    except:
-                        pass
 
         r: IdpLogin = None
         try:
@@ -57,10 +56,11 @@ class Idp:
                 default_user: str = None
                 if use_cached_creds:
                     default_user = CredCache().get_username()
-                    Config().debug(f'User read from cache: {default_user}')
+                    debug(f'User read from cache: {default_user}')
 
-                if from_env := os.getenv('USERNAME'):
-                    default_user = from_env
+                # no value in using USERNAME
+                # if from_env := os.getenv('USERNAME') and in_docker():
+                #     default_user = from_env
                 if default_user and default_user != username:
                     session = IdpSession.create(default_user, app_host, app_host)
 
@@ -125,7 +125,7 @@ class Idp:
             termios.tcsetattr(fd, termios.TCSADRAIN, old)
 
     def try_kubeconfig(username: str, kubeconfig: str):
-        try:
+        with log_exc():
             if kubeconfig[0] == '\t':
                 kubeconfig = kubeconfig[1:]
             kubeconfig_string = base64.b64decode(kubeconfig.encode('ascii') + b'==').decode('utf-8')
@@ -136,8 +136,5 @@ class Idp:
                 Secrets.list_secrets(os.getenv('NAMESPACE'))
 
                 return IdpLogin(None, None, None, username)
-        except:
-            Config().debug(traceback.format_exc())
-            pass
 
         return None