GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2025-02-25 09:50:39 +01:00
Code Issues Projects Releases Wiki Activity

classes, clientbot: don't allow _get_UID in parse_modes to create new users

Browse Source
This commit is contained in:
James Lu 2019-08-23 21:22:28 -07:00
parent da58669de5
commit c1dbfdab48
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes.py
View File

@ -929,7 +929,7 @@ class PyLinkNetworkCoreWithUtils(PyLinkNetworkCore):
log.debug('Mode %s: This mode is a prefix mode.', mode) log.debug('Mode %s: This mode is a prefix mode.', mode)
arg = args.pop(0) arg = args.pop(0)
# Convert nicks to UIDs implicitly # Convert nicks to UIDs implicitly
arg = self._get_UID(arg) arg = self._get_UID(arg) or arg
if arg not in self.users: # Target doesn't exist, skip it. if arg not in self.users: # Target doesn't exist, skip it.
log.debug('(%s) Skipping setting mode "%s %s"; the ' log.debug('(%s) Skipping setting mode "%s %s"; the '
'target doesn\'t seem to exist!', self.name, 'target doesn\'t seem to exist!', self.name,

6
protocols/clientbot.py
View File

@ -31,7 +31,7 @@ class ClientbotBaseProtocol(PyLinkNetworkCoreWithUtils):
# Remove conf key checks for those not needed for Clientbot. # Remove conf key checks for those not needed for Clientbot.
self.conf_keys -= {'recvpass', 'sendpass', 'sid', 'sidrange', 'hostname'} self.conf_keys -= {'recvpass', 'sendpass', 'sid', 'sidrange', 'hostname'}
def _get_UID(self, nick, ident=None, host=None, spawn_new=True): def _get_UID(self, nick, ident=None, host=None, spawn_new=False):
""" """
Fetches the UID for the given nick, creating one if it does not already exist and spawn_new is True. Fetches the UID for the given nick, creating one if it does not already exist and spawn_new is True.
@ -477,7 +477,7 @@ class ClientbotWrapperProtocol(ClientbotBaseProtocol, IRCCommonProtocol):
except ValueError: except ValueError:
ident = host = None # Set ident and host as null for now. ident = host = None # Set ident and host as null for now.
nick = sender # Treat the sender prefix we received as a nick. nick = sender # Treat the sender prefix we received as a nick.
idsource = self._get_UID(nick, ident, host) idsource = self._get_UID(nick, ident, host, spawn_new=True)
if idsource in self.users: if idsource in self.users:
# Handle IRCv3.2 account-tag. # Handle IRCv3.2 account-tag.
@ -719,7 +719,7 @@ class ClientbotWrapperProtocol(ClientbotBaseProtocol, IRCCommonProtocol):
# Get the PUID for the given nick. If one doesn't exist, spawn # Get the PUID for the given nick. If one doesn't exist, spawn
# a new virtual user. # a new virtual user.
idsource = self._get_UID(nick, ident=ident, host=host) idsource = self._get_UID(nick, ident=ident, host=host, spawn_new=True)
# Queue these virtual users to be joined if they're not already in the channel, # Queue these virtual users to be joined if they're not already in the channel,
# or we're waiting for a kick acknowledgment for them. # or we're waiting for a kick acknowledgment for them.