From a4fd0d7445f085560169c47700cbcba967b965a8 Mon Sep 17 00:00:00 2001 From: Jongmin Kim Date: Thu, 4 Jan 2024 21:32:49 +0900 Subject: [PATCH 1/2] chore: change debug log message --- src/spaceone/core/scheduler/worker.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/spaceone/core/scheduler/worker.py b/src/spaceone/core/scheduler/worker.py index 275326e..aa2e00a 100644 --- a/src/spaceone/core/scheduler/worker.py +++ b/src/spaceone/core/scheduler/worker.py @@ -38,20 +38,21 @@ def execute(self): caller = self._locator.get_manager(self.name) except Exception as e: - _LOGGER.debug(f"[SingleTask] fail at locator {e}") + _LOGGER.debug(f"[SingleTask.execute] locator error: {e}") raise ERROR_TASK_LOCATOR(locator=self.locator, name=self.name) try: _LOGGER.debug( - f"[SingleTask] request: {self.name}.{self.method} {self.params}" + f"[SingleTask.execute] (REQUEST) => {self.name}.{self.method}" ) method = getattr(caller, self.method) resp = method(**self.params) - _LOGGER.debug(f"[SingleTask] response: {resp}") + _LOGGER.debug(f"[SingleTask.execute] (RESPONSE) => SUCCESS") return resp except Exception as e: _LOGGER.error( - f"[SingleTask] fail to execute method: {self.method}, reason = {e}", + f"[SingleTask.execute] Fail to execute method ({self.method}): {e}", + exc_info=True, ) raise ERROR_TASK_METHOD( name=self.name, method=self.method, params=self.params From 3e16ee28652538b2a651047a9d1c65ac83ab2bea Mon Sep 17 00:00:00 2001 From: Jongmin Kim Date: Thu, 4 Jan 2024 22:00:56 +0900 Subject: [PATCH 2/2] refactor: change the token to only allow version 2.0. --- src/spaceone/core/handler/authentication_handler.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/spaceone/core/handler/authentication_handler.py b/src/spaceone/core/handler/authentication_handler.py index c738754..c32b52e 100644 --- a/src/spaceone/core/handler/authentication_handler.py +++ b/src/spaceone/core/handler/authentication_handler.py @@ -29,6 +29,10 @@ def verify(self, params: dict) -> None: if token_info.get("typ") == "SYSTEM_TOKEN": self._update_system_meta(token_info) else: + version = token_info.get("ver") + if version not in ["2.0"]: + raise ERROR_AUTHENTICATE_FAILURE(message="invalid token version.") + owner_type = token_info.get("own") if owner_type == "APP": client_id = token_info.get("jti")