Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/MHSanaei/3x-ui.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAhmad Thoriq Najahi <najahi@zephyrus.id>2024-05-24 00:51:19 +0300
committerGitHub <noreply@github.com>2024-05-24 00:51:19 +0300
commitd070a82b3d0149904a5d54ec3608c5789a6a265a (patch)
treeb9bc8ad45977d65763df07982b8f4899e89ac951 /web/controller
parent5ec16301a66a35361608af951ff71d43a3aa53dc (diff)
feat: Enhance host extraction from headers (#2292)
- Refactor SUBController subs and subJsons methods to extract host from X-Forwarded-Host header, falling back to X-Real-IP header and then to the request host if unavailable. - Update html function to extract host from X-Forwarded-Host header, falling back to X-Real-IP header and then to the request host if unavailable. - Update DomainValidatorMiddleware to first attempt to extract host from X-Forwarded-Host header, falling back to X-Real-IP header and then to the request host. Fixes: #2284 Signed-off-by: Ahmad Thoriq Najahi <najahi@zephyrus.id>
Diffstat (limited to 'web/controller')
-rw-r--r--web/controller/util.go13
1 files changed, 12 insertions, 1 deletions
diff --git a/web/controller/util.go b/web/controller/util.go
index 17ad75e4..b07aaf0e 100644
--- a/web/controller/util.go
+++ b/web/controller/util.go
@@ -64,7 +64,18 @@ func html(c *gin.Context, name string, title string, data gin.H) {
data = gin.H{}
}
data["title"] = title
- data["host"], _, _ = net.SplitHostPort(c.Request.Host)
+ host := c.GetHeader("X-Forwarded-Host")
+ if host == "" {
+ host = c.GetHeader("X-Real-IP")
+ }
+ if host == "" {
+ var err error
+ host, _, err = net.SplitHostPort(c.Request.Host)
+ if err != nil {
+ host = c.Request.Host
+ }
+ }
+ data["host"] = host
data["request_uri"] = c.Request.RequestURI
data["base_path"] = c.GetString("base_path")
c.HTML(http.StatusOK, name, getContext(data))