Changeset 352 in code for trunk/upstream.go

Timestamp:

Jul 6, 2020, 3:18:13 PM (5 years ago)

Author:

contact

Message:

Parse upstream URLs with net/url

This allows us to ignore the path part of the URL. This is preliminary
work for unix URLs.

File:

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

trunk/upstream.go

@@ -11 +11 @@
         "io"
         "net"
+        "net/url"
         "strconv"
         "strings"
@@ -81 +82 @@
         logger := &prefixLogger{network.user.srv.Logger, fmt.Sprintf("upstream %q: ", network.Addr)}
 
-        var scheme string
-        var addr string
-
-        addrParts := strings.SplitN(network.Addr, "://", 2)
-        if len(addrParts) == 2 {
-                scheme = addrParts[0]
-                addr = addrParts[1]
-        } else {
-                scheme = "ircs"
-                addr = addrParts[0]
-        }
-
         dialer := net.Dialer{Timeout: connectTimeout}
 
+        s := network.Addr
+        if !strings.Contains(s, "://") {
+                // This is a raw domain name, make it an URL with the default scheme
+                s = "ircs://" + s
+        }
+
+        u, err := url.Parse(s)
+        if err != nil {
+                return nil, fmt.Errorf("failed to parse upstream server URL: %v", err)
+        }
+
         var netConn net.Conn
-        var err error
-        switch scheme {
+        switch u.Scheme {
         case "ircs":
+                addr := u.Host
                 if _, _, err := net.SplitHostPort(addr); err != nil {
                         addr = addr + ":6697"
@@ -105 +105 @@
                 logger.Printf("connecting to TLS server at address %q", addr)
 
-                var cfg *tls.Config
+                var tlsConfig *tls.Config
                 if network.SASL.Mechanism == "EXTERNAL" {
                         if network.SASL.External.CertBlob == nil {
@@ -117 +117 @@
                                 return nil, fmt.Errorf("failed to parse private key: %v", err)
                         }
-                        cfg = &tls.Config{
+                        tlsConfig = &tls.Config{
                                 Certificates: []tls.Certificate{
                                         {
@@ -128 +128 @@
                 }
 
-                netConn, err = tls.DialWithDialer(&dialer, "tcp", addr, cfg)
+                netConn, err = tls.DialWithDialer(&dialer, "tcp", addr, tlsConfig)
+                if err != nil {
+                        return nil, fmt.Errorf("failed to dial %q: %v", addr, err)
+                }
         case "irc+insecure":
+                addr := u.Host
                 if _, _, err := net.SplitHostPort(addr); err != nil {
                         addr = addr + ":6667"
@@ -136 +140 @@
                 logger.Printf("connecting to plain-text server at address %q", addr)
                 netConn, err = dialer.Dial("tcp", addr)
+                if err != nil {
+                        return nil, fmt.Errorf("failed to dial %q: %v", addr, err)
+                }
         default:
-                return nil, fmt.Errorf("failed to dial %q: unknown scheme: %v", addr, scheme)
-        }
-        if err != nil {
-                return nil, fmt.Errorf("failed to dial %q: %v", addr, err)
+                return nil, fmt.Errorf("failed to dial %q: unknown scheme: %v", network.Addr, u.Scheme)
         }
 
@@ -157 +161 @@
                 messageLoggers:           make(map[string]*messageLogger),
         }
-
         return uc, nil
 }