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

relay: log rejected links due to LINKACL to WARNING

Browse Source 
Closes #609.
This commit is contained in:
James Lu 2018-05-20 22:16:07 -07:00
parent 20bbf531e6
commit 1fb2a90580
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/relay.py
View File

@ -2286,6 +2286,9 @@ def link(irc, source, args):
if ((not whitelist_mode) and irc.name in entry['blocked_nets']) or \ if ((not whitelist_mode) and irc.name in entry['blocked_nets']) or \
(whitelist_mode and irc.name not in entry.get('allowed_nets', set())): (whitelist_mode and irc.name not in entry.get('allowed_nets', set())):
irc.error('Access denied (target channel is not open to links).') irc.error('Access denied (target channel is not open to links).')
log.warning('(%s) relay: Blocking link request %s%s -> %s%s from %s due to LINKACL (whitelist_mode=%s)',
irc.name, irc.name, localchan, remotenet, channel,
irc.get_hostmask(source), whitelist_mode)
return return
for link in entry['links']: for link in entry['links']:
if link[0] == irc.name: if link[0] == irc.name:
@ -2313,7 +2316,7 @@ def link(irc, source, args):
their_ts = world.networkobjects[remotenet].channels[channel].ts their_ts = world.networkobjects[remotenet].channels[channel].ts
if (our_ts < their_ts) and irc.has_cap('has-ts'): if (our_ts < their_ts) and irc.has_cap('has-ts'):
log.debug('(%s) relay: Blocking link request %s%s -> %s%s due to bad TS (%s < %s)', irc.name, log.debug('(%s) relay: Blocking link request %s%s -> %s%s due to bad TS (%s < %s)', irc.name,
irc.name, localchan, remotenet, args.channel, our_ts, their_ts) irc.name, localchan, remotenet, channel, our_ts, their_ts)
irc.error("The channel creation date (TS) on %s (%s) is lower than the target " irc.error("The channel creation date (TS) on %s (%s) is lower than the target "
"channel's (%s); refusing to link. You should clear the local channel %s first " "channel's (%s); refusing to link. You should clear the local channel %s first "
"before linking, or use a different local channel (you may be able to " "before linking, or use a different local channel (you may be able to "