mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-09-11 04:37:16 +00:00
112b19a8ed
Addresses review feedback on the previous commit. UpdateInboundClient carries a stored keepalive forward whenever the incoming one is zero, so the settings JSON and the running peer survive a metadata-only edit that omits the field. That was a 0 -> 0 no-op while no UI could set a nonzero value. Now that the client form can, the carry-forward became reachable in the other direction: a client created at the form's default of 25 could never be returned to 0, and the hint text shipped to all 13 locales -- "0 disables it" -- described something the backend silently refused. The save even reported success, because a settings blob that came back byte-identical skips the transaction entirely. The zero value cannot carry that distinction, so model.Client.KeepAlive becomes *int: nil means the field was never sent, &0 means "send no keepalives". The pointer survives the internal marshal in ClientService.Update, which is where an explicit 0 was being erased by omitempty before UpdateInboundClient ever saw it. ClientRecord.KeepAlive stays a plain int -- it is the stored column, where "unset" has no meaning -- and the conversions bridge the two. Two tests, both red before this change in the direction they cover: an explicit 0 must reach wg_keep_alive, and an update that omits the field must still leave a stored 25 alone. Also adds the output transform every other numeric field in the client form already has, so a cleared box sends 0 rather than null.
315 lines
9.4 KiB
Go
315 lines
9.4 KiB
Go
package runtime
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"strconv"
|
|
"strings"
|
|
"sync"
|
|
|
|
"github.com/mhsanaei/3x-ui/v3/internal/amneziawg"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/amneziawgnet"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/mtproto"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/xray"
|
|
)
|
|
|
|
type LocalDeps struct {
|
|
APIPort func() int
|
|
SetNeedRestart func()
|
|
}
|
|
|
|
type Local struct {
|
|
deps LocalDeps
|
|
mu sync.Mutex
|
|
}
|
|
|
|
func NewLocal(deps LocalDeps) *Local {
|
|
return &Local{deps: deps}
|
|
}
|
|
|
|
func (l *Local) Name() string { return "local" }
|
|
|
|
func (l *Local) withAPI(fn func(api *xray.XrayAPI) error) error {
|
|
l.mu.Lock()
|
|
defer l.mu.Unlock()
|
|
|
|
port := l.deps.APIPort()
|
|
if port <= 0 {
|
|
return errors.New("local xray is not running")
|
|
}
|
|
var api xray.XrayAPI
|
|
if err := api.Init(port); err != nil {
|
|
return err
|
|
}
|
|
defer api.Close()
|
|
return fn(&api)
|
|
}
|
|
|
|
func (l *Local) AddInbound(_ context.Context, ib *model.Inbound) error {
|
|
if ib.Protocol == model.MTProto {
|
|
inst, ok := mtproto.InstanceFromInbound(ib)
|
|
if !ok {
|
|
return nil
|
|
}
|
|
return mtproto.GetManager().Ensure(inst)
|
|
}
|
|
if ib.Protocol == model.AmneziaWG {
|
|
inst, ok := amneziawg.InstanceFromInbound(ib)
|
|
if !ok {
|
|
return nil
|
|
}
|
|
err := amneziawgnet.GetManager().Ensure(amneziawgnet.Desired{
|
|
Instance: inst,
|
|
Options: amneziawgnet.DeviceOptions{
|
|
HeaderProtectionKey: inst.Obfuscation.HeaderProtectionKey,
|
|
ContentPaddingAddition: inst.Obfuscation.ContentPaddingAddition,
|
|
RekeyAfterTime: inst.Obfuscation.RekeyAfterTime,
|
|
RekeyTimeout: inst.Obfuscation.RekeyTimeout,
|
|
RejectAfterTime: inst.Obfuscation.RejectAfterTime,
|
|
KeepaliveTimeout: inst.Obfuscation.KeepaliveTimeout,
|
|
MaxHandshakeAttempts: inst.Obfuscation.MaxHandshakeAttempts,
|
|
RandomTrailers: inst.Obfuscation.RandomTrailers,
|
|
DisableCookies: inst.Obfuscation.DisableCookies,
|
|
},
|
|
})
|
|
// A brand new inbound can be the first one to qualify for
|
|
// injectAmneziawgnetSocks's Xray-side relay inbound (e.g. its first
|
|
// valid peer). Ensure only updates the embedded Device -- flag Xray
|
|
// for a resync so the relay actually gets created within the next
|
|
// ApplyPendingRestart tick instead of only at the next full restart.
|
|
if l.deps.SetNeedRestart != nil {
|
|
l.deps.SetNeedRestart()
|
|
}
|
|
return err
|
|
}
|
|
body, err := json.MarshalIndent(ib.GenXrayInboundConfig(), "", " ")
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return l.withAPI(func(api *xray.XrayAPI) error {
|
|
return api.AddInbound(body)
|
|
})
|
|
}
|
|
|
|
func (l *Local) DelInbound(_ context.Context, ib *model.Inbound) error {
|
|
if ib.Protocol == model.MTProto {
|
|
mtproto.GetManager().Remove(ib.Id)
|
|
return nil
|
|
}
|
|
if ib.Protocol == model.AmneziaWG {
|
|
amneziawgnet.GetManager().Remove(ib.Id)
|
|
// The removed inbound may have been the only one backing Xray's
|
|
// injectAmneziawgnetSocks relay inbound for this tag -- flag a
|
|
// resync so the now-stale relay gets torn down promptly.
|
|
if l.deps.SetNeedRestart != nil {
|
|
l.deps.SetNeedRestart()
|
|
}
|
|
return nil
|
|
}
|
|
return l.withAPI(func(api *xray.XrayAPI) error {
|
|
return api.DelInbound(ib.Tag)
|
|
})
|
|
}
|
|
|
|
func (l *Local) UpdateInbound(ctx context.Context, oldIb, newIb *model.Inbound) error {
|
|
if oldIb.Protocol == model.MTProto || newIb.Protocol == model.MTProto {
|
|
return l.updateMtprotoInbound(ctx, oldIb, newIb)
|
|
}
|
|
if oldIb.Protocol == model.AmneziaWG || newIb.Protocol == model.AmneziaWG {
|
|
return l.updateAmneziaWGInbound(ctx, oldIb, newIb)
|
|
}
|
|
_ = l.DelInbound(ctx, oldIb)
|
|
if !newIb.Enable {
|
|
return nil
|
|
}
|
|
return l.AddInbound(ctx, newIb)
|
|
}
|
|
|
|
// updateMtprotoInbound applies an inbound update without the Del+Add sequence
|
|
// the xray path uses: Remove would drop the manager's fingerprint state, which
|
|
// is what lets Ensure keep the running mtg process (and its live connections)
|
|
// when nothing in the generated config changed. The sidecar is only stopped
|
|
// when the inbound is disabled, loses its last active secret, or moves to a
|
|
// different protocol.
|
|
func (l *Local) updateMtprotoInbound(ctx context.Context, oldIb, newIb *model.Inbound) error {
|
|
if oldIb.Protocol == model.MTProto && newIb.Protocol != model.MTProto {
|
|
mtproto.GetManager().Remove(oldIb.Id)
|
|
if !newIb.Enable {
|
|
return nil
|
|
}
|
|
return l.AddInbound(ctx, newIb)
|
|
}
|
|
if oldIb.Protocol != model.MTProto {
|
|
_ = l.DelInbound(ctx, oldIb)
|
|
}
|
|
if !newIb.Enable {
|
|
mtproto.GetManager().Remove(newIb.Id)
|
|
return nil
|
|
}
|
|
inst, ok := mtproto.InstanceFromInbound(newIb)
|
|
if !ok {
|
|
mtproto.GetManager().Remove(newIb.Id)
|
|
return nil
|
|
}
|
|
return mtproto.GetManager().Ensure(inst)
|
|
}
|
|
|
|
// updateAmneziaWGInbound mirrors updateMtprotoInbound: it skips the
|
|
// Remove+Ensure sequence a plain Del+Add would force so that, on an
|
|
// AmneziaWG-to-AmneziaWG edit, Manager.Ensure's own fingerprint comparison
|
|
// can reconfigure the running embedded Device in place via IpcSet instead
|
|
// of always rebuilding it (see internal/amneziawgnet.Manager.ensureLocked --
|
|
// only an address/MTU change forces a rebuild there, not a peer edit).
|
|
//
|
|
// Every exit path below only touches the embedded Device via
|
|
// amneziawgnet.GetManager() -- none of it rebuilds Xray's own config, which
|
|
// is what actually creates/removes injectAmneziawgnetSocks's relay inbound.
|
|
// A peer edit that changes whether this inbound has a qualifying peer at
|
|
// all (its first peer added, or its last one removed) must still get that
|
|
// relay created or torn down, so flag Xray for a resync unconditionally
|
|
// here rather than trying to enumerate which of the branches below need it.
|
|
func (l *Local) updateAmneziaWGInbound(ctx context.Context, oldIb, newIb *model.Inbound) error {
|
|
if l.deps.SetNeedRestart != nil {
|
|
l.deps.SetNeedRestart()
|
|
}
|
|
if oldIb.Protocol == model.AmneziaWG && newIb.Protocol != model.AmneziaWG {
|
|
amneziawgnet.GetManager().Remove(oldIb.Id)
|
|
if !newIb.Enable {
|
|
return nil
|
|
}
|
|
return l.AddInbound(ctx, newIb)
|
|
}
|
|
if oldIb.Protocol != model.AmneziaWG {
|
|
_ = l.DelInbound(ctx, oldIb)
|
|
}
|
|
if !newIb.Enable {
|
|
amneziawgnet.GetManager().Remove(newIb.Id)
|
|
return nil
|
|
}
|
|
inst, ok := amneziawg.InstanceFromInbound(newIb)
|
|
if !ok {
|
|
amneziawgnet.GetManager().Remove(newIb.Id)
|
|
return nil
|
|
}
|
|
return amneziawgnet.GetManager().Ensure(amneziawgnet.Desired{
|
|
Instance: inst,
|
|
Options: amneziawgnet.DeviceOptions{
|
|
HeaderProtectionKey: inst.Obfuscation.HeaderProtectionKey,
|
|
ContentPaddingAddition: inst.Obfuscation.ContentPaddingAddition,
|
|
RekeyAfterTime: inst.Obfuscation.RekeyAfterTime,
|
|
RekeyTimeout: inst.Obfuscation.RekeyTimeout,
|
|
RejectAfterTime: inst.Obfuscation.RejectAfterTime,
|
|
KeepaliveTimeout: inst.Obfuscation.KeepaliveTimeout,
|
|
MaxHandshakeAttempts: inst.Obfuscation.MaxHandshakeAttempts,
|
|
RandomTrailers: inst.Obfuscation.RandomTrailers,
|
|
DisableCookies: inst.Obfuscation.DisableCookies,
|
|
},
|
|
})
|
|
}
|
|
|
|
func (l *Local) AddUser(_ context.Context, ib *model.Inbound, userMap map[string]any) error {
|
|
if ib.Protocol == model.MTProto || ib.Protocol == model.AmneziaWG {
|
|
return nil
|
|
}
|
|
return l.withAPI(func(api *xray.XrayAPI) error {
|
|
return api.AddUser(string(ib.Protocol), ib.Tag, userMap)
|
|
})
|
|
}
|
|
|
|
func (l *Local) RemoveUser(_ context.Context, ib *model.Inbound, email string) error {
|
|
if ib.Protocol == model.MTProto || ib.Protocol == model.AmneziaWG {
|
|
return nil
|
|
}
|
|
return l.withAPI(func(api *xray.XrayAPI) error {
|
|
return api.RemoveUser(ib.Tag, email)
|
|
})
|
|
}
|
|
|
|
func (l *Local) AddClient(ctx context.Context, ib *model.Inbound, client model.Client) error {
|
|
if !client.Enable {
|
|
return nil
|
|
}
|
|
user := map[string]any{
|
|
"email": client.Email,
|
|
"id": client.ID,
|
|
"security": client.Security,
|
|
"flow": client.Flow,
|
|
"auth": client.Auth,
|
|
"password": client.Password,
|
|
"publicKey": client.PublicKey,
|
|
"allowedIPs": client.AllowedIPs,
|
|
"preSharedKey": client.PreSharedKey,
|
|
"keepAlive": wgKeepAlive(client.KeepAliveSeconds()),
|
|
}
|
|
return l.AddUser(ctx, ib, user)
|
|
}
|
|
|
|
func (l *Local) DeleteUser(ctx context.Context, ib *model.Inbound, email string) error {
|
|
if email == "" {
|
|
return nil
|
|
}
|
|
if err := l.RemoveUser(ctx, ib, email); err != nil {
|
|
if strings.Contains(err.Error(), "not found") {
|
|
return nil
|
|
}
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (l *Local) DeleteClient(context.Context, string) error {
|
|
return nil
|
|
}
|
|
|
|
func (l *Local) UpdateUser(ctx context.Context, ib *model.Inbound, oldEmail string, payload model.Client) error {
|
|
if oldEmail != "" {
|
|
if err := l.RemoveUser(ctx, ib, oldEmail); err != nil && !strings.Contains(err.Error(), "not found") {
|
|
return err
|
|
}
|
|
}
|
|
if !payload.Enable {
|
|
return nil
|
|
}
|
|
user := map[string]any{
|
|
"email": payload.Email,
|
|
"id": payload.ID,
|
|
"security": payload.Security,
|
|
"flow": payload.Flow,
|
|
"auth": payload.Auth,
|
|
"password": payload.Password,
|
|
"publicKey": payload.PublicKey,
|
|
"allowedIPs": payload.AllowedIPs,
|
|
"preSharedKey": payload.PreSharedKey,
|
|
"keepAlive": wgKeepAlive(payload.KeepAliveSeconds()),
|
|
}
|
|
return l.AddUser(ctx, ib, user)
|
|
}
|
|
|
|
func wgKeepAlive(seconds int) string {
|
|
if seconds <= 0 {
|
|
return ""
|
|
}
|
|
return strconv.Itoa(seconds)
|
|
}
|
|
|
|
func (l *Local) RestartXray(_ context.Context) error {
|
|
if l.deps.SetNeedRestart != nil {
|
|
l.deps.SetNeedRestart()
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (l *Local) ResetClientTraffic(_ context.Context, _ *model.Inbound, _ string) error {
|
|
return nil
|
|
}
|
|
|
|
func (l *Local) ResetAllTraffics(_ context.Context) error {
|
|
return nil
|
|
}
|
|
|
|
func (l *Local) ResetInboundTraffic(_ context.Context, _ *model.Inbound) error {
|
|
return nil
|
|
}
|