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: make clientbot modesync more configurable (#287)

Browse Source
This commit is contained in:
James Lu 2016-09-25 20:06:24 -07:00
parent 8dd0cb19af
commit 57b566286d
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
example-conf.yml
View File

@ -484,6 +484,12 @@ relay:
# net2.relay, etc.) if not specified. # net2.relay, etc.) if not specified.
#server_suffix: "relay.yournet.net" #server_suffix: "relay.yournet.net"
# Sets whether Clientbot mode sync will be enabled. Valid options:
# "full" - Sync bans, ban/invite exceptions, prefix modes, and all RFC1459-standard modes
# "half" - Sync only bans, ban/invite exceptions, and prefix modes
# "none" - Turns off mode sync. This is the default.
#clientbot_modesync: none
games: games:
# Sets the nick of the Games service, if you're using it. This defaults to "games" if not defined. # Sets the nick of the Games service, if you're using it. This defaults to "games" if not defined.
nick: Games nick: Games

19
plugins/relay.py
View File

@ -738,6 +738,9 @@ whitelisted_cmodes = {'admin', 'allowinvite', 'autoop', 'ban', 'banexception',
whitelisted_umodes = {'bot', 'hidechans', 'hideoper', 'invisible', 'oper', whitelisted_umodes = {'bot', 'hidechans', 'hideoper', 'invisible', 'oper',
'regdeaf', 'stripcolor', 'noctcp', 'wallops', 'regdeaf', 'stripcolor', 'noctcp', 'wallops',
'hideidle'} 'hideidle'}
clientbot_whitelisted_cmodes = {'admin', 'ban', 'banexception',
'halfop', 'invex', 'op', 'owner', 'voice'}
modesync_options = ('none', 'half', 'full')
def getSupportedCmodes(irc, remoteirc, channel, modes): def getSupportedCmodes(irc, remoteirc, channel, modes):
""" """
Filters a channel mode change to the modes supported by the target IRCd. Filters a channel mode change to the modes supported by the target IRCd.
@ -746,6 +749,20 @@ def getSupportedCmodes(irc, remoteirc, channel, modes):
if not remotechan: # Not a relay channel if not remotechan: # Not a relay channel
return [] return []
# Handle Clientbot-specific mode whitelist settings
whitelist = whitelisted_cmodes
if remoteirc.protoname == 'clientbot' or irc.protoname == 'clientbot':
modesync = conf.conf.get('relay', {}).get('clientbot_modesync', 'none').lower()
if modesync not in modesync_options:
modesync = 'none'
log.warning('relay: Bad clientbot_modesync option %s: valid values are %s',
modesync, modesync_options)
if modesync == 'none':
return [] # Do nothing
elif modesync == 'half':
whitelist = clientbot_whitelisted_cmodes
supported_modes = [] supported_modes = []
for modepair in modes: for modepair in modes:
try: try:
@ -770,7 +787,7 @@ def getSupportedCmodes(irc, remoteirc, channel, modes):
if supported_char is None: if supported_char is None:
break break
if name not in whitelisted_cmodes: if name not in whitelist:
log.debug("(%s) relay.getSupportedCmodes: skipping mode (%r, %r) because " log.debug("(%s) relay.getSupportedCmodes: skipping mode (%r, %r) because "
"it isn't a whitelisted (safe) mode for relay.", "it isn't a whitelisted (safe) mode for relay.",
irc.name, modechar, arg) irc.name, modechar, arg)