mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-04-16 20:45:50 +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
62 lines
1.5 KiB
Go
62 lines
1.5 KiB
Go
package drain
|
|
|
|
import (
|
|
"io"
|
|
|
|
"github.com/xtls/xray-core/common/dice"
|
|
"github.com/xtls/xray-core/common/errors"
|
|
)
|
|
|
|
type BehaviorSeedLimitedDrainer struct {
|
|
DrainSize int
|
|
}
|
|
|
|
func NewBehaviorSeedLimitedDrainer(behaviorSeed int64, drainFoundation, maxBaseDrainSize, maxRandDrain int) (Drainer, error) {
|
|
behaviorRand := dice.NewDeterministicDice(behaviorSeed)
|
|
BaseDrainSize := behaviorRand.Roll(maxBaseDrainSize)
|
|
RandDrainMax := behaviorRand.Roll(maxRandDrain) + 1
|
|
RandDrainRolled := dice.Roll(RandDrainMax)
|
|
DrainSize := drainFoundation + BaseDrainSize + RandDrainRolled
|
|
return &BehaviorSeedLimitedDrainer{DrainSize: DrainSize}, nil
|
|
}
|
|
|
|
func (d *BehaviorSeedLimitedDrainer) AcknowledgeReceive(size int) {
|
|
d.DrainSize -= size
|
|
}
|
|
|
|
func (d *BehaviorSeedLimitedDrainer) Drain(reader io.Reader) error {
|
|
if d.DrainSize > 0 {
|
|
err := drainReadN(reader, d.DrainSize)
|
|
if err == nil {
|
|
return errors.New("drained connection")
|
|
}
|
|
return errors.New("unable to drain connection").Base(err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func drainReadN(reader io.Reader, n int) error {
|
|
_, err := io.CopyN(io.Discard, reader, int64(n))
|
|
return err
|
|
}
|
|
|
|
func WithError(drainer Drainer, reader io.Reader, err error) error {
|
|
drainErr := drainer.Drain(reader)
|
|
if drainErr == nil {
|
|
return err
|
|
}
|
|
return errors.New(drainErr).Base(err)
|
|
}
|
|
|
|
type NopDrainer struct{}
|
|
|
|
func (n NopDrainer) AcknowledgeReceive(size int) {
|
|
}
|
|
|
|
func (n NopDrainer) Drain(reader io.Reader) error {
|
|
return nil
|
|
}
|
|
|
|
func NewNopDrainer() Drainer {
|
|
return &NopDrainer{}
|
|
}
|