Preserve real IP address in TLS handshake error

kayrus · Jul 6, 2022 · 14bc7fa · 14bc7fa
1 parent 77fba1e
commit 14bc7fa
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/server.go b/server.go
@@ -170,7 +170,11 @@ func (s *Server) handleConn(c *Conn) error {
 			if err == io.EOF {
 				return nil
 			}
-			s.ErrorLog.Printf("TLS handshake error for %s: %v", tlsConn.RemoteAddr(), err)
+			if err, ok := err.(*net.OpError); ok {
+				// preserve remote address from PROXY protocol
+				err.Addr = c.conn.RemoteAddr()
+			}
+			s.ErrorLog.Printf("TLS handshake error: %w", err)
 			return err
 		}
 	}