diff options
Diffstat (limited to 'web')
| -rw-r--r-- | web/controller/util.go | 13 | ||||
| -rw-r--r-- | web/middleware/domainValidator.go | 16 |
2 files changed, 22 insertions, 7 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)) diff --git a/web/middleware/domainValidator.go b/web/middleware/domainValidator.go index 2beecfdb..26a23895 100644 --- a/web/middleware/domainValidator.go +++ b/web/middleware/domainValidator.go @@ -9,13 +9,17 @@ import ( func DomainValidatorMiddleware(domain string) gin.HandlerFunc { return func(c *gin.Context) { - host, _, _ := net.SplitHostPort(c.Request.Host) - - if host != domain { - c.AbortWithStatus(http.StatusForbidden) - return + host := c.GetHeader("X-Forwarded-Host") + if host == "" { + host = c.GetHeader("X-Real-IP") } - + if host == "" { + host, _, _ := net.SplitHostPort(c.Request.Host) + if host != domain { + c.AbortWithStatus(http.StatusForbidden) + return + } c.Next() + } } } |