GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-30 14:49:28 +01:00
Code Issues Projects Releases Wiki Activity

relay: pretend mode reverts on SJOIN always succeed (#23)

Browse Source 
This prevents remote services from bypassing CLAIM, since the end result of a mode war is that they remained opped.
This commit is contained in:
James Lu 2019-06-21 15:28:52 -07:00
parent 94cd1d8f22
commit dcab011673
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/relay.py
View File

@ -1356,14 +1356,18 @@ def handle_join(irc, numeric, command, args):
irc.name, user, channel, modediff, oldmodes, newmodes) irc.name, user, channel, modediff, oldmodes, newmodes)
for modename in modediff: for modename in modediff:
modechar = irc.cmodes.get(modename) modechar = irc.cmodes.get(modename)
# Special case for U-lined servers: allow them to join with ops, # Special case for U-lined servers: allow them to join with ops, but don't forward this mode change on.
# but don't forward this mode change on.
if modechar and not irc.is_privileged_service(numeric): if modechar and not irc.is_privileged_service(numeric):
modes.append(('-%s' % modechar, user)) modes.append(('-%s' % modechar, user))
if modes and _claim_should_bounce(irc, channel): if modes:
if _claim_should_bounce(irc, channel):
log.debug('(%s) relay.handle_join: reverting modes on BURST: %s', irc.name, irc.join_modes(modes)) log.debug('(%s) relay.handle_join: reverting modes on BURST: %s', irc.name, irc.join_modes(modes))
irc.mode(irc.sid, channel, modes) irc.mode(irc.sid, channel, modes)
else:
# HACK: pretend we managed to deop the caller, so that they can't bypass claim entirely
log.debug('(%s) relay.handle_join: fake reverting modes on BURST: %s', irc.name, irc.join_modes(modes))
irc.apply_modes(channel, modes)
relay_joins(irc, channel, users, ts, burst=False) relay_joins(irc, channel, users, ts, burst=False)
utils.add_hook(handle_join, 'JOIN') utils.add_hook(handle_join, 'JOIN')