mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-07-26 22:36:13 +00:00
MHSanaei
52d4af71bc
The sync job built an independent client per configured tag and called CreateOne once per tag. Each call generated a fresh random subId, and the email-uniqueness check in ClientService.Create only re-admits a taken email when the incoming subId matches the stored one - so the first tag succeeded and every other tag failed with "email already in use", leaving new LDAP users on a single inbound. Build the client once per email and hand ClientService.Create the full list of resolved inbound ids, the same path the panel's own client create endpoint uses: one identity (email, subId) attached to all configured tags, with per-protocol credentials filled per inbound. Unknown tags are now skipped with a warning instead of building clients against a nil inbound. Closes #5846
86 lines
2.5 KiB
Go
86 lines
2.5 KiB
Go
package job
|
|
|
|
import (
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/web/service"
|
|
)
|
|
|
|
func initLdapJobDB(t *testing.T) {
|
|
t.Helper()
|
|
dbDir := t.TempDir()
|
|
t.Setenv("XUI_DB_FOLDER", dbDir)
|
|
if err := database.InitDB(filepath.Join(dbDir, "x-ui.db")); err != nil {
|
|
t.Fatalf("InitDB: %v", err)
|
|
}
|
|
t.Cleanup(func() { _ = database.CloseDB() })
|
|
}
|
|
|
|
func TestLdapCreateClients_AttachesToAllConfiguredInbounds(t *testing.T) {
|
|
initLdapJobDB(t)
|
|
db := database.GetDB()
|
|
|
|
tags := []string{"in-1080-tcp", "in-1081-tcp", "in-1082-tcp"}
|
|
protocols := []model.Protocol{model.VLESS, model.Trojan, model.VLESS}
|
|
inboundIds := make([]int, 0, len(tags))
|
|
for i, tag := range tags {
|
|
ib := &model.Inbound{
|
|
UserId: 1,
|
|
Tag: tag,
|
|
Enable: true,
|
|
Port: 42080 + i,
|
|
Protocol: protocols[i],
|
|
Settings: `{"clients": []}`,
|
|
StreamSettings: `{"network":"tcp","security":"none"}`,
|
|
}
|
|
if err := db.Create(ib).Error; err != nil {
|
|
t.Fatalf("create inbound %s: %v", tag, err)
|
|
}
|
|
inboundIds = append(inboundIds, ib.Id)
|
|
}
|
|
|
|
j := NewLdapSyncJob()
|
|
const email = "user@example.com"
|
|
j.createClients([]model.Client{j.buildClient(email, 0, 0, 0)}, inboundIds, tags)
|
|
|
|
rec := &model.ClientRecord{}
|
|
if err := db.Where("email = ?", email).First(rec).Error; err != nil {
|
|
t.Fatalf("client record for %s not created: %v", email, err)
|
|
}
|
|
if rec.SubID == "" {
|
|
t.Error("created LDAP client must carry a subId")
|
|
}
|
|
|
|
clientSvc := &service.ClientService{}
|
|
for i, id := range inboundIds {
|
|
clients, err := clientSvc.ListForInbound(nil, id)
|
|
if err != nil {
|
|
t.Fatalf("ListForInbound(%s): %v", tags[i], err)
|
|
}
|
|
if len(clients) != 1 || clients[0].Email != email {
|
|
t.Fatalf("inbound %s must carry exactly the LDAP client, got %d clients", tags[i], len(clients))
|
|
}
|
|
if clients[0].SubID != rec.SubID {
|
|
t.Errorf("inbound %s client subId = %q, want the shared %q", tags[i], clients[0].SubID, rec.SubID)
|
|
}
|
|
}
|
|
|
|
trojanClients, err := clientSvc.ListForInbound(nil, inboundIds[1])
|
|
if err != nil {
|
|
t.Fatalf("ListForInbound(trojan): %v", err)
|
|
}
|
|
if trojanClients[0].Password == "" {
|
|
t.Error("trojan inbound client must get a generated password")
|
|
}
|
|
vlessClients, err := clientSvc.ListForInbound(nil, inboundIds[0])
|
|
if err != nil {
|
|
t.Fatalf("ListForInbound(vless): %v", err)
|
|
}
|
|
if vlessClients[0].ID == "" {
|
|
t.Error("vless inbound client must get a generated uuid")
|
|
}
|
|
}
|