Files
3x-ui/internal/sub/forwarded_trust.go
T
PathGao ad288a7ecc fix(sub): honor trustedProxyCIDRs before forwarded URLs (#6135)
* fix(sub): honor trustedProxyCIDRs before forwarded URLs

* fix(sub): avoid unused trust-setting lookups

Skip the trustedProxyCIDRs lookup when no forwarded header can affect a subscription URL. Keep the shipped proxy default in one exported setting constant and document the subscription-link behavior for custom proxy boundaries.

* fix(frontend): meet config text contrast requirements

Keep compact configuration text readable in the light theme and satisfy the Storybook accessibility check.

---------

Co-authored-by: PathGao <gaoyanbo@gaoyanbodeMacBook-Air.local>
2026-07-29 21:01:59 +02:00

93 lines
2.2 KiB
Go

package sub
import (
"net"
"net/netip"
"strings"
"sync"
"github.com/gin-gonic/gin"
"github.com/mhsanaei/3x-ui/v3/internal/logger"
"github.com/mhsanaei/3x-ui/v3/internal/web/service"
)
var warnSuppressedForwardedOnce sync.Once
var forwardedHeaderNames = [...]string{"X-Forwarded-Host", "X-Forwarded-Proto", "X-Real-IP"}
func (s *SubService) forwardedHeadersTrusted(c *gin.Context) (trusted bool) {
if !hasForwardedHeaders(c) {
return true
}
trusted = true
defer func() {
_ = recover()
}()
configured, err := s.settingService.GetTrustedProxyCIDRs()
if err != nil {
return true
}
configured = strings.TrimSpace(configured)
if configured == "" || configured == service.DefaultTrustedProxyCIDRs {
return true
}
return remoteAddrInCIDRs(c.Request.RemoteAddr, configured)
}
func hasForwardedHeaders(c *gin.Context) bool {
for _, name := range forwardedHeaderNames {
if c.GetHeader(name) != "" {
return true
}
}
return false
}
func warnSuppressedForwardedHeaders(c *gin.Context) {
present := make([]string, 0, 3)
for _, name := range forwardedHeaderNames {
if c.GetHeader(name) != "" {
present = append(present, name)
}
}
if len(present) == 0 {
return
}
headers := strings.Join(present, ", ")
logger.Debugf("sub: ignoring %s from %s, which is outside trustedProxyCIDRs", headers, c.Request.RemoteAddr)
warnSuppressedForwardedOnce.Do(func() {
logger.Warningf("sub: ignoring %s from %s because it is outside trustedProxyCIDRs; subscription URLs will use the request host. Add the proxy to that setting, or set subURI, if the generated links look wrong.", headers, c.Request.RemoteAddr)
})
}
func remoteAddrInCIDRs(remoteAddr, cidrs string) bool {
host := remoteAddr
if h, _, err := net.SplitHostPort(remoteAddr); err == nil {
host = h
}
addr, err := netip.ParseAddr(strings.TrimSpace(host))
if err != nil {
return false
}
addr = addr.Unmap()
for value := range strings.SplitSeq(cidrs, ",") {
value = strings.TrimSpace(value)
if value == "" {
continue
}
if prefix, err := netip.ParsePrefix(value); err == nil {
if prefix.Contains(addr) {
return true
}
continue
}
if proxyIP, err := netip.ParseAddr(value); err == nil && proxyIP.Unmap() == addr.Unmap() {
return true
}
}
return false
}