Changeset 472 in code for trunk/server.go

Timestamp:

Mar 18, 2021, 11:08:25 AM (4 years ago)

Author:

contact

Message:

Add support for the Forwarded HTTP header

This is the standard replacing X-Forwarded-*.

File:

• trunk/server.go (modified) (2 diffs)

trunk/server.go

@@ -4 +4 @@
         "fmt"
         "log"
+        "mime"
         "net"
         "net/http"
@@ -215 +216 @@
         // to prevent users from spoofing the remote address
         remoteAddr := req.RemoteAddr
-        forwardedHost := req.Header.Get("X-Forwarded-For")
-        forwardedPort := req.Header.Get("X-Forwarded-Port")
-        if isProxy && forwardedHost != "" && forwardedPort != "" {
-                remoteAddr = net.JoinHostPort(forwardedHost, forwardedPort)
+        if isProxy {
+                forwarded := parseForwarded(req.Header)
+                forwardedHost := req.Header.Get("X-Forwarded-For")
+                forwardedPort := req.Header.Get("X-Forwarded-Port")
+                if forwarded["for"] != "" && forwarded["port"] != "" {
+                        remoteAddr = net.JoinHostPort(forwarded["for"], forwarded["port"])
+                } else if forwardedHost != "" && forwardedPort != "" {
+                        remoteAddr = net.JoinHostPort(forwardedHost, forwardedPort)
+                }
         }
 
         s.handle(newWebsocketIRCConn(conn, remoteAddr))
 }
+
+func parseForwarded(h http.Header) map[string]string {
+        forwarded := h.Get("Forwarded")
+        if forwarded == "" {
+                return nil
+        }
+        // Hack to easily parse header parameters
+        _, params, _ := mime.ParseMediaType("hack; " + forwarded)
+        return params
+}