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
70 lines
1.5 KiB
Go
70 lines
1.5 KiB
Go
package pipe
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/xtls/xray-core/common/signal"
|
|
"github.com/xtls/xray-core/common/signal/done"
|
|
"github.com/xtls/xray-core/features/policy"
|
|
)
|
|
|
|
// Option for creating new Pipes.
|
|
type Option func(*pipeOption)
|
|
|
|
// WithoutSizeLimit returns an Option for Pipe to have no size limit.
|
|
func WithoutSizeLimit() Option {
|
|
return func(opt *pipeOption) {
|
|
opt.limit = -1
|
|
}
|
|
}
|
|
|
|
// WithSizeLimit returns an Option for Pipe to have the given size limit.
|
|
func WithSizeLimit(limit int32) Option {
|
|
return func(opt *pipeOption) {
|
|
opt.limit = limit
|
|
}
|
|
}
|
|
|
|
// DiscardOverflow returns an Option for Pipe to discard writes if full.
|
|
func DiscardOverflow() Option {
|
|
return func(opt *pipeOption) {
|
|
opt.discardOverflow = true
|
|
}
|
|
}
|
|
|
|
// OptionsFromContext returns a list of Options from context.
|
|
func OptionsFromContext(ctx context.Context) []Option {
|
|
var opt []Option
|
|
|
|
bp := policy.BufferPolicyFromContext(ctx)
|
|
if bp.PerConnection >= 0 {
|
|
opt = append(opt, WithSizeLimit(bp.PerConnection))
|
|
} else {
|
|
opt = append(opt, WithoutSizeLimit())
|
|
}
|
|
|
|
return opt
|
|
}
|
|
|
|
// New creates a new Reader and Writer that connects to each other.
|
|
func New(opts ...Option) (*Reader, *Writer) {
|
|
p := &pipe{
|
|
readSignal: signal.NewNotifier(),
|
|
writeSignal: signal.NewNotifier(),
|
|
done: done.New(),
|
|
errChan: make(chan error, 1),
|
|
option: pipeOption{
|
|
limit: -1,
|
|
},
|
|
}
|
|
|
|
for _, opt := range opts {
|
|
opt(&(p.option))
|
|
}
|
|
|
|
return &Reader{
|
|
pipe: p,
|
|
}, &Writer{
|
|
pipe: p,
|
|
}
|
|
}
|