Changeset 429 in code for trunk

Timestamp:

Nov 24, 2020, 1:22:18 PM (5 years ago)

Author:

hubert

Message:

Prevent downstreams from changing their nick to service's

This commit prevents downstream from sending those commands:

• NICK BouncerServ
• NICK BouncerServ/<network>

The later is necessary because soju would otherwise save the nick change
and, in the event that the downstream connects in single-upstream mode
to <network>, it will end up with the nickname "BouncerServ".

File:

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

trunk/downstream.go

@@ -1069 +1069 @@
                 }}
         case "NICK":
-                var nick string
-                if err := parseMessageParams(msg, &nick); err != nil {
-                        return err
-                }
-
+                var rawNick string
+                if err := parseMessageParams(msg, &rawNick); err != nil {
+                        return err
+                }
+
+                nick := rawNick
                 var upstream *upstreamConn
                 if dc.upstream() == nil {
@@ -1087 +1088 @@
                                 Command: irc.ERR_ERRONEUSNICKNAME,
                                 Params:  []string{dc.nick, nick, "contains illegal characters"},
+                        }}
+                }
+                if nick == serviceNick {
+                        return ircError{&irc.Message{
+                                Command: irc.ERR_NICKNAMEINUSE,
+                                Params:  []string{dc.nick, rawNick, "Nickname reserved for bouncer service"},
                         }}
                 }