Changeset 704 in code for trunk

Timestamp:

Nov 17, 2021, 1:54:03 PM (4 years ago)

Author:

contact

Message:

Add timeout for downstream connection registration

Location:

trunk

Files:

• downstream.go (modified) (3 diffs)
• server.go (modified) (1 diff)
• user.go (modified) (1 diff)

trunk/downstream.go

@@ -615 +615 @@
 }
 
-func (dc *downstreamConn) handleMessage(msg *irc.Message) error {
-        ctx, cancel := dc.conn.NewContext(context.TODO())
+func (dc *downstreamConn) handleMessage(ctx context.Context, msg *irc.Message) error {
+        ctx, cancel := dc.conn.NewContext(ctx)
         defer cancel()
 
@@ -1402 +1402 @@
 
 func (dc *downstreamConn) runUntilRegistered() error {
+        ctx, cancel := context.WithTimeout(context.TODO(), downstreamRegisterTimeout)
+        defer cancel()
+
+        // Close the connection with an error if the deadline is exceeded
+        go func() {
+                <-ctx.Done()
+                if err := ctx.Err(); err == context.DeadlineExceeded {
+                        dc.SendMessage(&irc.Message{
+                                Prefix:  dc.srv.prefix(),
+                                Command: "ERROR",
+                                Params:  []string{"Connection registration timed out"},
+                        })
+                        dc.Close()
+                }
+        }()
+
         for !dc.registered {
                 msg, err := dc.ReadMessage()
@@ -1408 +1424 @@
                 }
 
-                err = dc.handleMessage(msg)
+                err = dc.handleMessage(ctx, msg)
                 if ircErr, ok := err.(ircError); ok {
                         ircErr.Message.Prefix = dc.srv.prefix()

trunk/server.go

@@ -29 +29 @@
 var backlogTimeout = 10 * time.Second
 var handleDownstreamMessageTimeout = 10 * time.Second
+var downstreamRegisterTimeout = 30 * time.Second
 var chatHistoryLimit = 1000
 var backlogLimit = 4000

trunk/user.go

@@ -638 +638 @@
                                 break
                         }
-                        err := dc.handleMessage(msg)
+                        err := dc.handleMessage(context.TODO(), msg)
                         if ircErr, ok := err.(ircError); ok {
                                 ircErr.Message.Prefix = dc.srv.prefix()