Changeset 270 in code for trunk

Timestamp:

Apr 28, 2020, 9:41:13 AM (5 years ago)

Author:

delthas

Message:

Add support for the irc+insecure address scheme

Some servers do not support TLS, or have invalid, expired or self-signed
TLS certificates. While the right fix would be toi contact each server
owner to add support for valid TLS, supporting plaintext upstream
connections is sometimes necessary.

This adds support for the irc+insecure address scheme, which connects to
a network in plain-text over TCP.

Location:

trunk

Files:

• doc/soju.1.scd (modified) (1 diff)
• service.go (modified) (1 diff)
• upstream.go (modified) (1 diff)

trunk/doc/soju.1.scd

@@ -98 +98 @@
         _addr_ supports several connection types:
         - _[ircs://]host[:port]_ connects with TLS over TCP
+        - _irc+insecure://host[:port]_ connects with plain-text TCP
 
         Other options are:

trunk/service.go

@@ -207 +207 @@
                 scheme := addrParts[0]
                 switch scheme {
-                case "ircs":
+                case "ircs", "irc+insecure":
                 default:
-                        return fmt.Errorf("unknown scheme %q (supported schemes: ircs)", scheme)
+                        return fmt.Errorf("unknown scheme %q (supported schemes: ircs, irc+insecure)", scheme)
                 }
         }

trunk/upstream.go

@@ -91 +91 @@
                 logger.Printf("connecting to TLS server at address %q", addr)
                 netConn, err = tls.DialWithDialer(&dialer, "tcp", addr, nil)
+        case "irc+insecure":
+                if !strings.ContainsRune(addr, ':') {
+                        addr = addr + ":6667"
+                }
+
+                logger.Printf("connecting to plain-text server at address %q", addr)
+                netConn, err = dialer.Dial("tcp", addr)
         default:
                 return nil, fmt.Errorf("failed to dial %q: unknown scheme: %v", addr, scheme)