mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-09-04 09:27:15 +00:00
63b46cd612
Creating or attaching a client across N inbounds called AddInboundClient once per inbound, strictly one after another. When those inbounds live on different nodes each call is a full node round-trip bounded by the 10s remote timeout, so the request cost the SUM of every node's latency: two nodes felt instant, three took ~13s and timed out bot callers, which is how it surfaced as "two out of four account creations fail". Split the per-inbound preparation from the apply. Preparation stays ordered and single-threaded because fillProtocolDefaults mints the shared credentials on the first inbound and every later one reuses them; the applies then run concurrently, capped at inboundFanoutConcurrency. A 4-node create measured 1.205s -> 0.307s with peak overlap 1 -> 4. Consequences of no longer aborting at the first failing inbound: - Every apply error is tagged with its inbound and the failures are joined, so all of them reach the caller instead of just the first. - The fanout goroutines recover their own panics. Off the request goroutine gin's Recovery no longer covers them, and an unrecovered panic would kill the panel rather than fail one inbound. - A partly-applied call commits clients on the inbounds that succeeded, so the controller and the LDAP job now read needRestart before the error check; otherwise Xray was never flagged for the work that landed. - limitHwid is applied only when every inbound succeeded. Applying it after a failure rewrites limit_hwid and trims the registered devices of an email that already existed, which is silent data loss on an operation the panel reported as failed. Update the API docs for the new partial-application contract and the inbound-tagged error strings.
345 lines
9.8 KiB
Go
345 lines
9.8 KiB
Go
package job
|
|
|
|
import (
|
|
"strings"
|
|
"sync/atomic"
|
|
"time"
|
|
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/logger"
|
|
ldaputil "github.com/mhsanaei/3x-ui/v3/internal/util/ldap"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/web/service"
|
|
)
|
|
|
|
var DefaultTruthyValues = []string{"true", "1", "yes", "on"}
|
|
|
|
// Share of the previous successful fetch a new one must still return to be
|
|
// trusted: a sudden collapse means a broken directory far more often than churn.
|
|
const ldapAutoDeleteMinRetainPercent = 50
|
|
|
|
type LdapSyncJob struct {
|
|
settingService service.SettingService
|
|
inboundService service.InboundService
|
|
clientService service.ClientService
|
|
xrayService service.XrayService
|
|
lastFlagCount atomic.Int64
|
|
}
|
|
|
|
// --- Helper functions for mustGet ---
|
|
func mustGetString(fn func() (string, error)) string {
|
|
v, err := fn()
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
return v
|
|
}
|
|
|
|
func mustGetInt(fn func() (int, error)) int {
|
|
v, err := fn()
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
return v
|
|
}
|
|
|
|
func mustGetBool(fn func() (bool, error)) bool {
|
|
v, err := fn()
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
return v
|
|
}
|
|
|
|
func mustGetStringOr(fn func() (string, error), fallback string) string {
|
|
v, err := fn()
|
|
if err != nil || v == "" {
|
|
return fallback
|
|
}
|
|
return v
|
|
}
|
|
|
|
func NewLdapSyncJob() *LdapSyncJob {
|
|
return new(LdapSyncJob)
|
|
}
|
|
|
|
func (j *LdapSyncJob) Run() {
|
|
logger.Info("LDAP sync job started")
|
|
|
|
enabled, err := j.settingService.GetLdapEnable()
|
|
if err != nil || !enabled {
|
|
logger.Warning("LDAP disabled or failed to fetch flag")
|
|
return
|
|
}
|
|
|
|
// --- LDAP fetch ---
|
|
cfg := ldaputil.Config{
|
|
Host: mustGetString(j.settingService.GetLdapHost),
|
|
Port: mustGetInt(j.settingService.GetLdapPort),
|
|
UseTLS: mustGetBool(j.settingService.GetLdapUseTLS),
|
|
InsecureSkipVerify: mustGetBool(j.settingService.GetLdapInsecureSkipVerify),
|
|
BindDN: mustGetString(j.settingService.GetLdapBindDN),
|
|
Password: mustGetString(j.settingService.GetLdapPassword),
|
|
BaseDN: mustGetString(j.settingService.GetLdapBaseDN),
|
|
UserFilter: mustGetString(j.settingService.GetLdapUserFilter),
|
|
UserAttr: mustGetString(j.settingService.GetLdapUserAttr),
|
|
FlagField: mustGetStringOr(j.settingService.GetLdapFlagField, mustGetString(j.settingService.GetLdapVlessField)),
|
|
TruthyVals: truthyValuesOrDefault(mustGetString(j.settingService.GetLdapTruthyValues)),
|
|
Invert: mustGetBool(j.settingService.GetLdapInvertFlag),
|
|
}
|
|
|
|
flags, err := ldaputil.FetchVlessFlags(cfg)
|
|
if err != nil {
|
|
logger.Warning("LDAP fetch failed:", err)
|
|
return
|
|
}
|
|
logger.Infof("Fetched %d LDAP flags", len(flags))
|
|
|
|
// --- Load all inbounds and all clients once ---
|
|
inboundTags := splitCsv(mustGetString(j.settingService.GetLdapInboundTags))
|
|
inbounds, err := j.inboundService.GetAllInbounds()
|
|
if err != nil {
|
|
logger.Warning("Failed to get inbounds:", err)
|
|
return
|
|
}
|
|
|
|
allClients := map[string]*model.Client{} // email -> client
|
|
inboundMap := map[string]*model.Inbound{} // tag -> inbound
|
|
for _, ib := range inbounds {
|
|
inboundMap[ib.Tag] = ib
|
|
clients, _ := j.inboundService.GetClients(ib)
|
|
for i := range clients {
|
|
allClients[clients[i].Email] = &clients[i]
|
|
}
|
|
}
|
|
|
|
// --- Prepare batch operations ---
|
|
autoCreate := mustGetBool(j.settingService.GetLdapAutoCreate)
|
|
defGB := mustGetInt(j.settingService.GetLdapDefaultTotalGB)
|
|
defExpiryDays := mustGetInt(j.settingService.GetLdapDefaultExpiryDays)
|
|
defLimitIP := mustGetInt(j.settingService.GetLdapDefaultLimitIP)
|
|
|
|
resolvedInboundIds := make([]int, 0, len(inboundTags))
|
|
resolvedTags := make([]string, 0, len(inboundTags))
|
|
for _, tag := range inboundTags {
|
|
ib := inboundMap[tag]
|
|
if ib == nil {
|
|
logger.Warningf("LDAP inbound tag %s does not match any inbound", tag)
|
|
continue
|
|
}
|
|
resolvedInboundIds = append(resolvedInboundIds, ib.Id)
|
|
resolvedTags = append(resolvedTags, tag)
|
|
}
|
|
|
|
clientsToCreate := []model.Client{}
|
|
clientsToEnable := map[string][]string{} // tag -> []email
|
|
clientsToDisable := map[string][]string{} // tag -> []email
|
|
|
|
for email, allowed := range flags {
|
|
existing := allClients[email]
|
|
if existing == nil {
|
|
if allowed && autoCreate {
|
|
clientsToCreate = append(clientsToCreate, j.buildClient(email, defGB, defExpiryDays, defLimitIP))
|
|
}
|
|
continue
|
|
}
|
|
for _, tag := range resolvedTags {
|
|
if allowed && !existing.Enable {
|
|
clientsToEnable[tag] = append(clientsToEnable[tag], email)
|
|
} else if !allowed && existing.Enable {
|
|
clientsToDisable[tag] = append(clientsToDisable[tag], email)
|
|
}
|
|
}
|
|
}
|
|
|
|
j.createClients(clientsToCreate, resolvedInboundIds, resolvedTags)
|
|
|
|
// --- Execute enable/disable batch ---
|
|
for tag, emails := range clientsToEnable {
|
|
j.batchSetEnable(inboundMap[tag], emails, true)
|
|
}
|
|
for tag, emails := range clientsToDisable {
|
|
j.batchSetEnable(inboundMap[tag], emails, false)
|
|
}
|
|
|
|
// --- Auto delete clients not in LDAP ---
|
|
autoDelete := mustGetBool(j.settingService.GetLdapAutoDelete)
|
|
if autoDelete && j.autoDeleteSafeForFetch(len(flags)) {
|
|
ldapEmailSet := map[string]struct{}{}
|
|
for e := range flags {
|
|
ldapEmailSet[e] = struct{}{}
|
|
}
|
|
for _, tag := range inboundTags {
|
|
j.deleteClientsNotInLDAP(tag, ldapEmailSet)
|
|
}
|
|
}
|
|
j.lastFlagCount.Store(int64(len(flags)))
|
|
}
|
|
|
|
// FetchVlessFlags returns (empty, nil) when the bind succeeds but the search
|
|
// yields nothing — a renamed OU, a lost read grant — which is not "all gone".
|
|
func (j *LdapSyncJob) autoDeleteSafeForFetch(fetched int) bool {
|
|
if fetched == 0 {
|
|
logger.Warning("LDAP auto-delete skipped: directory returned no usable users")
|
|
return false
|
|
}
|
|
previous := j.lastFlagCount.Load()
|
|
if previous > 0 && int64(fetched)*100 < previous*ldapAutoDeleteMinRetainPercent {
|
|
logger.Warningf("LDAP auto-delete skipped: fetched %d users, previous successful sync saw %d (below %d%% retention)",
|
|
fetched, previous, ldapAutoDeleteMinRetainPercent)
|
|
return false
|
|
}
|
|
return true
|
|
}
|
|
|
|
func truthyValuesOrDefault(s string) []string {
|
|
if vals := splitCsv(s); len(vals) > 0 {
|
|
return vals
|
|
}
|
|
return DefaultTruthyValues
|
|
}
|
|
|
|
func splitCsv(s string) []string {
|
|
if s == "" {
|
|
return nil
|
|
}
|
|
parts := strings.Split(s, ",")
|
|
out := make([]string, 0, len(parts))
|
|
for _, p := range parts {
|
|
v := strings.TrimSpace(p)
|
|
if v != "" {
|
|
out = append(out, v)
|
|
}
|
|
}
|
|
return out
|
|
}
|
|
|
|
// buildClient creates a new client for auto-create; ClientService.Create fills per-protocol credentials
|
|
func (j *LdapSyncJob) buildClient(email string, defGB, defExpiryDays, defLimitIP int) model.Client {
|
|
c := model.Client{
|
|
Email: email,
|
|
Enable: true,
|
|
LimitIP: defLimitIP,
|
|
TotalGB: int64(defGB) * 1024 * 1024 * 1024,
|
|
}
|
|
if defExpiryDays > 0 {
|
|
c.ExpiryTime = time.Now().Add(time.Duration(defExpiryDays) * 24 * time.Hour).UnixMilli()
|
|
}
|
|
return c
|
|
}
|
|
|
|
// createClients adds each new LDAP client once, attached to every configured inbound
|
|
func (j *LdapSyncJob) createClients(newClients []model.Client, inboundIds []int, tags []string) {
|
|
if len(newClients) == 0 || len(inboundIds) == 0 {
|
|
return
|
|
}
|
|
tagList := strings.Join(tags, ",")
|
|
created := 0
|
|
restartNeeded := false
|
|
for _, c := range newClients {
|
|
nr, err := j.clientService.Create(&j.inboundService, &service.ClientCreatePayload{Client: c, InboundIds: inboundIds})
|
|
// Read before the error check: a partly-applied create still committed
|
|
// clients on the inbounds that succeeded, and those need the restart.
|
|
if nr {
|
|
restartNeeded = true
|
|
}
|
|
if err != nil {
|
|
logger.Warningf("Failed to add client %s for tags %s: %v", c.Email, tagList, err)
|
|
continue
|
|
}
|
|
created++
|
|
}
|
|
if restartNeeded {
|
|
j.xrayService.SetToNeedRestart()
|
|
}
|
|
if created == 0 {
|
|
return
|
|
}
|
|
logger.Infof("LDAP auto-create: %d clients for %s", created, tagList)
|
|
}
|
|
|
|
func (j *LdapSyncJob) batchSetEnable(ib *model.Inbound, emails []string, enable bool) {
|
|
if len(emails) == 0 {
|
|
return
|
|
}
|
|
restartNeeded := false
|
|
changed := 0
|
|
for _, email := range emails {
|
|
ok, needRestart, err := j.clientService.SetClientEnableByEmail(&j.inboundService, email, enable)
|
|
if err != nil {
|
|
logger.Warningf("Batch set enable failed for %s in inbound %s: %v", email, ib.Tag, err)
|
|
continue
|
|
}
|
|
if ok {
|
|
changed++
|
|
}
|
|
if needRestart {
|
|
restartNeeded = true
|
|
}
|
|
}
|
|
if changed > 0 {
|
|
logger.Infof("Batch set enable=%v for %d clients in inbound %s", enable, changed, ib.Tag)
|
|
}
|
|
if restartNeeded {
|
|
j.xrayService.SetToNeedRestart()
|
|
}
|
|
}
|
|
|
|
// deleteClientsNotInLDAP deletes clients not in LDAP using batches and a single restart
|
|
func (j *LdapSyncJob) deleteClientsNotInLDAP(inboundTag string, ldapEmails map[string]struct{}) {
|
|
inbounds, err := j.inboundService.GetAllInbounds()
|
|
if err != nil {
|
|
logger.Warning("Failed to get inbounds for deletion:", err)
|
|
return
|
|
}
|
|
|
|
batchSize := 50 // clients in 1 batch
|
|
restartNeeded := false
|
|
|
|
for _, ib := range inbounds {
|
|
if ib.Tag != inboundTag {
|
|
continue
|
|
}
|
|
clients, err := j.inboundService.GetClients(ib)
|
|
if err != nil {
|
|
logger.Warningf("Failed to get clients for inbound %s: %v", ib.Tag, err)
|
|
continue
|
|
}
|
|
|
|
// Collect clients for deletion
|
|
toDelete := []model.Client{}
|
|
for _, c := range clients {
|
|
if _, ok := ldapEmails[c.Email]; !ok {
|
|
toDelete = append(toDelete, c)
|
|
}
|
|
}
|
|
|
|
if len(toDelete) == 0 {
|
|
continue
|
|
}
|
|
|
|
for i := 0; i < len(toDelete); i += batchSize {
|
|
end := min(i+batchSize, len(toDelete))
|
|
batch := toDelete[i:end]
|
|
|
|
for _, c := range batch {
|
|
nr, err := j.clientService.DetachByEmail(&j.inboundService, ib.Id, c.Email)
|
|
if err != nil {
|
|
logger.Warningf("Failed to delete client %s from inbound id=%d(tag=%s): %v",
|
|
c.Email, ib.Id, ib.Tag, err)
|
|
continue
|
|
}
|
|
logger.Infof("Deleted client %s from inbound id=%d(tag=%s)",
|
|
c.Email, ib.Id, ib.Tag)
|
|
if nr {
|
|
restartNeeded = true
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if restartNeeded {
|
|
j.xrayService.SetToNeedRestart()
|
|
logger.Info("Xray restart scheduled after batch deletion")
|
|
}
|
|
}
|