Changeset 753 in code for trunk/downstream.go

Timestamp:

Dec 7, 2021, 8:40:02 AM (4 years ago)

Author:

contact

Message:

Improve error message when downstream doesn't authenticate

File:

• trunk/downstream.go (modified) (1 diff)

trunk/downstream.go

@@ -1237 +1237 @@
         dc.password = ""
         if dc.user == nil {
+                if password == "" {
+                        if dc.caps["sasl"] {
+                                return ircError{&irc.Message{
+                                        Command: "FAIL",
+                                        Params:  []string{"*", "ACCOUNT_REQUIRED", "Authentication required"},
+                                }}
+                        } else {
+                                return ircError{&irc.Message{
+                                        Command: irc.ERR_PASSWDMISMATCH,
+                                        Params:  []string{dc.nick, "Authentication required"},
+                                }}
+                        }
+                }
+
                 if err := dc.authenticate(ctx, dc.rawUsername, password); err != nil {
                         dc.logger.Printf("PASS authentication error for user %q: %v", dc.rawUsername, err)
                         return ircError{&irc.Message{
                                 Command: irc.ERR_PASSWDMISMATCH,
-                                Params:  []string{"*", authErrorReason(err)},
+                                Params:  []string{dc.nick, authErrorReason(err)},
                         }}
                 }