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
64 lines
1.3 KiB
Go
64 lines
1.3 KiB
Go
package crypto
|
|
|
|
import (
|
|
"crypto/cipher"
|
|
"io"
|
|
|
|
"github.com/xtls/xray-core/common/buf"
|
|
)
|
|
|
|
type CryptionReader struct {
|
|
stream cipher.Stream
|
|
reader io.Reader
|
|
}
|
|
|
|
func NewCryptionReader(stream cipher.Stream, reader io.Reader) *CryptionReader {
|
|
return &CryptionReader{
|
|
stream: stream,
|
|
reader: reader,
|
|
}
|
|
}
|
|
|
|
func (r *CryptionReader) Read(data []byte) (int, error) {
|
|
nBytes, err := r.reader.Read(data)
|
|
if nBytes > 0 {
|
|
r.stream.XORKeyStream(data[:nBytes], data[:nBytes])
|
|
}
|
|
return nBytes, err
|
|
}
|
|
|
|
var _ buf.Writer = (*CryptionWriter)(nil)
|
|
|
|
type CryptionWriter struct {
|
|
stream cipher.Stream
|
|
writer io.Writer
|
|
bufWriter buf.Writer
|
|
}
|
|
|
|
// NewCryptionWriter creates a new CryptionWriter.
|
|
func NewCryptionWriter(stream cipher.Stream, writer io.Writer) *CryptionWriter {
|
|
return &CryptionWriter{
|
|
stream: stream,
|
|
writer: writer,
|
|
bufWriter: buf.NewWriter(writer),
|
|
}
|
|
}
|
|
|
|
// Write implements io.Writer.Write().
|
|
func (w *CryptionWriter) Write(data []byte) (int, error) {
|
|
w.stream.XORKeyStream(data, data)
|
|
|
|
if err := buf.WriteAllBytes(w.writer, data, nil); err != nil {
|
|
return 0, err
|
|
}
|
|
return len(data), nil
|
|
}
|
|
|
|
// WriteMultiBuffer implements buf.Writer.
|
|
func (w *CryptionWriter) WriteMultiBuffer(mb buf.MultiBuffer) error {
|
|
for _, b := range mb {
|
|
w.stream.XORKeyStream(b.Bytes(), b.Bytes())
|
|
}
|
|
|
|
return w.bufWriter.WriteMultiBuffer(mb)
|
|
}
|