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

changehost: copy args before cloning, make $host expansion optional

Browse Source
This commit is contained in:
James Lu 2016-08-02 22:56:59 -07:00
parent 1ffbd0eea8
commit 1cda5023c8
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/changehost.py
View File

@ -30,6 +30,12 @@ def _changehost(irc, target, args):
"Changehost will not function correctly!", irc.name) "Changehost will not function correctly!", irc.name)
return return
args = args.copy()
if not changehost_conf.get('force_host_expansion'):
del args['host']
log.debug('(%s) Changehost args: %s', irc.name, args)
for host_glob, host_template in changehost_hosts.items(): for host_glob, host_template in changehost_hosts.items():
if irc.matchHost(host_glob, target): if irc.matchHost(host_glob, target):
# This uses template strings for simple substitution: # This uses template strings for simple substitution:
@ -38,10 +44,17 @@ def _changehost(irc, target, args):
# Substitute using the fields provided the hook data. This means # Substitute using the fields provided the hook data. This means
# that the following variables are available for substitution: # that the following variables are available for substitution:
# $uid, $ts, $nick, $realhost, $ident, and $ip. $host is explicitly # $uid, $ts, $nick, $realhost, $ident, and $ip.
# forbidden because it can cause recursive loops.
# $host is explicitly forbidden by default because it can cause
# recursive loops when IP or real host masks are used to match a
# target. vHost updates do not affect these fields, so any further
# execution of 'applyhosts' will cause $host to expand again to
# the user's new host, causing the vHost to grow rapidly in size.
# That said, it is possible to get away with this expansion if
# you're careful with what you're doing, and that is why this
# hidden option exists. -GLolol
del args['host']
new_host = template.substitute(args) new_host = template.substitute(args)
# Replace characters that are not allowed in hosts with "-". # Replace characters that are not allowed in hosts with "-".