Changeset 85 in code for trunk

Timestamp:

Mar 11, 2020, 6:09:32 PM (5 years ago)

Author:

contact

Message:

Add support for PASS to downstream

Location:

trunk

Files:

• db.go (modified) (1 diff)
• downstream.go (modified) (6 diffs)

trunk/db.go

@@ -10 +10 @@
 type User struct {
         Username string
-        Password string
+        Password string // hashed
 }
 

trunk/downstream.go

@@ -7 +7 @@
         "strings"
 
+        "golang.org/x/crypto/bcrypt"
         "gopkg.in/irc.v3"
 )
@@ -12 +13 @@
 type ircError struct {
         Message *irc.Message
+}
+
+func (err ircError) Error() string {
+        return err.Message.String()
 }
 
@@ -36 +41 @@
 }
 
-func (err ircError) Error() string {
-        return err.Message.String()
-}
+var errAuthFailed = ircError{&irc.Message{
+        Command: irc.ERR_PASSWDMISMATCH,
+        Params:  []string{"*", "Invalid username or password"},
+}}
 
 type consumption struct {
@@ -59 +65 @@
         username   string
         realname   string
+        password   string   // empty after authentication
         network    *network // can be nil
 }
@@ -290 +297 @@
                 }
                 dc.username = "~" + username
+        case "PASS":
+                if err := parseMessageParams(msg, &dc.password); err != nil {
+                        return err
+                }
         default:
                 dc.logger.Printf("unhandled message: %v", msg)
@@ -310 +321 @@
         }
 
+        password := dc.password
+        dc.password = ""
+
         u := dc.srv.getUser(username)
         if u == nil {
-                dc.logger.Printf("failed authentication: unknown username %q", username)
-                dc.SendMessage(&irc.Message{
-                        Prefix:  dc.srv.prefix(),
-                        Command: irc.ERR_PASSWDMISMATCH,
-                        Params:  []string{"*", "Invalid username or password"},
-                })
-                return nil
+                dc.logger.Printf("failed authentication for %q: unknown username", username)
+                return errAuthFailed
+        }
+
+        err := bcrypt.CompareHashAndPassword([]byte(u.Password), []byte(password))
+        if err != nil {
+                dc.logger.Printf("failed authentication for %q: %v", username, err)
+                return errAuthFailed
         }