mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-06-05 20:54:14 +00:00
Adds two thin helpers to ClientService (CreateOne, DetachByEmail) and rewrites tgbot.SubmitAddClient and ldap_sync_job to call ClientService directly. Removes the JSON-blob payloads (BuildJSONForProtocol output for add, clientsToJSON/clientToJSON helpers) that callers previously fed to InboundService.AddInboundClient/DelInboundClient. ldap_sync_job.batchSetEnable now loops InboundService.SetClientEnableByEmail per email instead of trying to coerce AddInboundClient into doing the update — the old path would have failed duplicate-email validation for existing clients anyway. The legacy InboundService.AddInboundClient/UpdateInboundClient/ DelInboundClient methods stay in place; they are now only used internally by ClientService Create/Update/Delete/Attach. Inlining + deleting them follows in a separate commit. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
302 lines
7.9 KiB
Go
302 lines
7.9 KiB
Go
package job
|
|
|
|
import (
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/google/uuid"
|
|
|
|
"github.com/mhsanaei/3x-ui/v3/database/model"
|
|
"github.com/mhsanaei/3x-ui/v3/logger"
|
|
ldaputil "github.com/mhsanaei/3x-ui/v3/util/ldap"
|
|
"github.com/mhsanaei/3x-ui/v3/web/service"
|
|
)
|
|
|
|
var DefaultTruthyValues = []string{"true", "1", "yes", "on"}
|
|
|
|
type LdapSyncJob struct {
|
|
settingService service.SettingService
|
|
inboundService service.InboundService
|
|
clientService service.ClientService
|
|
xrayService service.XrayService
|
|
}
|
|
|
|
// --- 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),
|
|
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: splitCsv(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)
|
|
|
|
clientsToCreate := map[string][]model.Client{} // tag -> []new clients
|
|
clientsToEnable := map[string][]string{} // tag -> []email
|
|
clientsToDisable := map[string][]string{} // tag -> []email
|
|
|
|
for email, allowed := range flags {
|
|
exists := allClients[email] != nil
|
|
for _, tag := range inboundTags {
|
|
if !exists && allowed && autoCreate {
|
|
newClient := j.buildClient(inboundMap[tag], email, defGB, defExpiryDays, defLimitIP)
|
|
clientsToCreate[tag] = append(clientsToCreate[tag], newClient)
|
|
} else if exists {
|
|
if allowed && !allClients[email].Enable {
|
|
clientsToEnable[tag] = append(clientsToEnable[tag], email)
|
|
} else if !allowed && allClients[email].Enable {
|
|
clientsToDisable[tag] = append(clientsToDisable[tag], email)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
for tag, newClients := range clientsToCreate {
|
|
if len(newClients) == 0 {
|
|
continue
|
|
}
|
|
ib := inboundMap[tag]
|
|
created := 0
|
|
restartNeeded := false
|
|
for _, c := range newClients {
|
|
nr, err := j.clientService.CreateOne(&j.inboundService, ib.Id, c)
|
|
if err != nil {
|
|
logger.Warningf("Failed to add client %s for tag %s: %v", c.Email, tag, err)
|
|
continue
|
|
}
|
|
created++
|
|
if nr {
|
|
restartNeeded = true
|
|
}
|
|
}
|
|
if created > 0 {
|
|
logger.Infof("LDAP auto-create: %d clients for %s", created, tag)
|
|
if restartNeeded {
|
|
j.xrayService.SetToNeedRestart()
|
|
}
|
|
}
|
|
}
|
|
|
|
// --- 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 {
|
|
ldapEmailSet := map[string]struct{}{}
|
|
for e := range flags {
|
|
ldapEmailSet[e] = struct{}{}
|
|
}
|
|
for _, tag := range inboundTags {
|
|
j.deleteClientsNotInLDAP(tag, ldapEmailSet)
|
|
}
|
|
}
|
|
}
|
|
|
|
func splitCsv(s string) []string {
|
|
if s == "" {
|
|
return DefaultTruthyValues
|
|
}
|
|
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
|
|
func (j *LdapSyncJob) buildClient(ib *model.Inbound, email string, defGB, defExpiryDays, defLimitIP int) model.Client {
|
|
c := model.Client{
|
|
Email: email,
|
|
Enable: true,
|
|
LimitIP: defLimitIP,
|
|
TotalGB: int64(defGB),
|
|
}
|
|
if defExpiryDays > 0 {
|
|
c.ExpiryTime = time.Now().Add(time.Duration(defExpiryDays) * 24 * time.Hour).UnixMilli()
|
|
}
|
|
switch ib.Protocol {
|
|
case model.Trojan, model.Shadowsocks:
|
|
c.Password = uuid.NewString()
|
|
default:
|
|
c.ID = uuid.NewString()
|
|
}
|
|
return c
|
|
}
|
|
|
|
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.inboundService.SetClientEnableByEmail(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")
|
|
}
|
|
}
|