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.2 KiB
Go
64 lines
1.2 KiB
Go
package log // import "github.com/xtls/xray-core/common/log"
|
|
|
|
import (
|
|
"sync"
|
|
|
|
"github.com/xtls/xray-core/common/serial"
|
|
)
|
|
|
|
// Message is the interface for all log messages.
|
|
type Message interface {
|
|
String() string
|
|
}
|
|
|
|
// Handler is the interface for log handler.
|
|
type Handler interface {
|
|
Handle(msg Message)
|
|
}
|
|
|
|
// GeneralMessage is a general log message that can contain all kind of content.
|
|
type GeneralMessage struct {
|
|
Severity Severity
|
|
Content interface{}
|
|
}
|
|
|
|
// String implements Message.
|
|
func (m *GeneralMessage) String() string {
|
|
return serial.Concat("[", m.Severity, "] ", m.Content)
|
|
}
|
|
|
|
// Record writes a message into log stream.
|
|
func Record(msg Message) {
|
|
logHandler.Handle(msg)
|
|
}
|
|
|
|
var logHandler syncHandler
|
|
|
|
// RegisterHandler registers a new handler as current log handler. Previous registered handler will be discarded.
|
|
func RegisterHandler(handler Handler) {
|
|
if handler == nil {
|
|
panic("Log handler is nil")
|
|
}
|
|
logHandler.Set(handler)
|
|
}
|
|
|
|
type syncHandler struct {
|
|
sync.RWMutex
|
|
Handler
|
|
}
|
|
|
|
func (h *syncHandler) Handle(msg Message) {
|
|
h.RLock()
|
|
defer h.RUnlock()
|
|
|
|
if h.Handler != nil {
|
|
h.Handler.Handle(msg)
|
|
}
|
|
}
|
|
|
|
func (h *syncHandler) Set(handler Handler) {
|
|
h.Lock()
|
|
defer h.Unlock()
|
|
|
|
h.Handler = handler
|
|
}
|