mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-04-19 05:55:52 +00:00
367152556a
1. **Fixed XPadding Placement Dropdown**: - Added the missing `cookie` and `query` options to `xPaddingPlacement` (`stream_xhttp.html`). - *Why:* Previously, users wanting `cookie` obfuscation were forced to use the `header` placement string. This caused Xray-core to blindly intercept the entire monolithic HTTP Cookie header, failing internal padding-length validations and causing the inbound to silently drop the connection. 2. **Fixed Uplink Data Placement Validation**: - Replaced the unsupported `query` option with `cookie` in `uplinkDataPlacement`. - *Why:* Xray-core's `transport_internet.go` explicitly forbids `query` as an uplink placement option. Selecting it from the UI previously sent a payload that would cause Xray-core to instantly throw an `unsupported uplink data placement: query` panic. Adding `cookie` perfectly aligns the UI with Xray-core restrictions. ### Related Issues - Resolves #3992
68 lines
1.8 KiB
Go
68 lines
1.8 KiB
Go
package http
|
|
|
|
import (
|
|
"net/http"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/xtls/xray-core/common/net"
|
|
)
|
|
|
|
// ParseXForwardedFor parses X-Forwarded-For header in http headers, and return the IP list in it.
|
|
func ParseXForwardedFor(header http.Header) []net.Address {
|
|
xff := header.Get("X-Forwarded-For")
|
|
if xff == "" {
|
|
return nil
|
|
}
|
|
list := strings.Split(xff, ",")
|
|
addrs := make([]net.Address, 0, len(list))
|
|
for _, proxy := range list {
|
|
addrs = append(addrs, net.ParseAddress(proxy))
|
|
}
|
|
return addrs
|
|
}
|
|
|
|
// RemoveHopByHopHeaders removes hop by hop headers in http header list.
|
|
func RemoveHopByHopHeaders(header http.Header) {
|
|
// Strip hop-by-hop header based on RFC:
|
|
// http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.5.1
|
|
// https://www.mnot.net/blog/2011/07/11/what_proxies_must_do
|
|
|
|
header.Del("Proxy-Connection")
|
|
header.Del("Proxy-Authenticate")
|
|
header.Del("Proxy-Authorization")
|
|
header.Del("TE")
|
|
header.Del("Trailers")
|
|
header.Del("Transfer-Encoding")
|
|
header.Del("Upgrade")
|
|
|
|
connections := header.Get("Connection")
|
|
header.Del("Connection")
|
|
if connections == "" {
|
|
return
|
|
}
|
|
for _, h := range strings.Split(connections, ",") {
|
|
header.Del(strings.TrimSpace(h))
|
|
}
|
|
}
|
|
|
|
// ParseHost splits host and port from a raw string. Default port is used when raw string doesn't contain port.
|
|
func ParseHost(rawHost string, defaultPort net.Port) (net.Destination, error) {
|
|
port := defaultPort
|
|
host, rawPort, err := net.SplitHostPort(rawHost)
|
|
if err != nil {
|
|
if addrError, ok := err.(*net.AddrError); ok && strings.Contains(addrError.Err, "missing port") {
|
|
host = rawHost
|
|
} else {
|
|
return net.Destination{}, err
|
|
}
|
|
} else if len(rawPort) > 0 {
|
|
intPort, err := strconv.Atoi(rawPort)
|
|
if err != nil {
|
|
return net.Destination{}, err
|
|
}
|
|
port = net.Port(intPort)
|
|
}
|
|
|
|
return net.TCPDestination(net.ParseAddress(host), port), nil
|
|
}
|