mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-04-16 12:35:54 +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
38 lines
953 B
Go
38 lines
953 B
Go
package conf
|
|
|
|
import (
|
|
"github.com/xtls/xray-core/common/errors"
|
|
"github.com/xtls/xray-core/common/net"
|
|
"github.com/xtls/xray-core/proxy/dns"
|
|
"google.golang.org/protobuf/proto"
|
|
)
|
|
|
|
type DNSOutboundConfig struct {
|
|
Network Network `json:"network"`
|
|
Address *Address `json:"address"`
|
|
Port uint16 `json:"port"`
|
|
UserLevel uint32 `json:"userLevel"`
|
|
NonIPQuery string `json:"nonIPQuery"`
|
|
BlockTypes []int32 `json:"blockTypes"`
|
|
}
|
|
|
|
func (c *DNSOutboundConfig) Build() (proto.Message, error) {
|
|
config := &dns.Config{
|
|
Server: &net.Endpoint{
|
|
Network: c.Network.Build(),
|
|
Port: uint32(c.Port),
|
|
},
|
|
UserLevel: c.UserLevel,
|
|
}
|
|
if c.Address != nil {
|
|
config.Server.Address = c.Address.Build()
|
|
}
|
|
switch c.NonIPQuery {
|
|
case "", "reject", "drop", "skip":
|
|
default:
|
|
return nil, errors.New(`unknown "nonIPQuery": `, c.NonIPQuery)
|
|
}
|
|
config.Non_IPQuery = c.NonIPQuery
|
|
config.BlockTypes = c.BlockTypes
|
|
return config, nil
|
|
}
|