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
70 lines
1.4 KiB
Go
70 lines
1.4 KiB
Go
package log
|
|
|
|
import (
|
|
"context"
|
|
"strings"
|
|
|
|
"github.com/xtls/xray-core/common/serial"
|
|
)
|
|
|
|
type logKey int
|
|
|
|
const (
|
|
accessMessageKey logKey = iota
|
|
)
|
|
|
|
type AccessStatus string
|
|
|
|
const (
|
|
AccessAccepted = AccessStatus("accepted")
|
|
AccessRejected = AccessStatus("rejected")
|
|
)
|
|
|
|
type AccessMessage struct {
|
|
From interface{}
|
|
To interface{}
|
|
Status AccessStatus
|
|
Reason interface{}
|
|
Email string
|
|
Detour string
|
|
}
|
|
|
|
func (m *AccessMessage) String() string {
|
|
builder := strings.Builder{}
|
|
builder.WriteString("from")
|
|
builder.WriteByte(' ')
|
|
builder.WriteString(serial.ToString(m.From))
|
|
builder.WriteByte(' ')
|
|
builder.WriteString(string(m.Status))
|
|
builder.WriteByte(' ')
|
|
builder.WriteString(serial.ToString(m.To))
|
|
|
|
if len(m.Detour) > 0 {
|
|
builder.WriteString(" [")
|
|
builder.WriteString(m.Detour)
|
|
builder.WriteByte(']')
|
|
}
|
|
|
|
if reason := serial.ToString(m.Reason); len(reason) > 0 {
|
|
builder.WriteString(" ")
|
|
builder.WriteString(reason)
|
|
}
|
|
|
|
if len(m.Email) > 0 {
|
|
builder.WriteString(" email: ")
|
|
builder.WriteString(m.Email)
|
|
}
|
|
|
|
return builder.String()
|
|
}
|
|
|
|
func ContextWithAccessMessage(ctx context.Context, accessMessage *AccessMessage) context.Context {
|
|
return context.WithValue(ctx, accessMessageKey, accessMessage)
|
|
}
|
|
|
|
func AccessMessageFromContext(ctx context.Context) *AccessMessage {
|
|
if accessMessage, ok := ctx.Value(accessMessageKey).(*AccessMessage); ok {
|
|
return accessMessage
|
|
}
|
|
return nil
|
|
}
|