Changeset 381 in code for trunk

Timestamp:

Aug 11, 2020, 8:24:54 AM (5 years ago)

Author:

contact

Message:

Don't perform TLS handshake in connectToUpstream

This defers TLS handshake until the first read or write operation. This
allows the upcoming identd server to register the connection before the
TLS handshake is complete, and is necessary because some IRC servers
send an ident request before that.

File:

• trunk/upstream.go (modified) (3 diffs)

trunk/upstream.go

@@ -99 +99 @@
         case "ircs":
                 addr := u.Host
-                if _, _, err := net.SplitHostPort(addr); err != nil {
-                        addr = addr + ":6697"
+                host, _, err := net.SplitHostPort(u.Host)
+                if err != nil {
+                        host = u.Host
+                        addr = u.Host + ":6697"
                 }
 
                 logger.Printf("connecting to TLS server at address %q", addr)
 
-                var tlsConfig *tls.Config
+                tlsConfig := &tls.Config{ServerName: host}
                 if network.SASL.Mechanism == "EXTERNAL" {
                         if network.SASL.External.CertBlob == nil {
@@ -117 +119 @@
                                 return nil, fmt.Errorf("failed to parse private key: %v", err)
                         }
-                        tlsConfig = &tls.Config{
-                                Certificates: []tls.Certificate{
-                                        {
-                                                Certificate: [][]byte{network.SASL.External.CertBlob},
-                                                PrivateKey:  key.(crypto.PrivateKey),
-                                        },
+                        tlsConfig.Certificates = []tls.Certificate{
+                                {
+                                        Certificate: [][]byte{network.SASL.External.CertBlob},
+                                        PrivateKey:  key.(crypto.PrivateKey),
                                 },
                         }
@@ -128 +128 @@
                 }
 
-                netConn, err = tls.DialWithDialer(&dialer, "tcp", addr, tlsConfig)
+                netConn, err = dialer.Dial("tcp", addr)
                 if err != nil {
                         return nil, fmt.Errorf("failed to dial %q: %v", addr, err)
                 }
+
+                // Don't do the TLS handshake immediately, because we need to register
+                // the new connection with identd ASAP. See:
+                // https://todo.sr.ht/~emersion/soju/69#event-41859
+                netConn = tls.Client(netConn, tlsConfig)
         case "irc+insecure":
                 addr := u.Host