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

relay: block networks not on the claim list from merging in modes when relinking

Browse Source 
This can cause channels to be inadvertently set modes that it shouldn't be on a relink (e.g. modes set by services DEFCON), since relay ignores modes from defined u-lines instead of bouncing them.
This commit is contained in:
James Lu 2018-05-20 23:33:39 -07:00
parent 1fb2a90580
commit c9c937e7a7
1 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
plugins/relay.py
View File

@ -710,6 +710,8 @@ def relay_joins(irc, channel, users, ts, targetirc=None, **kwargs):
log.debug('(%s) relay: resetting too low TS value of %s on %s to %s', irc.name, ts, users, current_ts) log.debug('(%s) relay: resetting too low TS value of %s on %s to %s', irc.name, ts, users, current_ts)
ts = current_ts ts = current_ts
claim_passed = check_claim(irc, channel, irc.uplink)
def _relay_joins_loop(irc, remoteirc, channel, users, ts, burst=True): def _relay_joins_loop(irc, remoteirc, channel, users, ts, burst=True):
queued_users = [] queued_users = []
@ -768,40 +770,45 @@ def relay_joins(irc, channel, users, ts, targetirc=None, **kwargs):
# SJOIN will be used if either the amount of users to join is > 1, or there are modes # SJOIN will be used if either the amount of users to join is > 1, or there are modes
# to be set on the joining user. # to be set on the joining user.
if burst or len(queued_users) > 1 or queued_users[0][0]: if burst or len(queued_users) > 1 or queued_users[0][0]:
modes = get_supported_cmodes(irc, remoteirc, channel, irc.channels[channel].modes) # Check CLAIM on the bursting network to see if they should be allowed to burst
# modes towards other links.
if claim_passed:
modes = get_supported_cmodes(irc, remoteirc, channel, irc.channels[channel].modes)
# Subtract any mode delta modes from this burst # Subtract any mode delta modes from this burst
relay = db[get_relay(irc, channel)] relay = db[get_relay(irc, channel)]
modedelta_modes = relay.get('modedelta') modedelta_modes = relay.get('modedelta')
if modedelta_modes: if modedelta_modes:
# Check if the target is a leaf channel: if so, add the mode delta modes to the target channel. # Check if the target is a leaf channel: if so, add the mode delta modes to the target channel.
# Otherwise, subtract this set of modes, as we don't want these modes from leaves to be sent back # Otherwise, subtract this set of modes, as we don't want these modes from leaves to be sent back
# to the original channel. # to the original channel.
adding = (remoteirc.name, remotechan) in relay['links'] adding = (remoteirc.name, remotechan) in relay['links']
# Add this to the SJOIN mode list. # Add this to the SJOIN mode list.
for mode in modedelta_modes: for mode in modedelta_modes:
modechar = remoteirc.cmodes.get(mode[0]) modechar = remoteirc.cmodes.get(mode[0])
if modechar: if modechar:
if modechar in remoteirc.cmodes['*A'] or modechar in remoteirc.prefixmodes: if modechar in remoteirc.cmodes['*A'] or modechar in remoteirc.prefixmodes:
log.warning('(%s) Refusing to set modedelta mode %r on %s because it is a list or prefix mode', log.warning('(%s) Refusing to set modedelta mode %r on %s because it is a list or prefix mode',
irc.name, modechar, channel) irc.name, modechar, channel)
continue continue
elif not remoteirc.has_cap('can-spawn-clients'): elif not remoteirc.has_cap('can-spawn-clients'):
log.debug('(%s) relay.handle_mode: Not enforcing modedelta modes on bot-only network %s', log.debug('(%s) relay.handle_mode: Not enforcing modedelta modes on bot-only network %s',
irc.name, remoteirc.name) irc.name, remoteirc.name)
continue continue
modedelta_mode = ('+%s' % modechar, mode[1]) modedelta_mode = ('+%s' % modechar, mode[1])
if adding: if adding:
log.debug('(%s) relay.relay_joins: adding %r on %s/%s (modedelta)', irc.name, log.debug('(%s) relay.relay_joins: adding %r on %s/%s (modedelta)', irc.name,
str(modedelta_mode), remoteirc.name, remotechan) str(modedelta_mode), remoteirc.name, remotechan)
modes.append(modedelta_mode) modes.append(modedelta_mode)
elif modedelta_mode in modes: elif modedelta_mode in modes:
log.debug('(%s) relay.relay_joins: removing %r on %s/%s (modedelta)', irc.name, log.debug('(%s) relay.relay_joins: removing %r on %s/%s (modedelta)', irc.name,
str(modedelta_mode), remoteirc.name, remotechan) str(modedelta_mode), remoteirc.name, remotechan)
modes.remove(modedelta_mode) modes.remove(modedelta_mode)
else:
modes = set()
if rsid: if rsid:
remoteirc.sjoin(rsid, remotechan, queued_users, ts=ts, modes=modes) remoteirc.sjoin(rsid, remotechan, queued_users, ts=ts, modes=modes)