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

relay: rewrite normalizeHost() to whitelist characters instead

Browse Source
This commit is contained in:
James Lu 2016-12-17 23:47:26 -08:00
parent 7e37a90c80
commit 3339bf0fe6
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/relay.py
View File

@ -172,21 +172,14 @@ def normalize_nick(irc, netname, nick, times_tagged=0, uid=''):
return nick
ALLOWED_HOST_CHARS = string.ascii_letters + string.digits + '-.:'
def normalize_host(irc, host):
"""Creates a normalized hostname for the given host suitable for
introduction to a remote network (as a relay client)."""
log.debug('(%s) relay.normalize_host: IRCd=%s, host=%s', irc.name, irc.protoname, host)
if irc.protoname not in ('inspircd', 'ts6', 'clientbot', 'nefarious'):
# UnrealIRCd and IRCd-Hybrid don't allow slashes in hostnames
host = host.replace('/', '.')
host = host.replace('\x03', '') # Strip colours
host = host.replace('\x02', '') # Strip bold
host = host.replace('\x1f', '') # Strip underline
host = host.replace('\x1d', '') # Strip italic
host = host.replace('\x0f', '') # Strip color reset
host = host.replace('\x16', '') # Strip reverse color
# And no, I'm not supporting colours in hosts. Screw your IRCd-breaking patches if you think
# this is cool. -GL
for char in host:
if char not in ALLOWED_HOST_CHARS:
host = host.replace(char, '-')
return host[:63] # Limit hosts to 63 chars for best compatibility