xinyin025/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-08-10 05:10:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(sub): honor trustedProxyCIDRs before forwarded URLs (#6135)

Browse Source 
* 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>
This commit is contained in:
PathGao
2026-07-30 03:01:59 +08:00
committed by GitHub
parent ad5f2a28cb
commit ad288a7ecc
10 changed files with 325 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/sub/service.go
+17 -6
View File
@@ -2486,18 +2486,29 @@ type PageData struct {
// ResolveRequest extracts scheme and host info from request/headers consistently.
// ResolveRequest extracts scheme, host, and header information from an HTTP request.
func (s *SubService) ResolveRequest(c *gin.Context) (scheme string, host string, hostWithPort string, hostHeader string) {
trusted := s.forwardedHeadersTrusted(c)
if !trusted {
warnSuppressedForwardedHeaders(c)
}
forwarded := func(name string) string {
if !trusted {
return ""
}
return c.GetHeader(name)
}
// scheme
scheme = "http"
if c.Request.TLS != nil || strings.EqualFold(c.GetHeader("X-Forwarded-Proto"), "https") {
if c.Request.TLS != nil || strings.EqualFold(forwarded("X-Forwarded-Proto"), "https") {
scheme = "https"
}
// base host (no port)
if h, err := getHostFromXFH(c.GetHeader("X-Forwarded-Host")); err == nil && h != "" {
if h, err := getHostFromXFH(forwarded("X-Forwarded-Host")); err == nil && h != "" {
host = h
}
if host == "" {
host = c.GetHeader("X-Real-IP")
host = forwarded("X-Real-IP")
}
if host == "" {
var err error
@@ -2508,7 +2519,7 @@ func (s *SubService) ResolveRequest(c *gin.Context) (scheme string, host string,
}
// host:port for URLs
hostWithPort = c.GetHeader("X-Forwarded-Host")
hostWithPort = forwarded("X-Forwarded-Host")
if hostWithPort == "" {
hostWithPort = c.Request.Host
}
@@ -2517,9 +2528,9 @@ func (s *SubService) ResolveRequest(c *gin.Context) (scheme string, host string,
}
// header display host
hostHeader = c.GetHeader("X-Forwarded-Host")
hostHeader = forwarded("X-Forwarded-Host")
if hostHeader == "" {
hostHeader = c.GetHeader("X-Real-IP")
hostHeader = forwarded("X-Real-IP")
}
if hostHeader == "" {
hostHeader = host