GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-12-18 08:02:51 +01:00
Code Issues Projects Releases Wiki Activity

unreal: simplify capability checks & require NICKIP cap

Browse Source
This commit is contained in:
James Lu 2016-04-09 11:34:09 -07:00
parent 29030073b9
commit 5dee6ab651
1 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
protocols/unreal.py
View File

@ -30,19 +30,10 @@ class UnrealProtocol(TS6BaseProtocol):
'SETIDENT': 'CHGIDENT', 'SETNAME': 'CHGNAME', 'SETIDENT': 'CHGIDENT', 'SETNAME': 'CHGNAME',
'EOS': 'ENDBURST'} 'EOS': 'ENDBURST'}
self.caps = {} self.caps = []
self.irc.prefixmodes = {'q': '~', 'a': '&', 'o': '@', 'h': '%', 'v': '+'} self.irc.prefixmodes = {'q': '~', 'a': '&', 'o': '@', 'h': '%', 'v': '+'}
self._unrealCmodes = {'l': 'limit', 'c': 'blockcolor', 'G': 'censor',
'D': 'delayjoin', 'n': 'noextmsg', 's': 'secret',
'T': 'nonotice', 'z': 'sslonly', 'b': 'ban', 'V': 'noinvite',
'Z': 'issecure', 'r': 'registered', 'N': 'nonick',
'e': 'banexception', 'R': 'regonly', 'M': 'regmoderated',
'p': 'private', 'Q': 'nokick', 'P': 'permanent', 'k': 'key',
'C': 'noctcp', 'O': 'operonly', 'S': 'stripcolor',
'm': 'moderated', 'K': 'noknock', 'o': 'op', 'v': 'voice',
'I': 'invex', 't': 'topiclock', 'f': 'flood_unreal'}
self._neededCaps = ["VL", "SID", "CHANMODES", "NOQUIT", "SJ3"] self.needed_caps = ["VL", "SID", "CHANMODES", "NOQUIT", "SJ3", "NICKIP"]
# Some command aliases # Some command aliases
self.handle_svskill = self.handle_kill self.handle_svskill = self.handle_kill
@ -428,13 +419,12 @@ class UnrealProtocol(TS6BaseProtocol):
# <- SERVER unreal.midnight.vpn 1 :U3999-Fhin6OoEM UnrealIRCd test server # <- SERVER unreal.midnight.vpn 1 :U3999-Fhin6OoEM UnrealIRCd test server
sname = args[0] sname = args[0]
if numeric == self.irc.uplink and not self.irc.connected.is_set(): # We're doing authentication if numeric == self.irc.uplink and not self.irc.connected.is_set(): # We're doing authentication
for cap in self._neededCaps: for cap in self.needed_caps:
if cap not in self.caps: if cap not in self.caps:
raise ProtocolError("Not all required capabilities were met " raise ProtocolError("Not all required capabilities were met "
"by the remote server. Your version of UnrealIRCd " "by the remote server. Your version of UnrealIRCd "
"is probably too old! (Got: %s, needed: %s)" % "is probably too old! (Got: %s, needed: %s)" %
(sorted(self.caps.keys()), (sorted(self.caps), sorted(self.needed_caps)))
sorted(_neededCaps)))
sdesc = args[-1].split(" ") sdesc = args[-1].split(" ")
# Get our protocol version :) # Get our protocol version :)
vline = sdesc[0].split('-', 1) vline = sdesc[0].split('-', 1)
@ -479,29 +469,35 @@ class UnrealProtocol(TS6BaseProtocol):
return super().handle_squit(numeric, 'SQUIT', args) return super().handle_squit(numeric, 'SQUIT', args)
def handle_protoctl(self, numeric, command, args): def handle_protoctl(self, numeric, command, args):
"""Handles protocol negotiation."""
cmodes = {'noknock': 'K', 'limit': 'l', 'registered': 'r', 'flood_unreal': 'f',
'censor': 'G', 'noextmsg': 'n', 'invex': 'I', 'permanent': 'P',
'sslonly': 'z', 'operonly': 'O', 'moderated': 'm', 'blockcolor': 'c',
'regmoderated': 'M', 'noctcp': 'C', 'secret': 's', 'ban': 'b',
'nokick': 'Q', 'private': 'p', 'stripcolor': 'S', 'key': 'k',
'op': 'o', 'voice': 'v', 'regonly': 'R', 'noinvite': 'V',
'banexception': 'e', 'nonick': 'N', 'issecure': 'Z', 'topiclock': 't',
'nonotice': 'T', 'delayjoin': 'D'}
# Make a list of all our capability names.
self.caps += [arg.split('=')[0] for arg in args]
# <- PROTOCTL NOQUIT NICKv2 SJOIN SJOIN2 UMODE2 VL SJ3 TKLEXT TKLEXT2 NICKIP ESVID # <- PROTOCTL NOQUIT NICKv2 SJOIN SJOIN2 UMODE2 VL SJ3 TKLEXT TKLEXT2 NICKIP ESVID
# <- PROTOCTL CHANMODES=beI,k,l,psmntirzMQNRTOVKDdGPZSCc NICKCHARS= SID=001 MLOCK TS=1441314501 EXTSWHOIS # <- PROTOCTL CHANMODES=beI,k,l,psmntirzMQNRTOVKDdGPZSCc NICKCHARS= SID=001 MLOCK TS=1441314501 EXTSWHOIS
for cap in args: for cap in args:
if cap.startswith('SID'): if cap.startswith('SID'):
self.irc.uplink = cap.split('=', 1)[1] self.irc.uplink = cap.split('=', 1)[1]
self.caps['SID'] = True
elif cap.startswith('CHANMODES'): elif cap.startswith('CHANMODES'):
cmodes = cap.split('=', 1)[1] # Parse all the supported channel modes.
self.irc.cmodes['*A'], self.irc.cmodes['*B'], self.irc.cmodes['*C'], self.irc.cmodes['*D'] = cmodes.split(',') supported_cmodes = cap.split('=', 1)[1]
for m in cmodes: self.irc.cmodes['*A'], self.irc.cmodes['*B'], self.irc.cmodes['*C'], self.irc.cmodes['*D'] = supported_cmodes.split(',')
if m in self._unrealCmodes: for namedmode, modechar in cmodes.items():
self.irc.cmodes[self._unrealCmodes[m]] = m if modechar in supported_cmodes:
self.caps['CHANMODES'] = True self.irc.cmodes[namedmode] = modechar
self.irc.cmodes['*B'] += 'f' # Add +f to the list too, dunno why it isn't there. self.irc.cmodes['*B'] += 'f' # Add +f to the list too, dunno why it isn't there.
# Because more than one PROTOCTL line is sent, we have to delay the
# check to see whether our needed capabilities are all there... # Add in the supported prefix modes.
# That's done by handle_server(), which comes right after PROTOCTL.
elif cap == 'VL':
self.caps['VL'] = True
elif cap == 'NOQUIT':
self.caps['NOQUIT'] = True
elif cap == 'SJ3':
self.caps['SJ3'] = True
self.irc.cmodes.update({'halfop': 'h', 'admin': 'a', 'owner': 'q', self.irc.cmodes.update({'halfop': 'h', 'admin': 'a', 'owner': 'q',
'op': 'o', 'voice': 'v'}) 'op': 'o', 'voice': 'v'})