Changeset 95 in code for trunk/downstream.go

Timestamp:

Mar 13, 2020, 2:12:44 PM (5 years ago)

Author:

contact

Message:

Add support for SASL authentication

We now store SASL credentials in the database and automatically populate
them on NickServ REGISTER/IDENTIFY.

References: ​https://todo.sr.ht/~emersion/jounce/10

File:

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

trunk/downstream.go

@@ -382 +382 @@
                         }
 
-                        dc.logger.Printf("trying to connect to new upstream server %q", addr)
+                        dc.logger.Printf("trying to connect to new network %q", addr)
                         if err := sanityCheckServer(addr); err != nil {
                                 dc.logger.Printf("failed to connect to %q: %v", addr, err)
@@ -391 +391 @@
                         }
 
-                        dc.logger.Printf("auto-adding network %q", networkName)
+                        dc.logger.Printf("auto-saving network %q", networkName)
                         network, err = u.createNetwork(networkName, dc.nick)
                         if err != nil {
@@ -619 +619 @@
                         }
 
+                        if upstreamName == "NickServ" {
+                                dc.handleNickServPRIVMSG(uc, text)
+                        }
+
                         uc.SendMessage(&irc.Message{
                                 Command: "PRIVMSG",
@@ -630 +634 @@
         return nil
 }
+
+func (dc *downstreamConn) handleNickServPRIVMSG(uc *upstreamConn, text string) {
+        username, password, ok := parseNickServCredentials(text, uc.nick)
+        if !ok {
+                return
+        }
+
+        dc.logger.Printf("auto-saving NickServ credentials with username %q", username)
+        n := uc.network
+        n.SASL.Mechanism = "PLAIN"
+        n.SASL.Plain.Username = username
+        n.SASL.Plain.Password = password
+        if err := dc.srv.db.StoreNetwork(dc.user.Username, &n.Network); err != nil {
+                dc.logger.Printf("failed to save NickServ credentials: %v", err)
+        }
+}
+
+func parseNickServCredentials(text, nick string) (username, password string, ok bool) {
+        fields := strings.Fields(text)
+        if len(fields) < 2 {
+                return "", "", false
+        }
+        cmd := strings.ToUpper(fields[0])
+        params := fields[1:]
+        switch cmd {
+        case "REGISTER":
+                username = nick
+                password = params[0]
+        case "IDENTIFY":
+                if len(params) == 1 {
+                        username = nick
+                } else {
+                        username = params[0]
+                }
+                password = params[1]
+        }
+        return username, password, true
+}