Changeset 404 in code for trunk

Timestamp:

Aug 20, 2020, 8:00:58 AM (5 years ago)

Author:

hubert

Message:

Reject downstream NICK with illegal characters

This should avoid confusion when mixing up nickname and user name.
Also it avoid breaking downstreams (since '@' and '!' are used for host
masks).

File:

• trunk/downstream.go (modified) (3 diffs)

trunk/downstream.go

@@ -57 +57 @@
         Params:  []string{"*", "Invalid username or password"},
 }}
+
+const illegalNickChars = " :/@!*?"
 
 // permanentDownstreamCaps is the list of always-supported downstream
@@ -330 +332 @@
                 if err := parseMessageParams(msg, &nick); err != nil {
                         return err
+                }
+                if strings.ContainsAny(nick, illegalNickChars) {
+                        return ircError{&irc.Message{
+                                Command: irc.ERR_ERRONEUSNICKNAME,
+                                Params:  []string{dc.nick, nick, "contains illegal characters"},
+                        }}
                 }
                 if nick == serviceNick {
@@ -972 +980 @@
                 }
 
+                if strings.ContainsAny(nick, illegalNickChars) {
+                        return ircError{&irc.Message{
+                                Command: irc.ERR_ERRONEUSNICKNAME,
+                                Params:  []string{dc.nick, nick, "contains illegal characters"},
+                        }}
+                }
+
                 var err error
                 dc.forEachNetwork(func(n *network) {