fix(multiplayer): resolve client IP behind proxies

This commit is contained in:
Josh Creek
2026-09-02 19:08:34 +01:00
parent d59e0017f7
commit 6ebd6e59c1
7 changed files with 166 additions and 8 deletions
+81 -7
View File
@@ -6,6 +6,7 @@ import (
"fmt"
"net"
"net/http"
"net/netip"
"strings"
"sync"
"time"
@@ -27,6 +28,30 @@ type rateWindow struct {
count int
}
// ClientIPResolver accepts X-Forwarded-For only from explicitly trusted
// immediate peers. It walks the chain from the application backwards so an
// untrusted client cannot select its own rate-limit identity by prepending a
// forged address.
type ClientIPResolver struct {
trustedProxies []netip.Prefix
}
func NewClientIPResolver(cidrs string) (*ClientIPResolver, error) {
resolver := &ClientIPResolver{}
for _, raw := range strings.Split(cidrs, ",") {
raw = strings.TrimSpace(raw)
if raw == "" {
continue
}
prefix, err := netip.ParsePrefix(raw)
if err != nil {
return nil, fmt.Errorf("invalid trusted proxy CIDR %q", raw)
}
resolver.trustedProxies = append(resolver.trustedProxies, prefix.Masked())
}
return resolver, nil
}
func NewRateLimiter(limit int, window time.Duration, maxKeys int) (*RateLimiter, error) {
if limit < 1 || window <= 0 || maxKeys < 1 {
return nil, fmt.Errorf("invalid rate limiter configuration")
@@ -93,26 +118,75 @@ func (l *RateLimiter) AllowKeys(keys []string, now time.Time) bool {
return true
}
func requestRateKey(r *http.Request) string {
keys := requestRateKeys(r)
func requestRateKey(r *http.Request, resolver *ClientIPResolver) string {
keys := requestRateKeys(r, resolver)
if len(keys) == 0 {
return ""
}
return keys[0]
}
func requestRateKeys(r *http.Request) []string {
func requestRateKeys(r *http.Request, resolver *ClientIPResolver) []string {
keys := make([]string, 0, 2)
if authorization := strings.TrimSpace(r.Header.Get("Authorization")); authorization != "" {
digest := sha256.Sum256([]byte(authorization))
keys = append(keys, "auth:"+hex.EncodeToString(digest[:]))
}
host := r.RemoteAddr
if parsedHost, _, err := net.SplitHostPort(host); err == nil {
host = parsedHost
}
host := requestClientIP(r, resolver)
if host == "" {
return keys
}
return append(keys, "ip:"+host)
}
func requestClientIP(r *http.Request, resolver *ClientIPResolver) string {
host := strings.TrimSpace(r.RemoteAddr)
if parsedHost, _, err := net.SplitHostPort(host); err == nil {
host = parsedHost
}
remote, err := netip.ParseAddr(strings.Trim(host, "[]"))
if err != nil {
return host
}
remote = remote.Unmap()
if resolver == nil || !resolver.trusts(remote) {
return remote.String()
}
forwarded := strings.Join(r.Header.Values("X-Forwarded-For"), ",")
if forwarded == "" || len(forwarded) > 2048 {
return remote.String()
}
parts := strings.Split(forwarded, ",")
if len(parts) > 16 {
return remote.String()
}
chain := make([]netip.Addr, 0, len(parts))
for _, part := range parts {
address, parseErr := netip.ParseAddr(strings.TrimSpace(part))
if parseErr != nil {
return remote.String()
}
chain = append(chain, address.Unmap())
}
for index := len(chain) - 1; index >= 0; index-- {
if !resolver.trusts(chain[index]) {
return chain[index].String()
}
}
if len(chain) > 0 {
return chain[0].String()
}
return remote.String()
}
func (r *ClientIPResolver) trusts(address netip.Addr) bool {
if r == nil || !address.IsValid() {
return false
}
for _, prefix := range r.trustedProxies {
if prefix.Contains(address) {
return true
}
}
return false
}