mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-07-12 15:46:06 +00:00
mrnickson-hue
57300f44bd
* fix(ldap): convert default total GB to bytes when auto-creating clients LdapSyncJob.buildClient stored ldapDefaultTotalGB directly into Client.TotalGB without the GB-to-bytes conversion every other client creation path applies (client form's gbToBytes, tgbot's limitTraffic*1024^3, client_inbound_apply.go's totalGB*1024^3). A "Default total (GB)" of 10 was persisted as 10 bytes, depleting the client almost immediately. Closes #5852 * test(ldap): pin the GB-to-bytes conversion in buildClient Per review feedback on #5854: the existing test only exercised defGB=0, so it wouldn't have caught the missing conversion.
94 lines
2.7 KiB
Go
94 lines
2.7 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 TestBuildClient_ConvertsDefaultTotalGBToBytes(t *testing.T) {
|
|
j := NewLdapSyncJob()
|
|
c := j.buildClient("user@example.com", 10, 0, 0)
|
|
if want := int64(10) * 1024 * 1024 * 1024; c.TotalGB != want {
|
|
t.Errorf("TotalGB = %d, want %d", c.TotalGB, want)
|
|
}
|
|
}
|
|
|
|
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")
|
|
}
|
|
}
|