mirror of
https://github.com/XTLS/Xray-core.git
synced 2025-05-01 01:44:15 +00:00
preserve exact header casing when using httpupgrade (#3427)
* preserve exact header casing when using httpupgrade * fix capitalization of websocket * oops, we dont need net/url either * restore old codepath when there are no headers
This commit is contained in:
parent
be29cc39d7
commit
980236f2b6
2 changed files with 122 additions and 17 deletions
|
@ -65,23 +65,69 @@ func dialhttpUpgrade(ctx context.Context, dest net.Destination, streamSettings *
|
|||
requestURL.Scheme = "http"
|
||||
}
|
||||
|
||||
requestURL.Host = dest.NetAddr()
|
||||
requestURL.Path = transportConfiguration.GetNormalizedPath()
|
||||
req := &http.Request{
|
||||
Method: http.MethodGet,
|
||||
URL: &requestURL,
|
||||
Host: transportConfiguration.Host,
|
||||
Header: make(http.Header),
|
||||
}
|
||||
for key, value := range transportConfiguration.Header {
|
||||
req.Header.Add(key, value)
|
||||
}
|
||||
req.Header.Set("Connection", "upgrade")
|
||||
req.Header.Set("Upgrade", "websocket")
|
||||
var req *http.Request = nil
|
||||
|
||||
err = req.Write(conn)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
if len(transportConfiguration.Header) == 0 {
|
||||
requestURL.Host = dest.NetAddr()
|
||||
requestURL.Path = transportConfiguration.GetNormalizedPath()
|
||||
req = &http.Request{
|
||||
Method: http.MethodGet,
|
||||
URL: &requestURL,
|
||||
Host: transportConfiguration.Host,
|
||||
Header: make(http.Header),
|
||||
}
|
||||
|
||||
req.Header.Set("Connection", "upgrade")
|
||||
req.Header.Set("Upgrade", "websocket")
|
||||
|
||||
err = req.Write(conn)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
} else {
|
||||
var headersBuilder strings.Builder
|
||||
|
||||
headersBuilder.WriteString("GET ")
|
||||
headersBuilder.WriteString(transportConfiguration.GetNormalizedPath())
|
||||
headersBuilder.WriteString(" HTTP/1.1\r\n")
|
||||
hasConnectionHeader := false
|
||||
hasUpgradeHeader := false
|
||||
hasHostHeader := false
|
||||
for key, value := range transportConfiguration.Header {
|
||||
if strings.ToLower(key) == "connection" {
|
||||
hasConnectionHeader = true
|
||||
}
|
||||
if strings.ToLower(key) == "upgrade" {
|
||||
hasUpgradeHeader = true
|
||||
}
|
||||
if strings.ToLower(key) == "host" {
|
||||
hasHostHeader = true
|
||||
}
|
||||
headersBuilder.WriteString(key)
|
||||
headersBuilder.WriteString(": ")
|
||||
headersBuilder.WriteString(value)
|
||||
headersBuilder.WriteString("\r\n")
|
||||
}
|
||||
|
||||
if !hasConnectionHeader {
|
||||
headersBuilder.WriteString("Connection: upgrade\r\n")
|
||||
}
|
||||
|
||||
if !hasUpgradeHeader {
|
||||
headersBuilder.WriteString("Upgrade: websocket\r\n")
|
||||
}
|
||||
|
||||
if !hasHostHeader {
|
||||
headersBuilder.WriteString("Host: ")
|
||||
headersBuilder.WriteString(transportConfiguration.Host)
|
||||
headersBuilder.WriteString("\r\n")
|
||||
}
|
||||
|
||||
headersBuilder.WriteString("\r\n")
|
||||
_, err = conn.Write([]byte(headersBuilder.String()))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
connRF := &ConnRF{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue