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
65 lines
1.5 KiB
Go
65 lines
1.5 KiB
Go
package conf
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"github.com/xtls/xray-core/app/log"
|
|
clog "github.com/xtls/xray-core/common/log"
|
|
)
|
|
|
|
func DefaultLogConfig() *log.Config {
|
|
return &log.Config{
|
|
AccessLogType: log.LogType_None,
|
|
ErrorLogType: log.LogType_Console,
|
|
ErrorLogLevel: clog.Severity_Warning,
|
|
}
|
|
}
|
|
|
|
type LogConfig struct {
|
|
AccessLog string `json:"access"`
|
|
ErrorLog string `json:"error"`
|
|
LogLevel string `json:"loglevel"`
|
|
DNSLog bool `json:"dnsLog"`
|
|
MaskAddress string `json:"maskAddress"`
|
|
}
|
|
|
|
func (v *LogConfig) Build() *log.Config {
|
|
if v == nil {
|
|
return nil
|
|
}
|
|
config := &log.Config{
|
|
ErrorLogType: log.LogType_Console,
|
|
AccessLogType: log.LogType_Console,
|
|
EnableDnsLog: v.DNSLog,
|
|
}
|
|
|
|
if v.AccessLog == "none" {
|
|
config.AccessLogType = log.LogType_None
|
|
} else if len(v.AccessLog) > 0 {
|
|
config.AccessLogPath = v.AccessLog
|
|
config.AccessLogType = log.LogType_File
|
|
}
|
|
if v.ErrorLog == "none" {
|
|
config.ErrorLogType = log.LogType_None
|
|
} else if len(v.ErrorLog) > 0 {
|
|
config.ErrorLogPath = v.ErrorLog
|
|
config.ErrorLogType = log.LogType_File
|
|
}
|
|
|
|
level := strings.ToLower(v.LogLevel)
|
|
switch level {
|
|
case "debug":
|
|
config.ErrorLogLevel = clog.Severity_Debug
|
|
case "info":
|
|
config.ErrorLogLevel = clog.Severity_Info
|
|
case "error":
|
|
config.ErrorLogLevel = clog.Severity_Error
|
|
case "none":
|
|
config.ErrorLogType = log.LogType_None
|
|
config.AccessLogType = log.LogType_None
|
|
default:
|
|
config.ErrorLogLevel = clog.Severity_Warning
|
|
}
|
|
config.MaskAddress = v.MaskAddress
|
|
return config
|
|
}
|