black-internet-days-ahead/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-09 18:43:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Relax server HTTP host check

Browse source
This commit is contained in:
yuhan6665 2024-07-06 15:06:58 -04:00
parent 1113ee7fa2
commit 4c51636788
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
transport/internet/http/config.go
View file

@ -1,6 +1,8 @@
package http package http
import ( import (
"strings"
"github.com/xtls/xray-core/common" "github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/dice" "github.com/xtls/xray-core/common/dice"
"github.com/xtls/xray-core/transport/internet" "github.com/xtls/xray-core/transport/internet"
@ -18,7 +20,7 @@ func (c *Config) getHosts() []string {
func (c *Config) isValidHost(host string) bool { func (c *Config) isValidHost(host string) bool {
hosts := c.getHosts() hosts := c.getHosts()
for _, h := range hosts { for _, h := range hosts {
if h == host { if strings.Contains(strings.ToLower(host), strings.ToLower(h)) {
return true return true
} }
} }

2
transport/internet/httpupgrade/hub.go
View file

@ -39,7 +39,7 @@ func (s *server) Handle(conn net.Conn) (stat.Connection, error) {
if s.config != nil { if s.config != nil {
host := req.Host host := req.Host
if len(s.config.Host) > 0 && host != s.config.Host { if len(s.config.Host) > 0 && !strings.Contains(strings.ToLower(host), strings.ToLower(s.config.Host)) {
return nil, errors.New("bad host: ", host) return nil, errors.New("bad host: ", host)
} }
path := s.config.GetNormalizedPath() path := s.config.GetNormalizedPath()

2
transport/internet/splithttp/hub.go
View file

@ -72,7 +72,7 @@ func (h *requestHandler) upsertSession(sessionId string) *httpSession {
} }
func (h *requestHandler) ServeHTTP(writer http.ResponseWriter, request *http.Request) { func (h *requestHandler) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
if len(h.host) > 0 && request.Host != h.host { if len(h.host) > 0 && !strings.Contains(strings.ToLower(request.Host), strings.ToLower(h.host)) {
errors.LogInfo(context.Background(), "failed to validate host, request:", request.Host, ", config:", h.host) errors.LogInfo(context.Background(), "failed to validate host, request:", request.Host, ", config:", h.host)
writer.WriteHeader(http.StatusNotFound) writer.WriteHeader(http.StatusNotFound)
return return

2
transport/internet/websocket/hub.go
View file

@ -38,7 +38,7 @@ var upgrader = &websocket.Upgrader{
} }
func (h *requestHandler) ServeHTTP(writer http.ResponseWriter, request *http.Request) { func (h *requestHandler) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
if len(h.host) > 0 && request.Host != h.host { if len(h.host) > 0 && !strings.Contains(strings.ToLower(request.Host), strings.ToLower(h.host)) {
errors.LogInfo(context.Background(), "failed to validate host, request:", request.Host, ", config:", h.host) errors.LogInfo(context.Background(), "failed to validate host, request:", request.Host, ", config:", h.host)
writer.WriteHeader(http.StatusNotFound) writer.WriteHeader(http.StatusNotFound)
return return