mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-04-16 04:25: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
55 lines
1.4 KiB
Go
55 lines
1.4 KiB
Go
package command
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/xtls/xray-core/app/log"
|
|
"github.com/xtls/xray-core/common"
|
|
"github.com/xtls/xray-core/common/errors"
|
|
"github.com/xtls/xray-core/core"
|
|
grpc "google.golang.org/grpc"
|
|
)
|
|
|
|
type LoggerServer struct {
|
|
V *core.Instance
|
|
}
|
|
|
|
// RestartLogger implements LoggerService.
|
|
func (s *LoggerServer) RestartLogger(ctx context.Context, request *RestartLoggerRequest) (*RestartLoggerResponse, error) {
|
|
logger := s.V.GetFeature((*log.Instance)(nil))
|
|
if logger == nil {
|
|
return nil, errors.New("unable to get logger instance")
|
|
}
|
|
if err := logger.Close(); err != nil {
|
|
return nil, errors.New("failed to close logger").Base(err)
|
|
}
|
|
if err := logger.Start(); err != nil {
|
|
return nil, errors.New("failed to start logger").Base(err)
|
|
}
|
|
return &RestartLoggerResponse{}, nil
|
|
}
|
|
|
|
func (s *LoggerServer) mustEmbedUnimplementedLoggerServiceServer() {}
|
|
|
|
type service struct {
|
|
v *core.Instance
|
|
}
|
|
|
|
func (s *service) Register(server *grpc.Server) {
|
|
ls := &LoggerServer{
|
|
V: s.v,
|
|
}
|
|
RegisterLoggerServiceServer(server, ls)
|
|
|
|
// For compatibility purposes
|
|
vCoreDesc := LoggerService_ServiceDesc
|
|
vCoreDesc.ServiceName = "v2ray.core.app.log.command.LoggerService"
|
|
server.RegisterService(&vCoreDesc, ls)
|
|
}
|
|
|
|
func init() {
|
|
common.Must(common.RegisterConfig((*Config)(nil), func(ctx context.Context, cfg interface{}) (interface{}, error) {
|
|
s := core.MustFromContext(ctx)
|
|
return &service{v: s}, nil
|
|
}))
|
|
}
|