Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/MHSanaei/3x-ui.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/web
diff options
context:
space:
mode:
authorkonstpic <156318483+konstpic@users.noreply.github.com>2025-09-28 22:00:16 +0300
committermhsanaei <ho3ein.sanaei@gmail.com>2025-09-28 22:04:54 +0300
commit28a17a80ec0c4a0f82e8acfca351651d762b3ec9 (patch)
tree7902b7b4cba04bce816ad17c9490f7228574a096 /web
parent30565833889171afe5c934f97bc0e767534e8310 (diff)
feat: add ldap component (#3568)
* add ldap component * fix: fix russian comments, tls cert verify default true * feat: remove replaces go mod for local dev
Diffstat (limited to 'web')
-rw-r--r--web/assets/js/model/setting.js22
-rw-r--r--web/assets/js/util/index.js24
-rw-r--r--web/entity/entity.go26
-rw-r--r--web/html/settings.html23
-rw-r--r--web/html/settings/panel/general.html130
-rw-r--r--web/job/ldap_sync_job.go393
-rw-r--r--web/service/inbound.go17
-rw-r--r--web/service/setting.go102
-rw-r--r--web/service/user.go37
-rw-r--r--web/web.go12
10 files changed, 763 insertions, 23 deletions
diff --git a/web/assets/js/model/setting.js b/web/assets/js/model/setting.js
index daf03799..53ffae1a 100644
--- a/web/assets/js/model/setting.js
+++ b/web/assets/js/model/setting.js
@@ -50,6 +50,28 @@ class AllSetting {
this.timeLocation = "Local";
+ // LDAP settings
+ this.ldapEnable = false;
+ this.ldapHost = "";
+ this.ldapPort = 389;
+ this.ldapUseTLS = false;
+ this.ldapBindDN = "";
+ this.ldapPassword = "";
+ this.ldapBaseDN = "";
+ this.ldapUserFilter = "(objectClass=person)";
+ this.ldapUserAttr = "mail";
+ this.ldapVlessField = "vless_enabled";
+ this.ldapSyncCron = "@every 1m";
+ this.ldapFlagField = "";
+ this.ldapTruthyValues = "true,1,yes,on";
+ this.ldapInvertFlag = false;
+ this.ldapInboundTags = "";
+ this.ldapAutoCreate = false;
+ this.ldapAutoDelete = false;
+ this.ldapDefaultTotalGB = 0;
+ this.ldapDefaultExpiryDays = 0;
+ this.ldapDefaultLimitIP = 0;
+
if (data == null) {
return
}
diff --git a/web/assets/js/util/index.js b/web/assets/js/util/index.js
index bb47f538..902974f0 100644
--- a/web/assets/js/util/index.js
+++ b/web/assets/js/util/index.js
@@ -316,23 +316,13 @@ class ObjectUtil {
}
static equals(a, b) {
- for (const key in a) {
- if (!a.hasOwnProperty(key)) {
- continue;
- }
- if (!b.hasOwnProperty(key)) {
- return false;
- } else if (a[key] !== b[key]) {
- return false;
- }
- }
- for (const key in b) {
- if (!b.hasOwnProperty(key)) {
- continue;
- }
- if (!a.hasOwnProperty(key)) {
- return false;
- }
+ // shallow, symmetric comparison so newly added fields also affect equality
+ const aKeys = Object.keys(a);
+ const bKeys = Object.keys(b);
+ if (aKeys.length !== bKeys.length) return false;
+ for (const key of aKeys) {
+ if (!Object.prototype.hasOwnProperty.call(b, key)) return false;
+ if (a[key] !== b[key]) return false;
}
return true;
}
diff --git a/web/entity/entity.go b/web/entity/entity.go
index adb60972..de054e2b 100644
--- a/web/entity/entity.go
+++ b/web/entity/entity.go
@@ -74,7 +74,31 @@ type AllSetting struct {
SubJsonFragment string `json:"subJsonFragment" form:"subJsonFragment"` // JSON subscription fragment configuration
SubJsonNoises string `json:"subJsonNoises" form:"subJsonNoises"` // JSON subscription noise configuration
SubJsonMux string `json:"subJsonMux" form:"subJsonMux"` // JSON subscription mux configuration
- SubJsonRules string `json:"subJsonRules" form:"subJsonRules"` // JSON subscription routing rules
+ SubJsonRules string `json:"subJsonRules" form:"subJsonRules"`
+
+ // LDAP settings
+ LdapEnable bool `json:"ldapEnable" form:"ldapEnable"`
+ LdapHost string `json:"ldapHost" form:"ldapHost"`
+ LdapPort int `json:"ldapPort" form:"ldapPort"`
+ LdapUseTLS bool `json:"ldapUseTLS" form:"ldapUseTLS"`
+ LdapBindDN string `json:"ldapBindDN" form:"ldapBindDN"`
+ LdapPassword string `json:"ldapPassword" form:"ldapPassword"`
+ LdapBaseDN string `json:"ldapBaseDN" form:"ldapBaseDN"`
+ LdapUserFilter string `json:"ldapUserFilter" form:"ldapUserFilter"`
+ LdapUserAttr string `json:"ldapUserAttr" form:"ldapUserAttr"` // e.g., mail or uid
+ LdapVlessField string `json:"ldapVlessField" form:"ldapVlessField"`
+ LdapSyncCron string `json:"ldapSyncCron" form:"ldapSyncCron"`
+ // Generic flag configuration
+ LdapFlagField string `json:"ldapFlagField" form:"ldapFlagField"`
+ LdapTruthyValues string `json:"ldapTruthyValues" form:"ldapTruthyValues"`
+ LdapInvertFlag bool `json:"ldapInvertFlag" form:"ldapInvertFlag"`
+ LdapInboundTags string `json:"ldapInboundTags" form:"ldapInboundTags"`
+ LdapAutoCreate bool `json:"ldapAutoCreate" form:"ldapAutoCreate"`
+ LdapAutoDelete bool `json:"ldapAutoDelete" form:"ldapAutoDelete"`
+ LdapDefaultTotalGB int `json:"ldapDefaultTotalGB" form:"ldapDefaultTotalGB"`
+ LdapDefaultExpiryDays int `json:"ldapDefaultExpiryDays" form:"ldapDefaultExpiryDays"`
+ LdapDefaultLimitIP int `json:"ldapDefaultLimitIP" form:"ldapDefaultLimitIP"`
+ // JSON subscription routing rules
}
// CheckValid validates all settings in the AllSetting struct, checking IP addresses, ports, SSL certificates, and other configuration values.
diff --git a/web/html/settings.html b/web/html/settings.html
index 22ad3907..26b936fa 100644
--- a/web/html/settings.html
+++ b/web/html/settings.html
@@ -119,6 +119,7 @@
saveBtnDisable: true,
user: {},
lang: LanguageManager.getLanguage(),
+ inboundOptions: [],
remarkModels: { i: 'Inbound', e: 'Email', o: 'Other' },
remarkSeparators: [' ', '-', '_', '@', ':', '~', '|', ',', '.', '/'],
datepickerList: [{ name: 'Gregorian (Standard)', value: 'gregorian' }, { name: 'Jalalian (شمسی)', value: 'jalalian' }],
@@ -242,6 +243,17 @@
this.saveBtnDisable = true;
}
},
+ async loadInboundTags() {
+ const msg = await HttpUtil.get("/panel/api/inbounds/list");
+ if (msg && msg.success && Array.isArray(msg.obj)) {
+ this.inboundOptions = msg.obj.map(ib => ({
+ label: `${ib.tag} (${ib.protocol}@${ib.port})`,
+ value: ib.tag,
+ }));
+ } else {
+ this.inboundOptions = [];
+ }
+ },
async updateAllSetting() {
this.loading(true);
const msg = await HttpUtil.post("/panel/setting/update", this.allSetting);
@@ -368,6 +380,15 @@
},
},
computed: {
+ ldapInboundTagList: {
+ get: function() {
+ const csv = this.allSetting.ldapInboundTags || "";
+ return csv.length ? csv.split(',').map(s => s.trim()).filter(Boolean) : [];
+ },
+ set: function(list) {
+ this.allSetting.ldapInboundTags = Array.isArray(list) ? list.join(',') : '';
+ }
+ },
fragment: {
get: function () { return this.allSetting?.subJsonFragment != ""; },
set: function (v) {
@@ -534,7 +555,7 @@
},
async mounted() {
await this.getAllSetting();
-
+ await this.loadInboundTags();
while (true) {
await PromiseUtil.sleep(1000);
this.saveBtnDisable = this.oldAllSetting.equals(this.allSetting);
diff --git a/web/html/settings/panel/general.html b/web/html/settings/panel/general.html
index 64fd050c..6969a1b4 100644
--- a/web/html/settings/panel/general.html
+++ b/web/html/settings/panel/general.html
@@ -146,5 +146,135 @@
</template>
</a-setting-list-item>
</a-collapse-panel>
+ <a-collapse-panel key="6" header='LDAP'>
+ <a-setting-list-item paddings="small">
+ <template #title>Enable LDAP sync</template>
+ <template #control>
+ <a-switch v-model="allSetting.ldapEnable"></a-switch>
+ </template>
+ </a-setting-list-item>
+ <a-setting-list-item paddings="small">
+ <template #title>LDAP Host</template>
+ <template #control>
+ <a-input type="text" v-model="allSetting.ldapHost"></a-input>
+ </template>
+ </a-setting-list-item>
+ <a-setting-list-item paddings="small">
+ <template #title>LDAP Port</template>
+ <template #control>
+ <a-input-number :min="1" :max="65535" v-model="allSetting.ldapPort" :style="{ width: '100%' }"></a-input-number>
+ </template>
+ </a-setting-list-item>
+ <a-setting-list-item paddings="small">
+ <template #title>Use TLS (LDAPS)</template>
+ <template #control>
+ <a-switch v-model="allSetting.ldapUseTLS"></a-switch>
+ </template>
+ </a-setting-list-item>
+ <a-setting-list-item paddings="small">
+ <template #title>Bind DN</template>
+ <template #control>
+ <a-input type="text" v-model="allSetting.ldapBindDN"></a-input>
+ </template>
+ </a-setting-list-item>
+ <a-setting-list-item paddings="small">
+ <template #title>Password</template>
+ <template #control>
+ <a-input type="password" v-model="allSetting.ldapPassword"></a-input>
+ </template>
+ </a-setting-list-item>
+ <a-setting-list-item paddings="small">
+ <template #title>Base DN</template>
+ <template #control>
+ <a-input type="text" v-model="allSetting.ldapBaseDN"></a-input>
+ </template>
+ </a-setting-list-item>
+ <a-setting-list-item paddings="small">
+ <template #title>User filter</template>
+ <template #control>
+ <a-input type="text" v-model="allSetting.ldapUserFilter"></a-input>
+ </template>
+ </a-setting-list-item>
+ <a-setting-list-item paddings="small">
+ <template #title>User attribute (username/email)</template>
+ <template #control>
+ <a-input type="text" v-model="allSetting.ldapUserAttr"></a-input>
+ </template>
+ </a-setting-list-item>
+ <a-setting-list-item paddings="small">
+ <template #title>VLESS flag attribute</template>
+ <template #control>
+ <a-input type="text" v-model="allSetting.ldapVlessField"></a-input>
+ </template>
+ </a-setting-list-item>
+ <a-setting-list-item paddings="small">
+ <template #title>Generic flag attribute (optional)</template>
+ <template #description>If set, overrides VLESS flag; e.g. shadowInactive</template>
+ <template #control>
+ <a-input type="text" v-model="allSetting.ldapFlagField"></a-input>
+ </template>
+ </a-setting-list-item>
+ <a-setting-list-item paddings="small">
+ <template #title>Truthy values</template>
+ <template #description>Comma-separated; default: true,1,yes,on</template>
+ <template #control>
+ <a-input type="text" v-model="allSetting.ldapTruthyValues"></a-input>
+ </template>
+ </a-setting-list-item>
+ <a-setting-list-item paddings="small">
+ <template #title>Invert flag</template>
+ <template #description>Enable when attribute means disabled (e.g., shadowInactive)</template>
+ <template #control>
+ <a-switch v-model="allSetting.ldapInvertFlag"></a-switch>
+ </template>
+ </a-setting-list-item>
+ <a-setting-list-item paddings="small">
+ <template #title>Sync schedule</template>
+ <template #description>cron-like string, e.g. @every 1m</template>
+ <template #control>
+ <a-input type="text" v-model="allSetting.ldapSyncCron"></a-input>
+ </template>
+ </a-setting-list-item>
+ <a-setting-list-item paddings="small">
+ <template #title>Inbound tags</template>
+ <template #description>Select inbounds to manage (auto create/delete)</template>
+ <template #control>
+ <a-select mode="multiple" :dropdown-class-name="themeSwitcher.currentTheme" :style="{ width: '100%' }" v-model="ldapInboundTagList">
+ <a-select-option v-for="opt in inboundOptions" :key="opt.value" :value="opt.value">[[ opt.label ]]</a-select-option>
+ </a-select>
+ <div v-if="inboundOptions.length==0" style="margin-top:6px;color:#999">No inbounds found. Please create one in Inbounds.</div>
+ </template>
+ </a-setting-list-item>
+ <a-setting-list-item paddings="small">
+ <template #title>Auto create clients</template>
+ <template #control>
+ <a-switch v-model="allSetting.ldapAutoCreate"></a-switch>
+ </template>
+ </a-setting-list-item>
+ <a-setting-list-item paddings="small">
+ <template #title>Auto delete clients</template>
+ <template #control>
+ <a-switch v-model="allSetting.ldapAutoDelete"></a-switch>
+ </template>
+ </a-setting-list-item>
+ <a-setting-list-item paddings="small">
+ <template #title>Default total (GB)</template>
+ <template #control>
+ <a-input-number :min="0" v-model="allSetting.ldapDefaultTotalGB" :style="{ width: '100%' }"></a-input-number>
+ </template>
+ </a-setting-list-item>
+ <a-setting-list-item paddings="small">
+ <template #title>Default expiry (days)</template>
+ <template #control>
+ <a-input-number :min="0" v-model="allSetting.ldapDefaultExpiryDays" :style="{ width: '100%' }"></a-input-number>
+ </template>
+ </a-setting-list-item>
+ <a-setting-list-item paddings="small">
+ <template #title>Default Limit IP</template>
+ <template #control>
+ <a-input-number :min="0" v-model="allSetting.ldapDefaultLimitIP" :style="{ width: '100%' }"></a-input-number>
+ </template>
+ </a-setting-list-item>
+ </a-collapse-panel>
</a-collapse>
{{end}} \ No newline at end of file
diff --git a/web/job/ldap_sync_job.go b/web/job/ldap_sync_job.go
new file mode 100644
index 00000000..326123a6
--- /dev/null
+++ b/web/job/ldap_sync_job.go
@@ -0,0 +1,393 @@
+package job
+
+import (
+ "time"
+
+ "github.com/mhsanaei/3x-ui/v2/database/model"
+ "github.com/mhsanaei/3x-ui/v2/logger"
+ ldaputil "github.com/mhsanaei/3x-ui/v2/util/ldap"
+ "github.com/mhsanaei/3x-ui/v2/web/service"
+ "strings"
+
+ "github.com/google/uuid"
+ "strconv"
+)
+
+var DefaultTruthyValues = []string{"true", "1", "yes", "on"}
+
+type LdapSyncJob struct {
+ settingService service.SettingService
+ inboundService service.InboundService
+ 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)
+ }
+ }
+ }
+ }
+
+ // --- Execute batch create ---
+ for tag, newClients := range clientsToCreate {
+ if len(newClients) == 0 {
+ continue
+ }
+ payload := &model.Inbound{Id: inboundMap[tag].Id}
+ payload.Settings = j.clientsToJSON(newClients)
+ if _, err := j.inboundService.AddInboundClient(payload); err != nil {
+ logger.Warningf("Failed to add clients for tag %s: %v", tag, err)
+ } else {
+ logger.Infof("LDAP auto-create: %d clients for %s", len(newClients), tag)
+ 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
+}
+
+// batchSetEnable enables/disables clients in batch through a single call
+func (j *LdapSyncJob) batchSetEnable(ib *model.Inbound, emails []string, enable bool) {
+ if len(emails) == 0 {
+ return
+ }
+
+ // Подготовка JSON для массового обновления
+ clients := make([]model.Client, 0, len(emails))
+ for _, email := range emails {
+ clients = append(clients, model.Client{
+ Email: email,
+ Enable: enable,
+ })
+ }
+
+ payload := &model.Inbound{
+ Id: ib.Id,
+ Settings: j.clientsToJSON(clients),
+ }
+
+ // Use a single AddInboundClient call to update enable
+ if _, err := j.inboundService.AddInboundClient(payload); err != nil {
+ logger.Warningf("Batch set enable failed for inbound %s: %v", ib.Tag, err)
+ return
+ }
+
+ logger.Infof("Batch set enable=%v for %d clients in inbound %s", enable, len(emails), ib.Tag)
+ j.xrayService.SetToNeedRestart()
+}
+
+// deleteClientsNotInLDAP performs batch deletion of clients not in LDAP
+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
+ }
+
+ for _, ib := range inbounds {
+ if ib.Tag != inboundTag {
+ continue
+ }
+ clients, err := j.inboundService.GetClients(ib)
+ if err != nil {
+ continue
+ }
+
+ // Сбор клиентов для удаления
+ toDelete := []model.Client{}
+ for _, c := range clients {
+ if _, ok := ldapEmails[c.Email]; !ok {
+ // Use appropriate field depending on protocol
+ client := model.Client{Email: c.Email, ID: c.ID, Password: c.Password}
+ toDelete = append(toDelete, client)
+ }
+ }
+
+ if len(toDelete) == 0 {
+ continue
+ }
+
+ payload := &model.Inbound{
+ Id: ib.Id,
+ Settings: j.clientsToJSON(toDelete),
+ }
+
+ if _, err := j.inboundService.DelInboundClient(payload.Id, payload.Settings); err != nil {
+ logger.Warningf("Batch delete failed for inbound %s: %v", ib.Tag, err)
+ } else {
+ logger.Infof("Batch deleted %d clients from inbound %s", len(toDelete), ib.Tag)
+ j.xrayService.SetToNeedRestart()
+ }
+ }
+}
+
+// clientsToJSON сериализует массив клиентов в JSON
+func (j *LdapSyncJob) clientsToJSON(clients []model.Client) string {
+ b := strings.Builder{}
+ b.WriteString("{\"clients\":[")
+ for i, c := range clients {
+ if i > 0 { b.WriteString(",") }
+ b.WriteString(j.clientToJSON(c))
+ }
+ b.WriteString("]}")
+ return b.String()
+}
+
+
+// ensureClientExists adds client with defaults to inbound tag if not present
+func (j *LdapSyncJob) ensureClientExists(inboundTag string, email string, defGB int, defExpiryDays int, defLimitIP int) {
+ inbounds, err := j.inboundService.GetAllInbounds()
+ if err != nil {
+ logger.Warning("ensureClientExists: get inbounds failed:", err)
+ return
+ }
+ var target *model.Inbound
+ for _, ib := range inbounds {
+ if ib.Tag == inboundTag {
+ target = ib
+ break
+ }
+ }
+ if target == nil {
+ logger.Debugf("ensureClientExists: inbound tag %s not found", inboundTag)
+ return
+ }
+ // check if email already exists in this inbound
+ clients, err := j.inboundService.GetClients(target)
+ if err == nil {
+ for _, c := range clients {
+ if c.Email == email {
+ return
+ }
+ }
+ }
+
+ // build new client according to protocol
+ newClient := model.Client{
+ Email: email,
+ Enable: true,
+ LimitIP: defLimitIP,
+ TotalGB: int64(defGB),
+ }
+ if defExpiryDays > 0 {
+ newClient.ExpiryTime = time.Now().Add(time.Duration(defExpiryDays) * 24 * time.Hour).UnixMilli()
+ }
+
+ switch target.Protocol {
+ case model.Trojan:
+ newClient.Password = uuid.NewString()
+ case model.Shadowsocks:
+ newClient.Password = uuid.NewString()
+ default: // VMESS/VLESS and others using ID
+ newClient.ID = uuid.NewString()
+ }
+
+ // prepare inbound payload with only the new client
+ payload := &model.Inbound{Id: target.Id}
+ payload.Settings = `{"clients":[` + j.clientToJSON(newClient) + `]}`
+
+ if _, err := j.inboundService.AddInboundClient(payload); err != nil {
+ logger.Warning("ensureClientExists: add client failed:", err)
+ } else {
+ j.xrayService.SetToNeedRestart()
+ logger.Infof("LDAP auto-create: %s in %s", email, inboundTag)
+ }
+}
+
+// clientToJSON serializes minimal client fields to JSON object string without extra deps
+func (j *LdapSyncJob) clientToJSON(c model.Client) string {
+ // construct minimal JSON manually to avoid importing json for simple case
+ b := strings.Builder{}
+ b.WriteString("{")
+ if c.ID != "" {
+ b.WriteString("\"id\":\"")
+ b.WriteString(c.ID)
+ b.WriteString("\",")
+ }
+ if c.Password != "" {
+ b.WriteString("\"password\":\"")
+ b.WriteString(c.Password)
+ b.WriteString("\",")
+ }
+ b.WriteString("\"email\":\"")
+ b.WriteString(c.Email)
+ b.WriteString("\",")
+ b.WriteString("\"enable\":")
+ if c.Enable { b.WriteString("true") } else { b.WriteString("false") }
+ b.WriteString(",")
+ b.WriteString("\"limitIp\":")
+ b.WriteString(strconv.Itoa(c.LimitIP))
+ b.WriteString(",")
+ b.WriteString("\"totalGB\":")
+ b.WriteString(strconv.FormatInt(c.TotalGB, 10))
+ if c.ExpiryTime > 0 {
+ b.WriteString(",\"expiryTime\":")
+ b.WriteString(strconv.FormatInt(c.ExpiryTime, 10))
+ }
+ b.WriteString("}")
+ return b.String()
+}
+
+
diff --git a/web/service/inbound.go b/web/service/inbound.go
index 448e6832..93414801 100644
--- a/web/service/inbound.go
+++ b/web/service/inbound.go
@@ -1569,6 +1569,23 @@ func (s *InboundService) ToggleClientEnableByEmail(clientEmail string) (bool, bo
return !clientOldEnabled, needRestart, nil
}
+
+// SetClientEnableByEmail sets client enable state to desired value; returns (changed, needRestart, error)
+func (s *InboundService) SetClientEnableByEmail(clientEmail string, enable bool) (bool, bool, error) {
+ current, err := s.checkIsEnabledByEmail(clientEmail)
+ if err != nil {
+ return false, false, err
+ }
+ if current == enable {
+ return false, false, nil
+ }
+ newEnabled, needRestart, err := s.ToggleClientEnableByEmail(clientEmail)
+ if err != nil {
+ return false, needRestart, err
+ }
+ return newEnabled == enable, needRestart, nil
+}
+
func (s *InboundService) ResetClientIpLimitByEmail(clientEmail string, count int) (bool, error) {
_, inbound, err := s.GetClientInboundByEmail(clientEmail)
if err != nil {
diff --git a/web/service/setting.go b/web/service/setting.go
index fc6513c5..fa85d58c 100644
--- a/web/service/setting.go
+++ b/web/service/setting.go
@@ -73,6 +73,27 @@ var defaultValueMap = map[string]string{
"warp": "",
"externalTrafficInformEnable": "false",
"externalTrafficInformURI": "",
+ // LDAP defaults
+ "ldapEnable": "false",
+ "ldapHost": "",
+ "ldapPort": "389",
+ "ldapUseTLS": "false",
+ "ldapBindDN": "",
+ "ldapPassword": "",
+ "ldapBaseDN": "",
+ "ldapUserFilter": "(objectClass=person)",
+ "ldapUserAttr": "mail",
+ "ldapVlessField": "vless_enabled",
+ "ldapSyncCron": "@every 1m",
+ "ldapFlagField": "",
+ "ldapTruthyValues": "true,1,yes,on",
+ "ldapInvertFlag": "false",
+ "ldapInboundTags": "",
+ "ldapAutoCreate": "false",
+ "ldapAutoDelete": "false",
+ "ldapDefaultTotalGB": "0",
+ "ldapDefaultExpiryDays": "0",
+ "ldapDefaultLimitIP": "0",
}
// SettingService provides business logic for application settings management.
@@ -542,6 +563,87 @@ func (s *SettingService) GetIpLimitEnable() (bool, error) {
return (accessLogPath != "none" && accessLogPath != ""), nil
}
+// LDAP exported getters
+func (s *SettingService) GetLdapEnable() (bool, error) {
+ return s.getBool("ldapEnable")
+}
+
+func (s *SettingService) GetLdapHost() (string, error) {
+ return s.getString("ldapHost")
+}
+
+func (s *SettingService) GetLdapPort() (int, error) {
+ return s.getInt("ldapPort")
+}
+
+func (s *SettingService) GetLdapUseTLS() (bool, error) {
+ return s.getBool("ldapUseTLS")
+}
+
+func (s *SettingService) GetLdapBindDN() (string, error) {
+ return s.getString("ldapBindDN")
+}
+
+func (s *SettingService) GetLdapPassword() (string, error) {
+ return s.getString("ldapPassword")
+}
+
+func (s *SettingService) GetLdapBaseDN() (string, error) {
+ return s.getString("ldapBaseDN")
+}
+
+func (s *SettingService) GetLdapUserFilter() (string, error) {
+ return s.getString("ldapUserFilter")
+}
+
+func (s *SettingService) GetLdapUserAttr() (string, error) {
+ return s.getString("ldapUserAttr")
+}
+
+func (s *SettingService) GetLdapVlessField() (string, error) {
+ return s.getString("ldapVlessField")
+}
+
+func (s *SettingService) GetLdapSyncCron() (string, error) {
+ return s.getString("ldapSyncCron")
+}
+
+func (s *SettingService) GetLdapFlagField() (string, error) {
+ return s.getString("ldapFlagField")
+}
+
+func (s *SettingService) GetLdapTruthyValues() (string, error) {
+ return s.getString("ldapTruthyValues")
+}
+
+func (s *SettingService) GetLdapInvertFlag() (bool, error) {
+ return s.getBool("ldapInvertFlag")
+}
+
+func (s *SettingService) GetLdapInboundTags() (string, error) {
+ return s.getString("ldapInboundTags")
+}
+
+func (s *SettingService) GetLdapAutoCreate() (bool, error) {
+ return s.getBool("ldapAutoCreate")
+}
+
+func (s *SettingService) GetLdapAutoDelete() (bool, error) {
+ return s.getBool("ldapAutoDelete")
+}
+
+func (s *SettingService) GetLdapDefaultTotalGB() (int, error) {
+ return s.getInt("ldapDefaultTotalGB")
+}
+
+func (s *SettingService) GetLdapDefaultExpiryDays() (int, error) {
+ return s.getInt("ldapDefaultExpiryDays")
+}
+
+func (s *SettingService) GetLdapDefaultLimitIP() (int, error) {
+ return s.getInt("ldapDefaultLimitIP")
+}
+
func (s *SettingService) UpdateAllSetting(allSetting *entity.AllSetting) error {
if err := allSetting.CheckValid(); err != nil {
return err
diff --git a/web/service/user.go b/web/service/user.go
index f42c3cf8..87c46bf2 100644
--- a/web/service/user.go
+++ b/web/service/user.go
@@ -7,7 +7,7 @@ import (
"github.com/mhsanaei/3x-ui/v2/database/model"
"github.com/mhsanaei/3x-ui/v2/logger"
"github.com/mhsanaei/3x-ui/v2/util/crypto"
-
+ ldaputil "github.com/mhsanaei/3x-ui/v2/util/ldap"
"github.com/xlzd/gotp"
"gorm.io/gorm"
)
@@ -49,9 +49,38 @@ func (s *UserService) CheckUser(username string, password string, twoFactorCode
return nil
}
- if !crypto.CheckPasswordHash(user.Password, password) {
- return nil
- }