p15693087
/
monkey
forked from p15670423/monkey
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Agent: Add RelayUserHandler._remove_expired_users()

This commit is contained in:
Mike Salvatore 2022-09-07 00:16:35 -04:00
parent e2736a9273
commit 5a83401a02
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
monkey/infection_monkey/network/relay/relay_user_handler.py
View File

@ -77,9 +77,7 @@ class RelayUserHandler:
Return whether or not we have any potential users. Return whether or not we have any potential users.
""" """
with self._lock: with self._lock:
self._potential_users = dict( self._potential_users = RelayUserHandler._remove_expired_users(self._potential_users)
filter(lambda ru: not ru[1].timer.is_expired(), self._potential_users.items())
)
return len(self._potential_users) > 0 return len(self._potential_users) > 0
@ -88,8 +86,12 @@ class RelayUserHandler:
Return whether or not we have any relay users. Return whether or not we have any relay users.
""" """
with self._lock: with self._lock:
self._relay_users = dict( self._relay_users = RelayUserHandler._remove_expired_users(self._relay_users)
filter(lambda ru: not ru[1].timer.is_expired(), self._relay_users.items())
)
return len(self._relay_users) > 0 return len(self._relay_users) > 0
@staticmethod
def _remove_expired_users(
user_list: Dict[IPv4Address, RelayUser]
) -> Dict[IPv4Address, RelayUser]:
return dict(filter(lambda ru: not ru[1].timer.is_expired(), user_list.items()))