Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2025-09-11 12:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix #2470

Browse source
This commit is contained in:
Ilya Voronin 2024-08-11 17:15:27 +03:00
parent a6000f22a2
commit bb70e61fcd
1 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
sub/subController.go
View file

@ -3,6 +3,7 @@ package sub
import ( import (
"encoding/base64" "encoding/base64"
"net" "net"
"strings"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
@ -54,7 +55,10 @@ func (a *SUBController) initRouter(g *gin.RouterGroup) {
func (a *SUBController) subs(c *gin.Context) { func (a *SUBController) subs(c *gin.Context) {
subId := c.Param("subid") subId := c.Param("subid")
host := c.GetHeader("X-Forwarded-Host") var host string
if h, err := getHostFromXFH(c.GetHeader("X-Forwarded-Host")); err != nil {
host = h
}
if host == "" { if host == "" {
host = c.GetHeader("X-Real-IP") host = c.GetHeader("X-Real-IP")
} }
@ -89,7 +93,10 @@ func (a *SUBController) subs(c *gin.Context) {
func (a *SUBController) subJsons(c *gin.Context) { func (a *SUBController) subJsons(c *gin.Context) {
subId := c.Param("subid") subId := c.Param("subid")
host := c.GetHeader("X-Forwarded-Host") var host string
if h, err := getHostFromXFH(c.GetHeader("X-Forwarded-Host")); err != nil {
host = h
}
if host == "" { if host == "" {
host = c.GetHeader("X-Real-IP") host = c.GetHeader("X-Real-IP")
} }
@ -113,3 +120,17 @@ func (a *SUBController) subJsons(c *gin.Context) {
c.String(200, jsonSub) c.String(200, jsonSub)
} }
} }
func getHostFromXFH(s string) (host string, err error) {
// X-Forwarded-Host can actually be a host:port pair, so we need to
// split it
if strings.Contains(host, ":") {
if realHost, _, err := net.SplitHostPort(host); err == nil {
return realHost, nil
} else {
return "", err
}
} else {
return s, nil
}
}