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

relay: sanitize idents before mirroring them to IRC

Browse Source
This commit is contained in:
James Lu 2019-02-12 15:54:38 -08:00
parent ac8b7babf1
commit 96815a0a32
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/relay.py
View File

@ -123,6 +123,14 @@ def die(irc=None):
IRC_ASCII_ALLOWED_CHARS = string.digits + string.ascii_letters + '/^|\\-_[]{}`' IRC_ASCII_ALLOWED_CHARS = string.digits + string.ascii_letters + '/^|\\-_[]{}`'
FALLBACK_SEPARATOR = '|' FALLBACK_SEPARATOR = '|'
FALLBACK_CHARACTER = '-' FALLBACK_CHARACTER = '-'
def _sanitize(text):
"""Replaces characters not in IRC_ASCII_ALLOWED_CHARS with FALLBACK_CHARACTER."""
for char in text:
if char not in IRC_ASCII_ALLOWED_CHARS:
text = text.replace(char, FALLBACK_CHARACTER)
return text
def normalize_nick(irc, netname, nick, times_tagged=0, uid=''): def normalize_nick(irc, netname, nick, times_tagged=0, uid=''):
""" """
Creates a normalized nickname for the given nick suitable for introduction to a remote network Creates a normalized nickname for the given nick suitable for introduction to a remote network
@ -209,9 +217,7 @@ def normalize_nick(irc, netname, nick, times_tagged=0, uid=''):
# Loop over every character in the nick, making sure that it only contains valid # Loop over every character in the nick, making sure that it only contains valid
# characters. # characters.
if not is_unicode_capable: if not is_unicode_capable:
for char in nick: nick = _sanitize(nick)
if char not in IRC_ASCII_ALLOWED_CHARS:
nick = nick.replace(char, FALLBACK_CHARACTER)
else: else:
# UnrealIRCd 4's forbidden nick chars, from # UnrealIRCd 4's forbidden nick chars, from
# https://github.com/unrealircd/unrealircd/blob/02d69e7d8/src/modules/charsys.c#L152-L163 # https://github.com/unrealircd/unrealircd/blob/02d69e7d8/src/modules/charsys.c#L152-L163
@ -372,7 +378,8 @@ def spawn_relay_user(irc, remoteirc, user, times_tagged=0, reuse_sid=None):
nick = normalize_nick(remoteirc, irc.name, userobj.nick, times_tagged=times_tagged) nick = normalize_nick(remoteirc, irc.name, userobj.nick, times_tagged=times_tagged)
# Truncate idents at 10 characters, because TS6 won't like them otherwise! # Truncate idents at 10 characters, because TS6 won't like them otherwise!
ident = userobj.ident[:10] ident = _sanitize(userobj.ident)
ident = ident[:10]
# Normalize hostnames # Normalize hostnames
host = normalize_host(remoteirc, userobj.host) host = normalize_host(remoteirc, userobj.host)
realname = userobj.realname realname = userobj.realname