From 30386390262c24ee0ef73cacd7f6987b07919c66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz> Date: Wed, 10 Jul 2024 22:13:01 +0000 Subject: [PATCH] Do not use ownCloud without credentials - fixes internal spawn monitoring --- cesnet-central/deployments/fullhub.yaml | 21 +++++++++++---------- testing/deployments/hub.yaml | 21 +++++++++++---------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/cesnet-central/deployments/fullhub.yaml b/cesnet-central/deployments/fullhub.yaml index eef772b..203fd25 100644 --- a/cesnet-central/deployments/fullhub.yaml +++ b/cesnet-central/deployments/fullhub.yaml @@ -320,17 +320,18 @@ hub: ) self.token_path = os.path.join(self.token_mount_path, "access_token") - access_token = auth_state.get("access_token", None) - headers = { - "Accept": "application/json", - "User-Agent": "JupyterHub", - "Authorization": "Bearer %s" % access_token, - } + if auth_state: + access_token = auth_state.get("access_token", None) + headers = { + "Accept": "application/json", + "User-Agent": "JupyterHub", + "Authorization": "Bearer %s" % access_token, + } - # ownCloud user home - await self.append_owncloud_sidecar(spawner, "home", self.OCIS_PERSONAL_SPACE, headers=headers) - await self.append_owncloud_sidecar(spawner, "shared", self.OCIS_SHARED_WITH_ME, headers=headers) - await self.append_owncloud_sidecar(spawner, "spaces", self.OCIS_SPACES, headers=headers) + # ownCloud user home + await self.append_owncloud_sidecar(spawner, "home", self.OCIS_PERSONAL_SPACE, headers=headers) + await self.append_owncloud_sidecar(spawner, "shared", self.OCIS_SHARED_WITH_ME, headers=headers) + await self.append_owncloud_sidecar(spawner, "spaces", self.OCIS_SPACES, headers=headers) c.JupyterHub.spawner_class = WebDavOIDCSpawner diff --git a/testing/deployments/hub.yaml b/testing/deployments/hub.yaml index 47e0d6f..debd205 100644 --- a/testing/deployments/hub.yaml +++ b/testing/deployments/hub.yaml @@ -336,17 +336,18 @@ hub: ) self.token_path = os.path.join(self.token_mount_path, "access_token") - access_token = auth_state.get("access_token", None) - headers = { - "Accept": "application/json", - "User-Agent": "JupyterHub", - "Authorization": "Bearer %s" % access_token, - } + if auth_state: + access_token = auth_state.get("access_token", None) + headers = { + "Accept": "application/json", + "User-Agent": "JupyterHub", + "Authorization": "Bearer %s" % access_token, + } - # ownCloud user home - await self.append_owncloud_sidecar(spawner, "home", self.OCIS_PERSONAL_SPACE, headers=headers) - await self.append_owncloud_sidecar(spawner, "shared", self.OCIS_SHARED_WITH_ME, headers=headers) - await self.append_owncloud_sidecar(spawner, "spaces", self.OCIS_SPACES, headers=headers) + # ownCloud user home + await self.append_owncloud_sidecar(spawner, "home", self.OCIS_PERSONAL_SPACE, headers=headers) + await self.append_owncloud_sidecar(spawner, "shared", self.OCIS_SHARED_WITH_ME, headers=headers) + await self.append_owncloud_sidecar(spawner, "spaces", self.OCIS_SPACES, headers=headers) c.JupyterHub.spawner_class = WebDavOIDCSpawner -- GitLab