From: Julio B <julio.bacel@gmail.com>
To: ~emersion/soju-dev@lists.sr.ht
Cc: Julio B <julio.bacel@gmail.com>
Subject: [PATCH] Accept proxy protocol on unix sockets by default
Date: Tue, 11 Oct 2022 10:12:30 +0300
Message-Id: <20221011071230.247042-1-julio.bacel@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

---
Usually we use unix sockets behind reverse proxies on local machines. It
makes sense to trust the proxy protocol we it is available.

Minimal nginx config
..
stream {
	server {
		listen 6697;
		proxy_pass unix:/run/soju/bouncer.socket;
		proxy_protocol on;
	}
}
..


 cmd/soju/main.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cmd/soju/main.go b/cmd/soju/main.go
index 0094381..920e909 100644
--- a/cmd/soju/main.go
+++ b/cmd/soju/main.go
@@ -345,10 +345,11 @@ func proxyProtoListener(ln net.Listener, srv *soju.Server) net.Listener {
 		Listener: ln,
 		Policy: func(upstream net.Addr) (proxyproto.Policy, error) {
 			tcpAddr, ok := upstream.(*net.TCPAddr)
-			if !ok {
-				return proxyproto.IGNORE, nil
+			if ok && srv.Config().AcceptProxyIPs.Contains(tcpAddr.IP) {
+				return proxyproto.USE, nil
 			}
-			if srv.Config().AcceptProxyIPs.Contains(tcpAddr.IP) {
+			unixAddr, ok := upstream.(*net.UnixAddr)
+			if ok && unixAddr.Network() == "unix" {
 				return proxyproto.USE, nil
 			}
 			return proxyproto.IGNORE, nil
-- 
2.38.0