Skip to content

Change Token Policy #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
whdalsrnt merged 2 commits into from
Jan 4, 2024
Merged

Change Token Policy #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4fd0d7
chore: change debug log message
Jan 4, 2024
3e16ee2
refactor: change the token to only allow version 2.0.
Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/spaceone/core/handler/authentication_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
9 changes: 5 additions & 4 deletions src/spaceone/core/scheduler/worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down