Changeset 700 in code

Timestamp:

Nov 17, 2021, 11:29:23 AM (4 years ago)

Author:

contact

Message:

Add context to downstreamConn.handleMessageUnregistered

File:

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

trunk/downstream.go

@@ -629 +629 @@
 
 func (dc *downstreamConn) handleMessageUnregistered(msg *irc.Message) error {
+        ctx, cancel := context.WithTimeout(context.TODO(), handleDownstreamMessageTimeout)
+        defer cancel()
+
         switch msg.Command {
         case "NICK":
@@ -698 +701 @@
                         case "PLAIN":
                                 dc.saslServer = sasl.NewPlainServer(sasl.PlainAuthenticator(func(identity, username, password string) error {
-                                        return dc.authenticate(username, password)
+                                        // TODO: we can't use the command context here, because it
+                                        // gets cancelled once the command handler returns. SASL
+                                        // might take multiple AUTHENTICATE commands to complete.
+                                        return dc.authenticate(context.TODO(), username, password)
                                 }))
                         default:
@@ -806 +812 @@
         }
         if dc.rawUsername != "" && dc.nick != "" && !dc.negotiatingCaps {
-                return dc.register()
+                return dc.register(ctx)
         }
         return nil
@@ -1069 +1075 @@
 }
 
-func (dc *downstreamConn) authenticate(username, password string) error {
+func (dc *downstreamConn) authenticate(ctx context.Context, username, password string) error {
         username, clientName, networkName := unmarshalUsername(username)
 
-        u, err := dc.srv.db.GetUser(context.TODO(), username)
+        u, err := dc.srv.db.GetUser(ctx, username)
         if err != nil {
                 dc.logger.Printf("failed authentication for %q: user not found: %v", username, err)
@@ -1099 +1105 @@
 }
 
-func (dc *downstreamConn) register() error {
+func (dc *downstreamConn) register(ctx context.Context) error {
         if dc.registered {
                 return fmt.Errorf("tried to register twice")
@@ -1107 +1113 @@
         dc.password = ""
         if dc.user == nil {
-                if err := dc.authenticate(dc.rawUsername, password); err != nil {
+                if err := dc.authenticate(ctx, dc.rawUsername, password); err != nil {
                         return err
                 }