GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-27 21:19:31 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/wip/track-user-ssl' into devel

Browse Source
This commit is contained in:
James Lu 2021-06-13 00:11:18 -07:00
commit 6ba99b302f
6 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
classes.py
View File

@ -112,6 +112,9 @@ class User(TSObject):
# Stores service bot name if applicable
self.service = None
# Whether the user is using SSL/TLS (None = unknown)
self.ssl = None
@property
def nick(self):
return self._nick

3
protocols/hybrid.py
View File

@ -211,6 +211,9 @@ class HybridProtocol(TS6Protocol):
# Call the OPERED UP hook if +o is being added to the mode list.
self._check_oper_status_change(uid, parsedmodes)
# Track SSL/TLS status
self.users[uid].ssl = ('+S', None) in parsedmodes
# Set the account name if present
if account:
self.call_hooks([uid, 'CLIENT_SERVICES_LOGIN', {'text': account}])

2
protocols/inspircd.py
View File

@ -986,6 +986,8 @@ class InspIRCdProtocol(TS6BaseProtocol):
self._modsupport.add(module[1:])
else:
log.warning('(%s) Got unknown METADATA modules string: %r', self.name, args[-1])
elif args[1] == 'ssl_cert' and uid in self.users:
self.users[uid].ssl = True
def handle_version(self, numeric, command, args):
"""

4
protocols/p10.py
View File

@ -935,6 +935,7 @@ class P10Protocol(IRCS2SProtocol):
ident, host, realname, realhost, ip)
uobj = self.users[uid] = User(self, nick, ts, uid, source, ident, host, realname, realhost, ip)
uobj.ssl = False
self.servers[source].users.add(uid)
# https://github.com/evilnet/nefarious2/blob/master/doc/p10.txt#L708
@ -952,6 +953,9 @@ class P10Protocol(IRCS2SProtocol):
accountname = modepair[1].split(':', 1)[0]
self.call_hooks([uid, 'CLIENT_SERVICES_LOGIN', {'text': accountname}])
elif modepair[0][-1] == self.umodes.get('ssl'): # track SSL status where available
uobj.ssl = True
# Call the OPERED UP hook if +o is being added to the mode list.
self._check_oper_status_change(uid, parsedmodes)

12
protocols/ts6.py
View File

@ -317,19 +317,19 @@ class TS6Protocol(TS6BaseProtocol):
'quiet': 'q', 'redirect': 'f', 'freetarget': 'F',
'joinflood': 'j', 'largebanlist': 'L', 'permanent': 'P',
'noforwards': 'Q', 'stripcolor': 'c', 'allowinvite':
'g', 'opmoderated': 'z', 'noctcp': 'C', 'ssl': 'Z',
'g', 'opmoderated': 'z', 'noctcp': 'C',
# charybdis modes provided by extensions
'operonly': 'O', 'adminonly': 'A', 'sslonly': 'S',
'nonotice': 'T',
'*A': 'beIq', '*B': 'k', '*C': 'lfj', '*D': 'mnprstFLPQcgzCZOAST'
'*A': 'beIq', '*B': 'k', '*C': 'lfj', '*D': 'mnprstFLPQcgzCOAST'
})
self.umodes.update({
'deaf': 'D', 'servprotect': 'S', 'admin': 'a',
'invisible': 'i', 'oper': 'o', 'wallops': 'w',
'snomask': 's', 'noforward': 'Q', 'regdeaf': 'R',
'callerid': 'g', 'operwall': 'z', 'locops': 'l',
'cloak': 'x', 'override': 'p',
'*A': '', '*B': '', '*C': '', '*D': 'DSaiowsQRgzlxp'
'cloak': 'x', 'override': 'p', 'ssl': 'Z',
'*A': '', '*B': '', '*C': '', '*D': 'DSaiowsQRgzlxpZ'
})
# Charybdis extbans
@ -605,6 +605,10 @@ class TS6Protocol(TS6BaseProtocol):
if accountname != "*":
self.call_hooks([uid, 'CLIENT_SERVICES_LOGIN', {'text': accountname}])
# charybdis and derivatives have a usermode (+Z) to mark SSL connections
# ratbox doesn't appear to have this
self.users[uid].ssl = ('+%s' % self.umodes.get('ssl'), None) in parsedmodes
return {'uid': uid, 'ts': ts, 'nick': nick, 'realhost': realhost, 'host': host, 'ident': ident, 'ip': ip}
def handle_uid(self, numeric, command, args):

3
protocols/unreal.py
View File

@ -508,6 +508,9 @@ class UnrealProtocol(TS6BaseProtocol):
if ('+r', None) in parsedmodes and accountname.isdigit():
accountname = nick
# Track SSL/TLS status
self.users[uid].ssl = ('+z', None) in parsedmodes
if not accountname.isdigit():
self.call_hooks([uid, 'CLIENT_SERVICES_LOGIN', {'text': accountname}])