burmatovan/openuds
1
0
Fork 0
forked from shaba/openuds
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v3.6'

Browse Source
This commit is contained in:
Adolfo Gómez García 2022-08-14 21:53:33 +02:00
commit d84977dee0
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
server/src/uds/REST/methods/actor_v3.py
View File

@ -67,7 +67,8 @@ class BlockAccess(Exception):
# Helpers # Helpers
def fixIdsList(idsList: typing.List[str]) -> typing.List[str]:
return [i.upper() for i in idsList] + [i.lower() for i in idsList]
def checkBlockedIp(ip: str) -> None: def checkBlockedIp(ip: str) -> None:
if GlobalConfig.BLOCK_ACTOR_FAILURES.getBool() is False: if GlobalConfig.BLOCK_ACTOR_FAILURES.getBool() is False:
@ -85,7 +86,7 @@ def checkBlockedIp(ip: str) -> None:
def incFailedIp(ip: str) -> None: def incFailedIp(ip: str) -> None:
cache = Cache('actorv3') cache = Cache('actorv3')
fails = (cache.get(ip) or 0) + 1 fails = cache.get(ip, 0) + 1
cache.put(ip, fails, GlobalConfig.LOGIN_BLOCK.getInt()) cache.put(ip, fails, GlobalConfig.LOGIN_BLOCK.getInt())
@ -114,6 +115,7 @@ class ActorV3Action(Handler):
try: try:
return UserService.objects.get(uuid=self._params['token']) return UserService.objects.get(uuid=self._params['token'])
except UserService.DoesNotExist: except UserService.DoesNotExist:
logger.error('User service not found (params: %s)', self._params)
raise BlockAccess() raise BlockAccess()
def action(self) -> typing.MutableMapping[str, typing.Any]: def action(self) -> typing.MutableMapping[str, typing.Any]:
@ -121,13 +123,13 @@ class ActorV3Action(Handler):
def post(self) -> typing.MutableMapping[str, typing.Any]: def post(self) -> typing.MutableMapping[str, typing.Any]:
try: try:
checkBlockedIp(self._request.ip) # pylint: disable=protected-access checkBlockedIp(self._request.ip)
result = self.action() result = self.action()
logger.debug('Action result: %s', result) logger.debug('Action result: %s', result)
return result return result
except (BlockAccess, KeyError): except (BlockAccess, KeyError):
# For blocking attacks # For blocking attacks
incFailedIp(self._request.ip) # pylint: disable=protected-access incFailedIp(self._request.ip)
except Exception as e: except Exception as e:
logger.exception('Posting %s: %s', self.__class__, e) logger.exception('Posting %s: %s', self.__class__, e)
@ -182,6 +184,7 @@ class Register(ActorV3Action):
actorToken.log_level = self._params['log_level'] actorToken.log_level = self._params['log_level']
actorToken.stamp = getSqlDatetime() actorToken.stamp = getSqlDatetime()
actorToken.save() actorToken.save()
logger.info('Registered actor %s', self._params)
except Exception: except Exception:
actorToken = ActorToken.objects.create( actorToken = ActorToken.objects.create(
username=self._user.pretty_name, username=self._user.pretty_name,
@ -280,8 +283,8 @@ class Initialize(ActorV3Action):
# Valid actor token, now validate access allowed. That is, look for a valid mac from the ones provided. # Valid actor token, now validate access allowed. That is, look for a valid mac from the ones provided.
try: try:
# Enforce lowecase ids for sqlite # ensure idsLists has upper and lower versions for case sensitive databases
idsList = [i.lower() for i in idsList] idsList = fixIdsList(idsList)
# Set full filter # Set full filter
dbFilter = dbFilter.filter( dbFilter = dbFilter.filter(
unique_id__in=idsList, unique_id__in=idsList,
@ -459,8 +462,8 @@ class LoginLogout(ActorV3Action):
x['mac'] for x in self._params['id'] x['mac'] for x in self._params['id']
][:10] ][:10]
# Enforce lowercase for idList # ensure idsLists has upper and lower versions for case sensitive databases
idsList = [x.lower() for x in idsList] idsList = fixIdsList(idsList)
validId: typing.Optional[str] = service.getValidId(idsList) validId: typing.Optional[str] = service.getValidId(idsList)
@ -479,8 +482,10 @@ class LoginLogout(ActorV3Action):
else: else:
service.processLogout(validId, remote_login=is_remote) service.processLogout(validId, remote_login=is_remote)
# All right, service notified... # All right, service notified..
except Exception: except Exception as e :
# Log error and continue
logger.error('Error notifying service: %s (%s)', e, self._params)
raise BlockAccess() raise BlockAccess()
@ -698,8 +703,8 @@ class Unmanaged(ActorV3Action):
][:10] ][:10]
validId: typing.Optional[str] = service.getValidId(idsList) validId: typing.Optional[str] = service.getValidId(idsList)
# enforce lowercase idsList # ensure idsLists has upper and lower versions for case sensitive databases
idsList = [i.lower() for i in idsList] idsList = fixIdsList(idsList)
# Check if there is already an assigned user service # Check if there is already an assigned user service
# To notify it logout # To notify it logout