Changeset 698 in code for trunk/downstream.go

Timestamp:

Nov 17, 2021, 11:10:56 AM (4 years ago)

Author:

contact

Message:

Add context arg to sanityCheckServer

As a bonus, the timeout now applies to the whole TLS dial
operation. Before the timeout only applied to the net dial
operation, making it possible for a bad server to stall the request
by making the TLS handshake extremely slow.

File:

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

trunk/downstream.go

@@ -1031 +1031 @@
 }
 
-func sanityCheckServer(addr string) error {
-        dialer := net.Dialer{Timeout: 30 * time.Second}
-        conn, err := tls.DialWithDialer(&dialer, "tcp", addr, nil)
+func sanityCheckServer(ctx context.Context, addr string) error {
+        ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
+        defer cancel()
+
+        conn, err := new(tls.Dialer).DialContext(ctx, "tcp", addr)
         if err != nil {
                 return err
         }
+
         return conn.Close()
 }
@@ -1131 +1134 @@
 
                 dc.logger.Printf("trying to connect to new network %q", addr)
-                if err := sanityCheckServer(addr); err != nil {
+                if err := sanityCheckServer(context.TODO(), addr); err != nil {
                         dc.logger.Printf("failed to connect to %q: %v", addr, err)
                         return ircError{&irc.Message{