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

antispam: filter protection-triggering messages from reaching other plugins (#359)

Browse Source
This commit is contained in:
James Lu 2018-04-13 22:14:59 -07:00
parent 3825b93dee
commit dd8f9411b6
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/antispam.py
View File

@ -13,10 +13,10 @@ PUNISH_OPTIONS = ['kill', 'ban', 'quiet', 'kick']
EXEMPT_OPTIONS = ['voice', 'halfop', 'op'] EXEMPT_OPTIONS = ['voice', 'halfop', 'op']
DEFAULT_EXEMPT_OPTION = 'halfop' DEFAULT_EXEMPT_OPTION = 'halfop'
def _punish(irc, target, channel, reason): def _punish(irc, target, channel, reason):
"""Punishes the target user.""" """Punishes the target user. This function returns True if the user was successfully punished."""
if irc.is_oper(target, allowAuthed=False): if irc.is_oper(target, allowAuthed=False):
log.debug("(%s) antispam: refusing to punish oper %s/%s", irc.name, target, irc.get_friendly_name(target)) log.debug("(%s) antispam: refusing to punish oper %s/%s", irc.name, target, irc.get_friendly_name(target))
return return False
exempt_level = irc.get_service_option('antispam', 'exempt_level', DEFAULT_EXEMPT_OPTION).lower() exempt_level = irc.get_service_option('antispam', 'exempt_level', DEFAULT_EXEMPT_OPTION).lower()
c = irc.channels[channel] c = irc.channels[channel]
@ -29,13 +29,13 @@ def _punish(irc, target, channel, reason):
if exempt_level == 'voice' and c.is_voice_plus(target): if exempt_level == 'voice' and c.is_voice_plus(target):
log.debug("(%s) antispam: refusing to punish voiced and above %s/%s", irc.name, target, irc.get_friendly_name(target)) log.debug("(%s) antispam: refusing to punish voiced and above %s/%s", irc.name, target, irc.get_friendly_name(target))
return return False
elif exempt_level == 'halfop' and c.is_halfop_plus(target): elif exempt_level == 'halfop' and c.is_halfop_plus(target):
log.debug("(%s) antispam: refusing to punish halfop and above %s/%s", irc.name, target, irc.get_friendly_name(target)) log.debug("(%s) antispam: refusing to punish halfop and above %s/%s", irc.name, target, irc.get_friendly_name(target))
return return False
elif exempt_level == 'op' and c.is_op_plus(target): elif exempt_level == 'op' and c.is_op_plus(target):
log.debug("(%s) antispam: refusing to punish op and above %s/%s", irc.name, target, irc.get_friendly_name(target)) log.debug("(%s) antispam: refusing to punish op and above %s/%s", irc.name, target, irc.get_friendly_name(target))
return return False
my_uid = sbot.uids.get(irc.name) my_uid = sbot.uids.get(irc.name)
@ -82,6 +82,7 @@ def _punish(irc, target, channel, reason):
{'target': channel, 'modes': bans, 'parse_as': 'MODE'}]) {'target': channel, 'modes': bans, 'parse_as': 'MODE'}])
if kill: if kill:
_kill() _kill()
return True
MASSHIGHLIGHT_DEFAULTS = { MASSHIGHLIGHT_DEFAULTS = {
'min_length': 50, 'min_length': 50,
@ -125,6 +126,7 @@ def handle_masshighlight(irc, source, command, args):
# Don't allow repeating the same nick to trigger punishment # Don't allow repeating the same nick to trigger punishment
nicks_caught = set() nicks_caught = set()
punished = False
for word in words: for word in words:
if word in userlist: if word in userlist:
nicks_caught.add(word) nicks_caught.add(word)
@ -132,10 +134,11 @@ def handle_masshighlight(irc, source, command, args):
reason = mhl_settings.get('reason', MASSHIGHLIGHT_DEFAULTS['reason']) reason = mhl_settings.get('reason', MASSHIGHLIGHT_DEFAULTS['reason'])
log.debug('(%s) antispam: calling _punish on %s/%s', irc.name, log.debug('(%s) antispam: calling _punish on %s/%s', irc.name,
source, irc.get_friendly_name(source)) source, irc.get_friendly_name(source))
_punish(irc, source, channel, reason) punished = _punish(irc, source, channel, reason)
break break
log.debug('(%s) antispam: got %s/%s nicks on message to %r', irc.name, len(nicks_caught), min_nicks, channel) log.debug('(%s) antispam: got %s/%s nicks on message to %r', irc.name, len(nicks_caught), min_nicks, channel)
return not punished # Filter this message from relay, etc. if it triggered protection
utils.add_hook(handle_masshighlight, 'PRIVMSG') utils.add_hook(handle_masshighlight, 'PRIVMSG', priority=1000)
utils.add_hook(handle_masshighlight, 'NOTICE') utils.add_hook(handle_masshighlight, 'NOTICE', priority=1000)