Changeset 418 in code for trunk/cmd/soju

Timestamp:

Sep 7, 2020, 7:28:24 PM (5 years ago)

Author:

contact

Message:

Add support for the PROXY protocol

IPs whitelisted in accept-proxy-ip can now use the PROXY protocol to
indicate the original source/destination addresses.

Closes: ​https://todo.sr.ht/~emersion/soju/81

File:

• trunk/cmd/soju/main.go (modified) (5 diffs)

trunk/cmd/soju/main.go

@@ -9 +9 @@
         "net/url"
         "strings"
+
+        "github.com/pires/go-proxyproto"
 
         "git.sr.ht/~emersion/soju"
@@ -86 +88 @@
                                 log.Fatalf("failed to start TLS listener on %q: %v", listen, err)
                         }
+                        ln = proxyProtoListener(ln, srv)
                         go func() {
                                 log.Fatal(srv.Serve(ln))
@@ -98 +101 @@
                                 log.Fatalf("failed to start listener on %q: %v", listen, err)
                         }
+                        ln = proxyProtoListener(ln, srv)
                         go func() {
                                 log.Fatal(srv.Serve(ln))
@@ -139 +143 @@
                                 log.Fatalf("failed to start listener on %q: %v", listen, err)
                         }
+                        ln = proxyProtoListener(ln, srv)
                         go func() {
                                 log.Fatal(srv.Identd.Serve(ln))
@@ -150 +155 @@
         log.Fatal(srv.Run())
 }
+
+func proxyProtoListener(ln net.Listener, srv *soju.Server) net.Listener {
+        return &proxyproto.Listener{
+                Listener: ln,
+                Policy: func(upstream net.Addr) (proxyproto.Policy, error) {
+                        tcpAddr, ok := upstream.(*net.TCPAddr)
+                        if !ok {
+                                return proxyproto.IGNORE, nil
+                        }
+                        if srv.AcceptProxyIPs.Contains(tcpAddr.IP) {
+                                return proxyproto.USE, nil
+                        }
+                        return proxyproto.IGNORE, nil
+                },
+        }
+}