Add support for PASS to downstream

db.go

@@ -9,7 +9,7 @@ import (
 
 type User struct {
 	Username string
-	Password string
+	Password string // hashed
 }
 
 type Network struct {

downstream.go

@@ -6,6 +6,7 @@ import (
 	"net"
 	"strings"
 
+	"golang.org/x/crypto/bcrypt"
 	"gopkg.in/irc.v3"
 )
 
@@ -13,6 +14,10 @@ type ircError struct {
 	Message *irc.Message
 }
 
+func (err ircError) Error() string {
+	return err.Message.String()
+}
+
 func newUnknownCommandError(cmd string) ircError {
 	return ircError{&irc.Message{
 		Command: irc.ERR_UNKNOWNCOMMAND,
@@ -35,9 +40,10 @@ func newNeedMoreParamsError(cmd string) ircError {
 	}}
 }
 
-func (err ircError) Error() string {
+var errAuthFailed = ircError{&irc.Message{
-	return err.Message.String()
+	Command: irc.ERR_PASSWDMISMATCH,
-}
+	Params:  []string{"*", "Invalid username or password"},
+}}
 
 type consumption struct {
 	consumer     *RingConsumer
@@ -58,6 +64,7 @@ type downstreamConn struct {
 	nick       string
 	username   string
 	realname   string
+	password   string   // empty after authentication
 	network    *network // can be nil
 }
 
@@ -289,6 +296,10 @@ func (dc *downstreamConn) handleMessageUnregistered(msg *irc.Message) error {
 			return err
 		}
 		dc.username = "~" + username
+	case "PASS":
+		if err := parseMessageParams(msg, &dc.password); err != nil {
+			return err
+		}
 	default:
 		dc.logger.Printf("unhandled message: %v", msg)
 		return newUnknownCommandError(msg.Command)
@@ -309,15 +320,19 @@ func (dc *downstreamConn) register() error {
 		username = username[:i]
 	}
 
+	password := dc.password
+	dc.password = ""
+
 	u := dc.srv.getUser(username)
 	if u == nil {
-		dc.logger.Printf("failed authentication: unknown username %q", username)
+		dc.logger.Printf("failed authentication for %q: unknown username", username)
-		dc.SendMessage(&irc.Message{
+		return errAuthFailed
-			Prefix:  dc.srv.prefix(),
+	}
-			Command: irc.ERR_PASSWDMISMATCH,
+
-			Params:  []string{"*", "Invalid username or password"},
+	err := bcrypt.CompareHashAndPassword([]byte(u.Password), []byte(password))
-		})
+	if err != nil {
-		return nil
+		dc.logger.Printf("failed authentication for %q: %v", username, err)
+		return errAuthFailed
 	}
 
 	if networkName != "" {