Drive/k8s-manifests
8
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Cleaner debug

Browse source
This commit is contained in:
Micke Nordin 2024-01-15 10:14:07 +01:00
parent a2aa3d06f4
commit e92dd6bd10
Signed by untrusted user: Micke
GPG key ID: F53C4CC83EDAB3BE
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
jupyter/base/values/values.yaml
View file

@ -12,6 +12,7 @@ hub:
extraConfig: extraConfig:
oauthCode: | oauthCode: |
import time import time
from datetime import datetime
from oauthenticator.generic import GenericOAuthenticator from oauthenticator.generic import GenericOAuthenticator
def post_auth_hook(authenticator, handler, authentication): def post_auth_hook(authenticator, handler, authentication):
@ -35,19 +36,25 @@ hub:
spawner.environment['NEXTCLOUD_ACCESS_TOKEN'] = access_token spawner.environment['NEXTCLOUD_ACCESS_TOKEN'] = access_token
async def refresh_user(self, user, handler=None): async def refresh_user(self, user, handler=None):
debug = 'NEXTCLOUD_DEBUG_OAUTH' in os.environ
auth_state = await user.get_auth_state() auth_state = await user.get_auth_state()
if not auth_state: if not auth_state:
print(f'auth_state missing for {user}') if debug:
print(f'auth_state missing for {user}')
return False return False
access_token = auth_state['access_token'] access_token = auth_state['access_token']
refresh_token = auth_state['refresh_token'] refresh_token = auth_state['refresh_token']
token_response = auth_state['token_response'] token_response = auth_state['token_response']
now = time.time() now = time.time()
now_hr = datetime.fromtimestamp(now)
expires = auth_state['token_expires'] expires = auth_state['token_expires']
expires_hr = datetime.fromtimestamp(expires)
if now >= expires: if now >= expires:
print(f'Time is: {now}, token expired: {expires}') if debug:
print(f'Time is: {now_hr}, token expired: {expires_hr}')
return False return False
print(f'Time is: {now}, token expires: {expires}') if debug:
print(f'Time is: {now_hr}, token expires: {expires_hr}')
return True return True
c.JupyterHub.authenticator_class = NextcloudOAuthenticator c.JupyterHub.authenticator_class = NextcloudOAuthenticator
@ -66,6 +73,7 @@ hub:
c.NextcloudOAuthenticator.post_auth_hook = post_auth_hook c.NextcloudOAuthenticator.post_auth_hook = post_auth_hook
extraEnv: extraEnv:
NEXTCLOUD_DEBUG_OAUTH: "yes"
NEXTCLOUD_HOST: sunet.drive.test.sunet.se NEXTCLOUD_HOST: sunet.drive.test.sunet.se
JUPYTER_HOST: jupyter.drive.test.sunet.se JUPYTER_HOST: jupyter.drive.test.sunet.se
JUPYTERHUB_CRYPT_KEY: JUPYTERHUB_CRYPT_KEY: