Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions auth/auth_server/controllers/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -211,12 +211,12 @@ def get(self, item_id, **kwargs):
if 'token' in kwargs:
token = kwargs.pop('token')
user = self.get_user(token)
action_resources = self.get_action_resources(token,
['LIST_USERS'])
if not (check_action(action_resources, 'LIST_USERS',
item.type.name, item.scope_id) or
self._is_self_edit(user, item_id)):
raise ForbiddenException(Err.OA0012, [])
if not self._is_self_edit(user, item_id):
action_resources = self.get_action_resources(
token, ['LIST_USERS'])
if not check_action(action_resources, 'LIST_USERS',
item.type.name, item.scope_id):
raise ForbiddenException(Err.OA0012, [])
payload = ((item.type.name, item.scope_id),)
scope_info = self.get_resources_info(payload).get(item.scope_id, {})
return item, scope_info
Expand Down
2 changes: 2 additions & 0 deletions rest_api/rest_api_server/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from concurrent.futures import ThreadPoolExecutor
from datetime import datetime
from decimal import Decimal
from functools import cache
from string import ascii_letters, digits
from urllib.parse import urlencode

Expand Down Expand Up @@ -523,6 +524,7 @@ def get_root_directory_path():
return os.path.dirname(os.path.dirname(os.path.abspath(__file__)))


@cache
def _get_encryption_salt():
return Config().client.encryption_salt()

Expand Down
Loading