mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-04-17 04:55:46 +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
41 lines
1.1 KiB
Go
41 lines
1.1 KiB
Go
package conf
|
|
|
|
import (
|
|
"github.com/xtls/xray-core/transport/internet/grpc"
|
|
"google.golang.org/protobuf/proto"
|
|
)
|
|
|
|
type GRPCConfig struct {
|
|
Authority string `json:"authority"`
|
|
ServiceName string `json:"serviceName"`
|
|
MultiMode bool `json:"multiMode"`
|
|
IdleTimeout int32 `json:"idle_timeout"`
|
|
HealthCheckTimeout int32 `json:"health_check_timeout"`
|
|
PermitWithoutStream bool `json:"permit_without_stream"`
|
|
InitialWindowsSize int32 `json:"initial_windows_size"`
|
|
UserAgent string `json:"user_agent"`
|
|
}
|
|
|
|
func (g *GRPCConfig) Build() (proto.Message, error) {
|
|
if g.IdleTimeout <= 0 {
|
|
g.IdleTimeout = 0
|
|
}
|
|
if g.HealthCheckTimeout <= 0 {
|
|
g.HealthCheckTimeout = 0
|
|
}
|
|
if g.InitialWindowsSize < 0 {
|
|
// default window size of gRPC-go
|
|
g.InitialWindowsSize = 0
|
|
}
|
|
|
|
return &grpc.Config{
|
|
Authority: g.Authority,
|
|
ServiceName: g.ServiceName,
|
|
MultiMode: g.MultiMode,
|
|
IdleTimeout: g.IdleTimeout,
|
|
HealthCheckTimeout: g.HealthCheckTimeout,
|
|
PermitWithoutStream: g.PermitWithoutStream,
|
|
InitialWindowsSize: g.InitialWindowsSize,
|
|
UserAgent: g.UserAgent,
|
|
}, nil
|
|
}
|