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

handlers: Optionally disable extended WHOIS replies for users marked as a bot

Browse Source 
Closes #271. This adds a new option, "whois_show_extensions_to_bots", to the bot: section of the config.
This commit is contained in:
James Lu 2016-07-11 15:01:34 -07:00
parent ba20016a83
commit 2c656341e2
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
coremods/handlers.py
View File

@ -2,7 +2,7 @@
handlers.py - Implements miscellaneous IRC command handlers (WHOIS, services login, etc.) handlers.py - Implements miscellaneous IRC command handlers (WHOIS, services login, etc.)
""" """
from pylinkirc import utils from pylinkirc import utils, conf
from pylinkirc.log import log from pylinkirc.log import log
def handle_whois(irc, source, command, args): def handle_whois(irc, source, command, args):
@ -17,6 +17,7 @@ def handle_whois(irc, source, command, args):
server = irc.getServer(target) or irc.sid server = irc.getServer(target) or irc.sid
nick = user.nick nick = user.nick
sourceisOper = ('o', None) in irc.users[source].modes sourceisOper = ('o', None) in irc.users[source].modes
sourceisBot = (irc.umodes.get('bot'), None) in irc.users[source].modes
# Get the full network name. # Get the full network name.
netname = irc.serverdata.get('netname', irc.name) netname = irc.serverdata.get('netname', irc.name)
@ -88,8 +89,13 @@ def handle_whois(irc, source, command, args):
# Show botmode info in WHOIS. # Show botmode info in WHOIS.
f(server, 335, source, "%s :is a bot" % nick) f(server, 335, source, "%s :is a bot" % nick)
# Call custom WHOIS handlers via the PYLINK_CUSTOM_WHOIS hook. # Call custom WHOIS handlers via the PYLINK_CUSTOM_WHOIS hook, unless the
irc.callHooks([source, 'PYLINK_CUSTOM_WHOIS', {'target': target, 'server': server}]) # caller is marked a bot and the whois_show_extensions_to_bots option is False
if (sourceisBot and conf.conf['bot'].get('whois_show_extensions_to_bots')) or (not sourceisBot):
irc.callHooks([source, 'PYLINK_CUSTOM_WHOIS', {'target': target, 'server': server}])
else:
log.debug('(%s) coremods.handlers.handle_whois: skipping custom whois handlers because '
'caller %s is marked as a bot', irc.name, source)
# 318: End of WHOIS. # 318: End of WHOIS.
f(server, 318, source, "%s :End of /WHOIS list" % nick) f(server, 318, source, "%s :End of /WHOIS list" % nick)

4
example-conf.yml
View File

@ -30,6 +30,10 @@ bot:
# Defaults to true if not specified. # Defaults to true if not specified.
whois_use_hideoper: true whois_use_hideoper: true
# Determines whether extended WHOIS replies should be sent to users marked
# +B (bot). For better security, it is recommended to leave this off.
whois_show_extensions_to_bots: false
# Determines whether PyLink service clients should protect themselves from # Determines whether PyLink service clients should protect themselves from
# kicks, kills, etc. using IRCd-side servprotect modes. For this to work # kicks, kills, etc. using IRCd-side servprotect modes. For this to work
# properly, this requires that PyLink be U-Lined (on most IRCds). Defaults to # properly, this requires that PyLink be U-Lined (on most IRCds). Defaults to