From e97315847273d3fc1d0571daf72b9aa82787aa52 Mon Sep 17 00:00:00 2001
From: Feng Yue <2525275@gmail.com>
Date: Tue, 2 Sep 2025 16:16:43 +0800
Subject: [PATCH 01/15] show owner's name in apikey management page

---
 src/routes/admin.js                     | 25 +++++++++++++++++++++++++
 web/admin-spa/src/views/ApiKeysView.vue | 10 ++++++++++
 2 files changed, 35 insertions(+)

diff --git a/src/routes/admin.js b/src/routes/admin.js
index 9eac7135..36adfa73 100644
--- a/src/routes/admin.js
+++ b/src/routes/admin.js
@@ -63,6 +63,9 @@ router.get('/api-keys', authenticateAdmin, async (req, res) => {
     const { timeRange = 'all' } = req.query // all, 7days, monthly
     const apiKeys = await apiKeyService.getAllApiKeys()
 
+    // 获取用户服务来补充owner信息
+    const userService = require('../services/userService')
+
     // 根据时间范围计算查询模式
     const now = new Date()
     const searchPatterns = []
@@ -313,6 +316,28 @@ router.get('/api-keys', authenticateAdmin, async (req, res) => {
       }
     }
 
+    // 为每个API Key添加owner的displayName
+    for (const apiKey of apiKeys) {
+      // 如果API Key有关联的用户ID，获取用户信息
+      if (apiKey.userId) {
+        try {
+          const user = await userService.getUserById(apiKey.userId, false)
+          if (user) {
+            apiKey.ownerDisplayName = user.displayName || user.username || 'Unknown User'
+          } else {
+            apiKey.ownerDisplayName = 'Unknown User'
+          }
+        } catch (error) {
+          logger.debug(`无法获取用户 ${apiKey.userId} 的信息:`, error)
+          apiKey.ownerDisplayName = 'Unknown User'
+        }
+      } else {
+        // 如果没有userId，使用createdBy字段或默认为Admin
+        apiKey.ownerDisplayName =
+          apiKey.createdBy === 'admin' ? 'Admin' : apiKey.createdBy || 'Admin'
+      }
+    }
+
     return res.json({ success: true, data: apiKeys })
   } catch (error) {
     logger.error('❌ Failed to get API keys:', error)
diff --git a/web/admin-spa/src/views/ApiKeysView.vue b/web/admin-spa/src/views/ApiKeysView.vue
index 54a5b350..1499026c 100644
--- a/web/admin-spa/src/views/ApiKeysView.vue
+++ b/web/admin-spa/src/views/ApiKeysView.vue
@@ -402,6 +402,11 @@
                               使用共享池
                             </div>
                           </div>
+                          <!-- 显示所有者信息 -->
+                          <div v-if="key.ownerDisplayName" class="mt-1 text-xs text-red-600">
+                            <i class="fas fa-user mr-1" />
+                            {{ key.ownerDisplayName }}
+                          </div>
                         </div>
                       </div>
                     </td>
@@ -1023,6 +1028,11 @@
                   <i class="fas fa-share-alt mr-1" />
                   使用共享池
                 </div>
+                <!-- 显示所有者信息 -->
+                <div v-if="key.ownerDisplayName" class="text-xs text-red-600">
+                  <i class="fas fa-user mr-1" />
+                  {{ key.ownerDisplayName }}
+                </div>
               </div>
 
               <!-- 统计信息 -->

From 7a9e4abdd574ae0a123990385053b54113a5aab1 Mon Sep 17 00:00:00 2001
From: Feng Yue <2525275@gmail.com>
Date: Tue, 2 Sep 2025 17:17:06 +0800
Subject: [PATCH 02/15] admin now is able to reassign apikey to admin/user

---
 src/routes/admin.js                           | 86 ++++++++++++++++++-
 .../components/apikeys/EditApiKeyModal.vue    | 63 +++++++++++++-
 2 files changed, 144 insertions(+), 5 deletions(-)

diff --git a/src/routes/admin.js b/src/routes/admin.js
index 36adfa73..954d2f98 100644
--- a/src/routes/admin.js
+++ b/src/routes/admin.js
@@ -24,6 +24,50 @@ const ProxyHelper = require('../utils/proxyHelper')
 
 const router = express.Router()
 
+// 👥 用户管理
+
+// 获取所有用户列表（用于API Key分配）
+router.get('/users', authenticateAdmin, async (req, res) => {
+  try {
+    const userService = require('../services/userService')
+    const allUsers = await userService.getAllUsers()
+
+    // 只返回活跃用户，并包含管理员选项
+    const activeUsers = allUsers
+      .filter((user) => user.isActive)
+      .map((user) => ({
+        id: user.id,
+        username: user.username,
+        displayName: user.displayName || user.username,
+        email: user.email,
+        role: user.role
+      }))
+
+    // 添加Admin选项作为第一个
+    const usersWithAdmin = [
+      {
+        id: 'admin',
+        username: 'admin',
+        displayName: 'Admin',
+        email: '',
+        role: 'admin'
+      },
+      ...activeUsers
+    ]
+
+    return res.json({
+      success: true,
+      data: usersWithAdmin
+    })
+  } catch (error) {
+    logger.error('❌ Failed to get users list:', error)
+    return res.status(500).json({
+      error: 'Failed to get users list',
+      message: error.message
+    })
+  }
+})
+
 // 🔑 API Keys 管理
 
 // 调试：获取API Key费用详情
@@ -844,7 +888,8 @@ router.put('/api-keys/:keyId', authenticateAdmin, async (req, res) => {
       expiresAt,
       dailyCostLimit,
       weeklyOpusCostLimit,
-      tags
+      tags,
+      ownerId // 新增：所有者ID字段
     } = req.body
 
     // 只允许更新指定字段
@@ -1014,6 +1059,45 @@ router.put('/api-keys/:keyId', authenticateAdmin, async (req, res) => {
       updates.isActive = isActive
     }
 
+    // 处理所有者变更
+    if (ownerId !== undefined) {
+      const userService = require('../services/userService')
+
+      if (ownerId === 'admin') {
+        // 分配给Admin
+        updates.userId = ''
+        updates.userUsername = ''
+        updates.createdBy = 'admin'
+      } else if (ownerId) {
+        // 分配给用户
+        try {
+          const user = await userService.getUserById(ownerId, false)
+          if (!user) {
+            return res.status(400).json({ error: 'Invalid owner: User not found' })
+          }
+          if (!user.isActive) {
+            return res.status(400).json({ error: 'Cannot assign to inactive user' })
+          }
+
+          // 设置新的所有者信息
+          updates.userId = ownerId
+          updates.userUsername = user.username
+          updates.createdBy = user.username
+
+          // 管理员重新分配时，不检查用户的API Key数量限制
+          logger.info(`🔄 Admin reassigning API key ${keyId} to user ${user.username}`)
+        } catch (error) {
+          logger.error('Error fetching user for owner reassignment:', error)
+          return res.status(400).json({ error: 'Invalid owner ID' })
+        }
+      } else {
+        // 清空所有者（分配给Admin）
+        updates.userId = ''
+        updates.userUsername = ''
+        updates.createdBy = 'admin'
+      }
+    }
+
     await apiKeyService.updateApiKey(keyId, updates)
 
     logger.success(`📝 Admin updated API key: ${keyId}`)
diff --git a/web/admin-spa/src/components/apikeys/EditApiKeyModal.vue b/web/admin-spa/src/components/apikeys/EditApiKeyModal.vue
index f74b25f8..82e27447 100644
--- a/web/admin-spa/src/components/apikeys/EditApiKeyModal.vue
+++ b/web/admin-spa/src/components/apikeys/EditApiKeyModal.vue
@@ -41,6 +41,26 @@
             <p class="mt-1 text-xs text-gray-500 dark:text-gray-400 sm:mt-2">名称不可修改</p>
           </div>
 
+          <!-- 所有者选择 -->
+          <div>
+            <label
+              class="mb-1.5 block text-xs font-semibold text-gray-700 dark:text-gray-300 sm:mb-3 sm:text-sm"
+              >所有者</label
+            >
+            <select
+              v-model="form.ownerId"
+              class="form-input w-full dark:border-gray-600 dark:bg-gray-700 dark:text-gray-200"
+            >
+              <option v-for="user in availableUsers" :key="user.id" :value="user.id">
+                {{ user.displayName }} ({{ user.username }})
+                <span v-if="user.role === 'admin'" class="text-gray-500">- 管理员</span>
+              </option>
+            </select>
+            <p class="mt-1 text-xs text-gray-500 dark:text-gray-400 sm:mt-2">
+              分配此 API Key 给指定用户或管理员，管理员分配时不受用户 API Key 数量限制
+            </p>
+          </div>
+
           <!-- 标签 -->
           <div>
             <label
@@ -666,6 +686,9 @@ const localAccounts = ref({
 // 支持的客户端列表
 const supportedClients = ref([])
 
+// 可用用户列表
+const availableUsers = ref([])
+
 // 标签相关
 const newTag = ref('')
 const availableTags = ref([])
@@ -696,7 +719,8 @@ const form = reactive({
   enableClientRestriction: false,
   allowedClients: [],
   tags: [],
-  isActive: true
+  isActive: true,
+  ownerId: '' // 新增：所有者ID
 })
 
 // 添加限制的模型
@@ -856,6 +880,11 @@ const updateApiKey = async () => {
     // 活跃状态
     data.isActive = form.isActive
 
+    // 所有者
+    if (form.ownerId !== undefined) {
+      data.ownerId = form.ownerId
+    }
+
     const result = await apiClient.put(`/admin/api-keys/${props.apiKey.id}`, data)
 
     if (result.success) {
@@ -947,11 +976,34 @@ const refreshAccounts = async () => {
   }
 }
 
+// 加载用户列表
+const loadUsers = async () => {
+  try {
+    const response = await apiClient.get('/admin/users')
+    if (response.success) {
+      availableUsers.value = response.data || []
+    }
+  } catch (error) {
+    console.error('Failed to load users:', error)
+    availableUsers.value = [
+      {
+        id: 'admin',
+        username: 'admin',
+        displayName: 'Admin',
+        email: '',
+        role: 'admin'
+      }
+    ]
+  }
+}
+
 // 初始化表单数据
 onMounted(async () => {
-  // 加载支持的客户端和已存在的标签
-  supportedClients.value = await clientsStore.loadSupportedClients()
-  availableTags.value = await apiKeysStore.fetchTags()
+  // 并行加载所有需要的数据
+  await Promise.all([clientsStore.loadSupportedClients(), apiKeysStore.fetchTags(), loadUsers()])
+
+  supportedClients.value = clientsStore.supportedClients
+  availableTags.value = apiKeysStore.availableTags
 
   // 初始化账号数据
   if (props.accounts) {
@@ -1001,6 +1053,9 @@ onMounted(async () => {
   form.enableClientRestriction = props.apiKey.enableClientRestriction || false
   // 初始化活跃状态，默认为 true
   form.isActive = props.apiKey.isActive !== undefined ? props.apiKey.isActive : true
+
+  // 初始化所有者
+  form.ownerId = props.apiKey.userId || 'admin'
 })
 </script>
 

From 5ee98597e7f9fd641fd9c2d509ad921d292f9d5e Mon Sep 17 00:00:00 2001
From: Feng Yue <2525275@gmail.com>
Date: Tue, 2 Sep 2025 18:40:16 +0800
Subject: [PATCH 03/15] fix get userlist issue

---
 src/routes/admin.js                           | 23 ++++++++++---------
 .../components/apikeys/EditApiKeyModal.vue    | 19 +++++++++++----
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/routes/admin.js b/src/routes/admin.js
index 954d2f98..5308b0e8 100644
--- a/src/routes/admin.js
+++ b/src/routes/admin.js
@@ -30,18 +30,19 @@ const router = express.Router()
 router.get('/users', authenticateAdmin, async (req, res) => {
   try {
     const userService = require('../services/userService')
-    const allUsers = await userService.getAllUsers()
+    const result = await userService.getAllUsers({ isActive: true, limit: 1000 }) // Get all active users
 
-    // 只返回活跃用户，并包含管理员选项
-    const activeUsers = allUsers
-      .filter((user) => user.isActive)
-      .map((user) => ({
-        id: user.id,
-        username: user.username,
-        displayName: user.displayName || user.username,
-        email: user.email,
-        role: user.role
-      }))
+    // Extract users array from the paginated result
+    const allUsers = result.users || []
+
+    // Map to the format needed for the dropdown
+    const activeUsers = allUsers.map((user) => ({
+      id: user.id,
+      username: user.username,
+      displayName: user.displayName || user.username,
+      email: user.email,
+      role: user.role
+    }))
 
     // 添加Admin选项作为第一个
     const usersWithAdmin = [
diff --git a/web/admin-spa/src/components/apikeys/EditApiKeyModal.vue b/web/admin-spa/src/components/apikeys/EditApiKeyModal.vue
index 82e27447..1484f41a 100644
--- a/web/admin-spa/src/components/apikeys/EditApiKeyModal.vue
+++ b/web/admin-spa/src/components/apikeys/EditApiKeyModal.vue
@@ -999,11 +999,22 @@ const loadUsers = async () => {
 
 // 初始化表单数据
 onMounted(async () => {
-  // 并行加载所有需要的数据
-  await Promise.all([clientsStore.loadSupportedClients(), apiKeysStore.fetchTags(), loadUsers()])
+  try {
+    // 并行加载所有需要的数据
+    const [clients, tags] = await Promise.all([
+      clientsStore.loadSupportedClients(),
+      apiKeysStore.fetchTags(),
+      loadUsers()
+    ])
 
-  supportedClients.value = clientsStore.supportedClients
-  availableTags.value = apiKeysStore.availableTags
+    supportedClients.value = clients || []
+    availableTags.value = tags || []
+  } catch (error) {
+    console.error('Error loading initial data:', error)
+    // Fallback to empty arrays if loading fails
+    supportedClients.value = []
+    availableTags.value = []
+  }
 
   // 初始化账号数据
   if (props.accounts) {

From 58958cf246a938d6b6763ea2aa954746c44c4402 Mon Sep 17 00:00:00 2001
From: Feng Yue <2525275@gmail.com>
Date: Tue, 2 Sep 2025 18:53:42 +0800
Subject: [PATCH 04/15] fix ownership update issue

---
 src/services/apiKeyService.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/services/apiKeyService.js b/src/services/apiKeyService.js
index 197f8e78..ca33869f 100644
--- a/src/services/apiKeyService.js
+++ b/src/services/apiKeyService.js
@@ -368,7 +368,10 @@ class ApiKeyService {
         'allowedClients',
         'dailyCostLimit',
         'weeklyOpusCostLimit',
-        'tags'
+        'tags',
+        'userId', // 新增：用户ID（所有者变更）
+        'userUsername', // 新增：用户名（所有者变更）
+        'createdBy' // 新增：创建者（所有者变更）
       ]
       const updatedData = { ...keyData }
 

From 4627475b7cb482eb81969019c72af462e7e4fe08 Mon Sep 17 00:00:00 2001
From: Feng Yue <2525275@gmail.com>
Date: Tue, 2 Sep 2025 19:40:45 +0800
Subject: [PATCH 05/15] filter apikeys by either key name or username

---
 web/admin-spa/src/views/ApiKeysView.vue | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/web/admin-spa/src/views/ApiKeysView.vue b/web/admin-spa/src/views/ApiKeysView.vue
index 1499026c..0799f0e0 100644
--- a/web/admin-spa/src/views/ApiKeysView.vue
+++ b/web/admin-spa/src/views/ApiKeysView.vue
@@ -104,7 +104,7 @@
                   <input
                     v-model="searchKeyword"
                     class="w-full rounded-lg border border-gray-200 bg-white px-3 py-2 pl-9 text-sm text-gray-700 placeholder-gray-400 shadow-sm transition-all duration-200 hover:border-gray-300 focus:border-cyan-500 focus:outline-none focus:ring-2 focus:ring-cyan-500/20 dark:border-gray-600 dark:bg-gray-800 dark:text-gray-200 dark:placeholder-gray-500 dark:hover:border-gray-500"
-                    placeholder="搜索名称..."
+                    placeholder="搜索名称或所有者..."
                     type="text"
                     @input="currentPage = 1"
                   />
@@ -1611,12 +1611,18 @@ const sortedApiKeys = computed(() => {
     )
   }
 
-  // 然后进行名称搜索
+  // 然后进行名称搜索（搜索API Key名称和所有者名称）
   if (searchKeyword.value) {
     const keyword = searchKeyword.value.toLowerCase().trim()
-    filteredKeys = filteredKeys.filter(
-      (key) => key.name && key.name.toLowerCase().includes(keyword)
-    )
+    filteredKeys = filteredKeys.filter((key) => {
+      // 搜索API Key名称
+      const nameMatch = key.name && key.name.toLowerCase().includes(keyword)
+      // 搜索所有者名称
+      const ownerMatch =
+        key.ownerDisplayName && key.ownerDisplayName.toLowerCase().includes(keyword)
+      // 如果API Key名称或所有者名称匹配，则包含该条目
+      return nameMatch || ownerMatch
+    })
   }
 
   // 如果没有排序字段，返回筛选后的结果

From d56da4d799e5f1b77afe500f3f8c3bbad84923c1 Mon Sep 17 00:00:00 2001
From: Feng Yue <2525275@gmail.com>
Date: Tue, 2 Sep 2025 20:32:28 +0800
Subject: [PATCH 06/15] transfer existing api keys to users on the first login

---
 src/services/userService.js | 73 +++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/src/services/userService.js b/src/services/userService.js
index 601d6419..80649283 100644
--- a/src/services/userService.js
+++ b/src/services/userService.js
@@ -75,6 +75,11 @@ class UserService {
       await redis.set(`${this.userPrefix}${user.id}`, JSON.stringify(user))
       await redis.set(`${this.usernamePrefix}${username}`, user.id)
 
+      // 如果是新用户，尝试转移匹配的API Keys
+      if (isNewUser) {
+        await this.transferMatchingApiKeys(user)
+      }
+
       logger.info(`📝 ${isNewUser ? 'Created' : 'Updated'} user: ${username} (${user.id})`)
       return user
     } catch (error) {
@@ -509,6 +514,74 @@ class UserService {
       throw error
     }
   }
+
+  // 🔄 转移匹配的API Keys给新用户
+  async transferMatchingApiKeys(user) {
+    try {
+      const apiKeyService = require('./apiKeyService')
+      const { displayName, username, email } = user
+
+      // 获取所有API Keys
+      const allApiKeys = await apiKeyService.getAllApiKeys()
+
+      // 找到没有用户ID的API Keys（即由Admin创建的）
+      const unownedApiKeys = allApiKeys.filter((key) => !key.userId || key.userId === '')
+
+      if (unownedApiKeys.length === 0) {
+        logger.debug(`📝 No unowned API keys found for potential transfer to user: ${username}`)
+        return
+      }
+
+      // 构建匹配字符串数组（只考虑displayName、username、email，去除空值和重复值）
+      const matchStrings = new Set()
+      if (displayName) matchStrings.add(displayName.toLowerCase().trim())
+      if (username) matchStrings.add(username.toLowerCase().trim())
+      if (email) matchStrings.add(email.toLowerCase().trim())
+
+      const matchingKeys = []
+
+      // 查找名称匹配的API Keys（只进行完全匹配）
+      for (const apiKey of unownedApiKeys) {
+        const keyName = apiKey.name ? apiKey.name.toLowerCase().trim() : ''
+
+        // 检查API Key名称是否与用户信息完全匹配
+        for (const matchString of matchStrings) {
+          if (keyName === matchString) {
+            matchingKeys.push(apiKey)
+            break // 找到匹配后跳出内层循环
+          }
+        }
+      }
+
+      // 转移匹配的API Keys
+      let transferredCount = 0
+      for (const apiKey of matchingKeys) {
+        try {
+          await apiKeyService.updateApiKey(apiKey.id, {
+            userId: user.id,
+            userUsername: user.username,
+            createdBy: user.username
+          })
+
+          transferredCount++
+          logger.info(`🔄 Transferred API key "${apiKey.name}" (${apiKey.id}) to user: ${username}`)
+        } catch (error) {
+          logger.error(`❌ Failed to transfer API key ${apiKey.id} to user ${username}:`, error)
+        }
+      }
+
+      if (transferredCount > 0) {
+        logger.success(
+          `🎉 Successfully transferred ${transferredCount} API key(s) to new user: ${username} (${displayName})`
+        )
+      } else if (matchingKeys.length === 0) {
+        logger.debug(`📝 No matching API keys found for user: ${username} (${displayName})`)
+      }
+    } catch (error) {
+      logger.error('❌ Error transferring matching API keys:', error)
+      // Don't throw error to prevent blocking user creation
+    }
+  }
 }
 
 module.exports = new UserService()

From 3860f7d9b349505a252987e15244a2168f77ddca Mon Sep 17 00:00:00 2001
From: Feng Yue <2525275@gmail.com>
Date: Tue, 2 Sep 2025 21:42:48 +0800
Subject: [PATCH 07/15] update default limit of apikey number per user to one
 and disallow key deletion by default

---
 .env.example                                         |  3 ++-
 config/config.example.js                             |  3 ++-
 src/routes/userRoutes.js                             | 12 +++++++++++-
 src/services/userService.js                          | 12 +++++++++---
 .../src/components/user/UserApiKeysManager.vue       |  7 ++++++-
 5 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/.env.example b/.env.example
index b69ee64e..62f7fcfb 100644
--- a/.env.example
+++ b/.env.example
@@ -96,4 +96,5 @@ LDAP_USER_ATTR_LAST_NAME=sn
 USER_MANAGEMENT_ENABLED=false
 DEFAULT_USER_ROLE=user
 USER_SESSION_TIMEOUT=86400000
-MAX_API_KEYS_PER_USER=5
+MAX_API_KEYS_PER_USER=1
+ALLOW_USER_DELETE_API_KEYS=false
diff --git a/config/config.example.js b/config/config.example.js
index 5b8786b6..433ecd1f 100644
--- a/config/config.example.js
+++ b/config/config.example.js
@@ -175,7 +175,8 @@ const config = {
     enabled: process.env.USER_MANAGEMENT_ENABLED === 'true',
     defaultUserRole: process.env.DEFAULT_USER_ROLE || 'user',
     userSessionTimeout: parseInt(process.env.USER_SESSION_TIMEOUT) || 86400000, // 24小时
-    maxApiKeysPerUser: parseInt(process.env.MAX_API_KEYS_PER_USER) || 5
+    maxApiKeysPerUser: parseInt(process.env.MAX_API_KEYS_PER_USER) || 1,
+    allowUserDeleteApiKeys: process.env.ALLOW_USER_DELETE_API_KEYS === 'true' // 默认不允许用户删除自己的API Keys
   },
 
   // 📢 Webhook通知配置
diff --git a/src/routes/userRoutes.js b/src/routes/userRoutes.js
index 653e3c9e..f4f995c1 100644
--- a/src/routes/userRoutes.js
+++ b/src/routes/userRoutes.js
@@ -208,7 +208,8 @@ router.get('/profile', authenticateUser, async (req, res) => {
         totalUsage: user.totalUsage
       },
       config: {
-        maxApiKeysPerUser: config.userManagement.maxApiKeysPerUser
+        maxApiKeysPerUser: config.userManagement.maxApiKeysPerUser,
+        allowUserDeleteApiKeys: config.userManagement.allowUserDeleteApiKeys
       }
     })
   } catch (error) {
@@ -352,6 +353,15 @@ router.delete('/api-keys/:keyId', authenticateUser, async (req, res) => {
   try {
     const { keyId } = req.params
 
+    // 检查是否允许用户删除自己的API Keys
+    if (!config.userManagement.allowUserDeleteApiKeys) {
+      return res.status(403).json({
+        error: 'Operation not allowed',
+        message:
+          'Users are not allowed to delete their own API keys. Please contact an administrator.'
+      })
+    }
+
     // 检查API Key是否属于当前用户
     const existingKey = await apiKeyService.getApiKeyById(keyId)
     if (!existingKey || existingKey.userId !== req.user.id) {
diff --git a/src/services/userService.js b/src/services/userService.js
index 80649283..00f0665f 100644
--- a/src/services/userService.js
+++ b/src/services/userService.js
@@ -534,9 +534,15 @@ class UserService {
 
       // 构建匹配字符串数组（只考虑displayName、username、email，去除空值和重复值）
       const matchStrings = new Set()
-      if (displayName) matchStrings.add(displayName.toLowerCase().trim())
-      if (username) matchStrings.add(username.toLowerCase().trim())
-      if (email) matchStrings.add(email.toLowerCase().trim())
+      if (displayName) {
+        matchStrings.add(displayName.toLowerCase().trim())
+      }
+      if (username) {
+        matchStrings.add(username.toLowerCase().trim())
+      }
+      if (email) {
+        matchStrings.add(email.toLowerCase().trim())
+      }
 
       const matchingKeys = []
 
diff --git a/web/admin-spa/src/components/user/UserApiKeysManager.vue b/web/admin-spa/src/components/user/UserApiKeysManager.vue
index 8100cd88..aab75a5f 100644
--- a/web/admin-spa/src/components/user/UserApiKeysManager.vue
+++ b/web/admin-spa/src/components/user/UserApiKeysManager.vue
@@ -159,7 +159,11 @@
                 </button>
 
                 <button
-                  v-if="!(apiKey.isDeleted === 'true' || apiKey.deletedAt) && apiKey.isActive"
+                  v-if="
+                    !(apiKey.isDeleted === 'true' || apiKey.deletedAt) &&
+                    apiKey.isActive &&
+                    allowUserDeleteApiKeys
+                  "
                   class="inline-flex items-center rounded border border-transparent p-1 text-red-400 hover:text-red-600"
                   title="Delete API Key"
                   @click="deleteApiKey(apiKey)"
@@ -255,6 +259,7 @@ const userStore = useUserStore()
 const loading = ref(true)
 const apiKeys = ref([])
 const maxApiKeys = computed(() => userStore.config?.maxApiKeysPerUser || 5)
+const allowUserDeleteApiKeys = computed(() => userStore.config?.allowUserDeleteApiKeys !== false)
 
 const showCreateModal = ref(false)
 const showViewModal = ref(false)

From b0990e7169fc87f18703ebcd828f569ab7546547 Mon Sep 17 00:00:00 2001
From: Feng Yue <2525275@gmail.com>
Date: Tue, 2 Sep 2025 22:26:32 +0800
Subject: [PATCH 08/15] fix: respect user delete api key config

---
 web/admin-spa/src/components/user/UserApiKeysManager.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/admin-spa/src/components/user/UserApiKeysManager.vue b/web/admin-spa/src/components/user/UserApiKeysManager.vue
index aab75a5f..092aa73c 100644
--- a/web/admin-spa/src/components/user/UserApiKeysManager.vue
+++ b/web/admin-spa/src/components/user/UserApiKeysManager.vue
@@ -259,7 +259,7 @@ const userStore = useUserStore()
 const loading = ref(true)
 const apiKeys = ref([])
 const maxApiKeys = computed(() => userStore.config?.maxApiKeysPerUser || 5)
-const allowUserDeleteApiKeys = computed(() => userStore.config?.allowUserDeleteApiKeys !== false)
+const allowUserDeleteApiKeys = computed(() => userStore.config?.allowUserDeleteApiKeys === true)
 
 const showCreateModal = ref(false)
 const showViewModal = ref(false)

From a1005e91c830b913a7ae10b35b1ba34bae1605a7 Mon Sep 17 00:00:00 2001
From: Feng Yue <2525275@gmail.com>
Date: Wed, 3 Sep 2025 13:30:13 +0800
Subject: [PATCH 09/15] add support of Windows AD Server

---
 .env.example                |  20 ++-
 config/config.example.js    |  11 +-
 src/services/ldapService.js | 343 ++++++++++++++++++++++++++++++++----
 3 files changed, 332 insertions(+), 42 deletions(-)

diff --git a/.env.example b/.env.example
index 62f7fcfb..b4866560 100644
--- a/.env.example
+++ b/.env.example
@@ -64,11 +64,16 @@ TRUST_PROXY=true
 
 # 🔐 LDAP 认证配置
 LDAP_ENABLED=false
+# 服务器类型：openldap 或 activedirectory
+LDAP_SERVER_TYPE=openldap
+# LDAP 服务器配置
 LDAP_URL=ldaps://ldap-1.test1.bj.yxops.net:636
 LDAP_BIND_DN=cn=admin,dc=example,dc=com
 LDAP_BIND_PASSWORD=admin_password
 LDAP_SEARCH_BASE=dc=example,dc=com
+# 搜索过滤器 (OpenLDAP 使用 uid，AD 会自动使用 sAMAccountName/userPrincipalName)
 LDAP_SEARCH_FILTER=(uid={{username}})
+# 搜索属性 (根据服务器类型自动设置，也可手动指定)
 LDAP_SEARCH_ATTRIBUTES=dn,uid,cn,mail,givenName,sn
 LDAP_TIMEOUT=5000
 LDAP_CONNECT_TIMEOUT=10000
@@ -85,13 +90,26 @@ LDAP_TLS_REJECT_UNAUTHORIZED=true
 # 服务器名称 (可选，用于 SNI)
 # LDAP_TLS_SERVERNAME=ldap.example.com
 
-# 🗺️ LDAP 用户属性映射
+# 🗺️ LDAP 用户属性映射 (根据服务器类型自动设置默认值)
 LDAP_USER_ATTR_USERNAME=uid
 LDAP_USER_ATTR_DISPLAY_NAME=cn
 LDAP_USER_ATTR_EMAIL=mail
 LDAP_USER_ATTR_FIRST_NAME=givenName
 LDAP_USER_ATTR_LAST_NAME=sn
 
+# 🏢 Windows Active Directory 示例配置
+# LDAP_SERVER_TYPE=activedirectory
+# LDAP_URL=ldaps://ad-server.company.com:636
+# # 或使用全局目录端口进行森林范围搜索
+# LDAP_URL=ldap://ad-server.company.com:3268
+# LDAP_BIND_DN=CN=Service Account,CN=Users,DC=company,DC=com
+# LDAP_BIND_PASSWORD=service_account_password
+# LDAP_SEARCH_BASE=DC=company,DC=com
+# # AD 用户属性映射 (可选，会自动使用 AD 默认值)
+# LDAP_USER_ATTR_USERNAME=sAMAccountName
+# LDAP_USER_ATTR_DISPLAY_NAME=displayName
+# LDAP_USER_ATTR_EMAIL=mail
+
 # 👥 用户管理配置
 USER_MANAGEMENT_ENABLED=false
 DEFAULT_USER_ROLE=user
diff --git a/config/config.example.js b/config/config.example.js
index 433ecd1f..88074000 100644
--- a/config/config.example.js
+++ b/config/config.example.js
@@ -130,14 +130,20 @@ const config = {
   // 🔐 LDAP 认证配置
   ldap: {
     enabled: process.env.LDAP_ENABLED === 'true',
+    // 服务器类型：'openldap' 或 'activedirectory'
+    serverType: process.env.LDAP_SERVER_TYPE || 'openldap',
     server: {
       url: process.env.LDAP_URL || 'ldap://localhost:389',
       bindDN: process.env.LDAP_BIND_DN || 'cn=admin,dc=example,dc=com',
       bindCredentials: process.env.LDAP_BIND_PASSWORD || 'admin',
       searchBase: process.env.LDAP_SEARCH_BASE || 'dc=example,dc=com',
+      // 搜索过滤器 - OpenLDAP 默认使用 uid，Windows AD 会自动使用 sAMAccountName/userPrincipalName
       searchFilter: process.env.LDAP_SEARCH_FILTER || '(uid={{username}})',
+      // 搜索属性 - 根据服务器类型自动设置默认值
       searchAttributes: process.env.LDAP_SEARCH_ATTRIBUTES
         ? process.env.LDAP_SEARCH_ATTRIBUTES.split(',')
+        : process.env.LDAP_SERVER_TYPE === 'activedirectory'
+        ? ['dn', 'sAMAccountName', 'userPrincipalName', 'cn', 'displayName', 'mail', 'givenName', 'sn', 'memberOf', 'objectClass', 'userAccountControl']
         : ['dn', 'uid', 'cn', 'mail', 'givenName', 'sn'],
       timeout: parseInt(process.env.LDAP_TIMEOUT) || 5000,
       connectTimeout: parseInt(process.env.LDAP_CONNECT_TIMEOUT) || 10000,
@@ -161,9 +167,10 @@ const config = {
         servername: process.env.LDAP_TLS_SERVERNAME || undefined
       }
     },
+    // 用户属性映射 - 根据服务器类型自动设置默认值
     userMapping: {
-      username: process.env.LDAP_USER_ATTR_USERNAME || 'uid',
-      displayName: process.env.LDAP_USER_ATTR_DISPLAY_NAME || 'cn',
+      username: process.env.LDAP_USER_ATTR_USERNAME || (process.env.LDAP_SERVER_TYPE === 'activedirectory' ? 'sAMAccountName' : 'uid'),
+      displayName: process.env.LDAP_USER_ATTR_DISPLAY_NAME || (process.env.LDAP_SERVER_TYPE === 'activedirectory' ? 'displayName' : 'cn'),
       email: process.env.LDAP_USER_ATTR_EMAIL || 'mail',
       firstName: process.env.LDAP_USER_ATTR_FIRST_NAME || 'givenName',
       lastName: process.env.LDAP_USER_ATTR_LAST_NAME || 'sn'
diff --git a/src/services/ldapService.js b/src/services/ldapService.js
index 75b4e704..1cfb3ba5 100644
--- a/src/services/ldapService.js
+++ b/src/services/ldapService.js
@@ -8,6 +8,10 @@ class LdapService {
     this.config = config.ldap || {}
     this.client = null
 
+    // 设置服务器类型，默认为 OpenLDAP
+    this.serverType = this.config.serverType || 'openldap'
+    this.isActiveDirectory = this.serverType === 'activedirectory'
+
     // 验证配置 - 只有在 LDAP 配置存在且启用时才验证
     if (this.config && this.config.enabled) {
       this.validateConfiguration()
@@ -54,6 +58,93 @@ class LdapService {
     }
   }
 
+  // 🔍 解析Windows AD用户名格式
+  parseActiveDirectoryUsername(username) {
+    if (!this.isActiveDirectory) {
+      return { username, domain: null, format: 'simple' }
+    }
+
+    const trimmedUsername = username.trim()
+
+    // 检查UPN格式 (user@domain.com)
+    if (trimmedUsername.includes('@')) {
+      const parts = trimmedUsername.split('@')
+      if (parts.length === 2 && parts[0] && parts[1]) {
+        return {
+          username: parts[0],
+          domain: parts[1],
+          format: 'upn',
+          fullUsername: trimmedUsername
+        }
+      }
+    }
+
+    // 检查域\用户名格式 (DOMAIN\user)
+    if (trimmedUsername.includes('\\')) {
+      const parts = trimmedUsername.split('\\')
+      if (parts.length === 2 && parts[0] && parts[1]) {
+        return {
+          username: parts[1],
+          domain: parts[0],
+          format: 'domain',
+          fullUsername: trimmedUsername
+        }
+      }
+    }
+
+    // 简单用户名格式
+    return {
+      username: trimmedUsername,
+      domain: null,
+      format: 'simple',
+      fullUsername: trimmedUsername
+    }
+  }
+
+  // 🔍 获取服务器类型特定的搜索过滤器
+  getServerSpecificSearchFilter(usernameInfo) {
+    if (this.isActiveDirectory) {
+      const { username, fullUsername } = usernameInfo
+      // Windows AD: 支持 sAMAccountName 和 userPrincipalName
+      if (fullUsername && fullUsername.includes('@')) {
+        // 如果是UPN格式，优先使用userPrincipalName搜索
+        return `(|(userPrincipalName=${fullUsername})(sAMAccountName=${username}))`
+      } else {
+        // 否则同时搜索两个属性
+        return `(|(sAMAccountName=${username})(userPrincipalName=${username}))`
+      }
+    } else {
+      // OpenLDAP: 使用配置的搜索过滤器或默认的uid
+      const filterTemplate = this.config.server.searchFilter || '(uid={{username}})'
+      return filterTemplate.replace('{{username}}', usernameInfo.username)
+    }
+  }
+
+  // 🔍 获取服务器类型特定的搜索属性
+  getServerSpecificSearchAttributes() {
+    if (this.isActiveDirectory) {
+      // Windows AD 特定属性
+      return (
+        this.config.server.searchAttributes || [
+          'dn',
+          'sAMAccountName',
+          'userPrincipalName',
+          'cn',
+          'displayName',
+          'mail',
+          'givenName',
+          'sn',
+          'memberOf',
+          'objectClass',
+          'userAccountControl'
+        ]
+      )
+    } else {
+      // OpenLDAP 默认属性
+      return this.config.server.searchAttributes || ['dn', 'uid', 'cn', 'mail', 'givenName', 'sn']
+    }
+  }
+
   // 🔍 提取LDAP条目的DN
   extractDN(ldapEntry) {
     if (!ldapEntry) {
@@ -219,9 +310,12 @@ class LdapService {
   // 🔍 搜索用户
   async searchUser(client, username) {
     return new Promise((resolve, reject) => {
+      // 解析用户名（对Windows AD进行特殊处理）
+      const usernameInfo = this.parseActiveDirectoryUsername(username)
+
       // 防止LDAP注入：转义特殊字符
       // 根据RFC 4515，需要转义的特殊字符：* ( ) \ NUL
-      const escapedUsername = username
+      const escapedUsername = usernameInfo.username
         .replace(/\\/g, '\\5c') // 反斜杠必须先转义
         .replace(/\*/g, '\\2a') // 星号
         .replace(/\(/g, '\\28') // 左括号
@@ -229,14 +323,41 @@ class LdapService {
         .replace(/\0/g, '\\00') // NUL字符
         .replace(/\//g, '\\2f') // 斜杠
 
-      const searchFilter = this.config.server.searchFilter.replace('{{username}}', escapedUsername)
+      // 如果是UPN格式，也需要转义完整用户名
+      let escapedFullUsername = usernameInfo.fullUsername
+      if (escapedFullUsername && escapedFullUsername !== usernameInfo.username) {
+        escapedFullUsername = escapedFullUsername
+          .replace(/\\/g, '\\5c')
+          .replace(/\*/g, '\\2a')
+          .replace(/\(/g, '\\28')
+          .replace(/\)/g, '\\29')
+          .replace(/\0/g, '\\00')
+          .replace(/\//g, '\\2f')
+      }
+
+      // 构建转义后的用户名信息
+      const escapedUsernameInfo = {
+        ...usernameInfo,
+        username: escapedUsername,
+        fullUsername: escapedFullUsername
+      }
+
+      // 获取服务器特定的搜索过滤器和属性
+      const searchFilter = this.getServerSpecificSearchFilter(escapedUsernameInfo)
+      const searchAttributes = this.getServerSpecificSearchAttributes()
+
       const searchOptions = {
         scope: 'sub',
         filter: searchFilter,
-        attributes: this.config.server.searchAttributes
+        attributes: searchAttributes
       }
 
-      logger.debug(`🔍 Searching for user: ${username} with filter: ${searchFilter}`)
+      logger.debug(
+        `🔍 Searching for user: ${username} (${usernameInfo.format} format) with filter: ${searchFilter}`
+      )
+      if (this.isActiveDirectory && usernameInfo.domain) {
+        logger.debug(`🏢 Domain detected: ${usernameInfo.domain}`)
+      }
 
       const entries = []
 
@@ -254,7 +375,8 @@ class LdapService {
             type: typeof entry.dn,
             entryType: typeof entry,
             hasAttributes: !!entry.attributes,
-            attributeCount: entry.attributes ? entry.attributes.length : 0
+            attributeCount: entry.attributes ? entry.attributes.length : 0,
+            serverType: this.serverType
           })
           entries.push(entry)
         })
@@ -270,7 +392,7 @@ class LdapService {
 
         res.on('end', (result) => {
           logger.debug(
-            `✅ LDAP search completed. Status: ${result.status}, Found ${entries.length} entries`
+            `✅ LDAP search completed. Status: ${result.status}, Found ${entries.length} entries (${this.serverType})`
           )
 
           if (entries.length === 0) {
@@ -282,14 +404,17 @@ class LdapService {
                 entryType: typeof entries[0],
                 entryConstructor: entries[0].constructor?.name,
                 entryKeys: Object.keys(entries[0]),
-                entryStringified: JSON.stringify(entries[0], null, 2).substring(0, 500)
+                entryStringified: JSON.stringify(entries[0], null, 2).substring(0, 500),
+                serverType: this.serverType
               })
             }
 
             if (entries.length === 1) {
               resolve(entries[0])
             } else {
-              logger.warn(`⚠️ Multiple LDAP entries found for username: ${username}`)
+              logger.warn(
+                `⚠️ Multiple LDAP entries found for username: ${username} (${this.serverType})`
+              )
               resolve(entries[0]) // 使用第一个结果
             }
           }
@@ -350,13 +475,70 @@ class LdapService {
         attrMap[name] = values.length === 1 ? values[0] : values
       })
 
-      // 根据配置映射用户属性
-      const mapping = this.config.userMapping
+      // 根据服务器类型和配置映射用户属性
+      if (this.isActiveDirectory) {
+        // Windows AD 特定属性映射
+        const mapping = this.config.userMapping || {}
 
-      userInfo.displayName = attrMap[mapping.displayName] || username
-      userInfo.email = attrMap[mapping.email] || ''
-      userInfo.firstName = attrMap[mapping.firstName] || ''
-      userInfo.lastName = attrMap[mapping.lastName] || ''
+        // 显示名称：优先使用displayName，其次cn
+        userInfo.displayName =
+          attrMap[mapping.displayName || 'displayName'] ||
+          attrMap[mapping.displayName || 'cn'] ||
+          attrMap['displayName'] ||
+          attrMap['cn'] ||
+          username
+
+        // 邮箱
+        userInfo.email =
+          attrMap[mapping.email || 'mail'] ||
+          attrMap['mail'] ||
+          attrMap['userPrincipalName'] || // UPN作为后备邮箱
+          ''
+
+        // 名字
+        userInfo.firstName = attrMap[mapping.firstName || 'givenName'] || attrMap['givenName'] || ''
+
+        // 姓氏
+        userInfo.lastName = attrMap[mapping.lastName || 'sn'] || attrMap['sn'] || ''
+
+        // Windows AD 特有信息
+        userInfo.sAMAccountName = attrMap['sAMAccountName'] || username
+        userInfo.userPrincipalName = attrMap['userPrincipalName'] || ''
+
+        // 检查用户账户是否被禁用
+        const { userAccountControl } = attrMap
+        if (userAccountControl) {
+          // 检查 ADS_UF_ACCOUNTDISABLE 标志位 (0x02)
+          const isDisabled = (parseInt(userAccountControl) & 0x02) !== 0
+          if (isDisabled) {
+            userInfo.accountDisabled = true
+            logger.warn(`⚠️ Windows AD account is disabled: ${username}`)
+          }
+        }
+
+        logger.debug('📋 Extracted Windows AD user info:', {
+          username: userInfo.username,
+          displayName: userInfo.displayName,
+          email: userInfo.email,
+          sAMAccountName: userInfo.sAMAccountName,
+          userPrincipalName: userInfo.userPrincipalName,
+          accountDisabled: userInfo.accountDisabled || false
+        })
+      } else {
+        // OpenLDAP 标准属性映射
+        const mapping = this.config.userMapping || {}
+
+        userInfo.displayName = attrMap[mapping.displayName || 'cn'] || attrMap['cn'] || username
+        userInfo.email = attrMap[mapping.email || 'mail'] || attrMap['mail'] || ''
+        userInfo.firstName = attrMap[mapping.firstName || 'givenName'] || attrMap['givenName'] || ''
+        userInfo.lastName = attrMap[mapping.lastName || 'sn'] || attrMap['sn'] || ''
+
+        logger.debug('📋 Extracted OpenLDAP user info:', {
+          username: userInfo.username,
+          displayName: userInfo.displayName,
+          email: userInfo.email
+        })
+      }
 
       // 如果没有displayName，尝试组合firstName和lastName
       if (!userInfo.displayName || userInfo.displayName === username) {
@@ -365,12 +547,6 @@ class LdapService {
         }
       }
 
-      logger.debug('📋 Extracted user info:', {
-        username: userInfo.username,
-        displayName: userInfo.displayName,
-        email: userInfo.email
-      })
-
       return userInfo
     } catch (error) {
       logger.error('❌ Error extracting user info:', error)
@@ -386,23 +562,87 @@ class LdapService {
 
     const trimmedUsername = username.trim()
 
-    // 用户名只能包含字母、数字、下划线和连字符
-    const usernameRegex = /^[a-zA-Z0-9_-]+$/
-    if (!usernameRegex.test(trimmedUsername)) {
-      throw new Error('Username can only contain letters, numbers, underscores, and hyphens')
-    }
+    if (this.isActiveDirectory) {
+      // Windows AD 用户名验证：支持 UPN 和 domain\username 格式
+      // UPN 格式：user@domain.com
+      if (trimmedUsername.includes('@')) {
+        const emailRegex = /^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/
+        if (!emailRegex.test(trimmedUsername)) {
+          throw new Error('Invalid UPN format (user@domain.com)')
+        }
 
-    // 长度限制 (防止过长的输入)
-    if (trimmedUsername.length > 64) {
-      throw new Error('Username cannot exceed 64 characters')
-    }
+        if (trimmedUsername.length > 256) {
+          throw new Error('UPN cannot exceed 256 characters')
+        }
 
-    // 不能以连字符开头或结尾
-    if (trimmedUsername.startsWith('-') || trimmedUsername.endsWith('-')) {
-      throw new Error('Username cannot start or end with a hyphen')
-    }
+        return trimmedUsername
+      }
 
-    return trimmedUsername
+      // Domain\username 格式
+      if (trimmedUsername.includes('\\')) {
+        const parts = trimmedUsername.split('\\')
+        if (parts.length !== 2 || !parts[0] || !parts[1]) {
+          throw new Error('Invalid domain\\username format')
+        }
+
+        const domain = parts[0]
+        const user = parts[1]
+
+        // 验证域名（允许字母数字和连字符）
+        const domainRegex = /^[a-zA-Z0-9-]+$/
+        if (!domainRegex.test(domain)) {
+          throw new Error('Domain name can only contain letters, numbers, and hyphens')
+        }
+
+        // 验证用户名部分
+        const userRegex = /^[a-zA-Z0-9._-]+$/
+        if (!userRegex.test(user)) {
+          throw new Error(
+            'Username can only contain letters, numbers, dots, underscores, and hyphens'
+          )
+        }
+
+        if (trimmedUsername.length > 256) {
+          throw new Error('Domain\\username cannot exceed 256 characters')
+        }
+
+        return trimmedUsername
+      }
+
+      // 简单用户名格式（sAMAccountName）
+      const samAccountRegex = /^[a-zA-Z0-9._-]+$/
+      if (!samAccountRegex.test(trimmedUsername)) {
+        throw new Error(
+          'sAMAccountName can only contain letters, numbers, dots, underscores, and hyphens'
+        )
+      }
+
+      // sAMAccountName 长度限制（AD 限制为 20 字符）
+      if (trimmedUsername.length > 20) {
+        throw new Error('sAMAccountName cannot exceed 20 characters')
+      }
+
+      return trimmedUsername
+    } else {
+      // OpenLDAP 用户名验证（原有逻辑）
+      // 用户名只能包含字母、数字、下划线和连字符
+      const usernameRegex = /^[a-zA-Z0-9_-]+$/
+      if (!usernameRegex.test(trimmedUsername)) {
+        throw new Error('Username can only contain letters, numbers, underscores, and hyphens')
+      }
+
+      // 长度限制 (防止过长的输入)
+      if (trimmedUsername.length > 64) {
+        throw new Error('Username cannot exceed 64 characters')
+      }
+
+      // 不能以连字符开头或结尾
+      if (trimmedUsername.startsWith('-') || trimmedUsername.endsWith('-')) {
+        throw new Error('Username cannot start or end with a hyphen')
+      }
+
+      return trimmedUsername
+    }
   }
 
   // 🔐 主要的登录验证方法
@@ -488,10 +728,21 @@ class LdapService {
       // 5. 提取用户信息
       const userInfo = this.extractUserInfo(ldapEntry, sanitizedUsername)
 
-      // 6. 创建或更新本地用户
+      // 6. Windows AD 特定检查：验证账户是否被禁用
+      if (this.isActiveDirectory && userInfo.accountDisabled) {
+        logger.security(
+          `🔒 Disabled Windows AD account login attempt: ${sanitizedUsername} from LDAP authentication`
+        )
+        return {
+          success: false,
+          message: 'Your account has been disabled. Please contact administrator.'
+        }
+      }
+
+      // 7. 创建或更新本地用户
       const user = await userService.createOrUpdateUser(userInfo)
 
-      // 7. 检查用户是否被禁用
+      // 8. 检查用户是否被禁用
       if (!user.isActive) {
         logger.security(
           `🔒 Disabled user LDAP login attempt: ${sanitizedUsername} from LDAP authentication`
@@ -502,13 +753,15 @@ class LdapService {
         }
       }
 
-      // 8. 记录登录
+      // 9. 记录登录
       await userService.recordUserLogin(user.id)
 
-      // 9. 创建用户会话
+      // 10. 创建用户会话
       const sessionToken = await userService.createUserSession(user.id)
 
-      logger.info(`✅ LDAP authentication successful for user: ${sanitizedUsername}`)
+      logger.info(
+        `✅ LDAP authentication successful for user: ${sanitizedUsername} (${this.serverType})`
+      )
 
       return {
         success: true,
@@ -598,6 +851,8 @@ class LdapService {
   getConfigInfo() {
     const configInfo = {
       enabled: this.config.enabled,
+      serverType: this.serverType,
+      isActiveDirectory: this.isActiveDirectory,
       server: {
         url: this.config.server.url,
         searchBase: this.config.server.searchBase,
@@ -619,6 +874,16 @@ class LdapService {
       }
     }
 
+    // Windows AD 特定配置信息
+    if (this.isActiveDirectory) {
+      configInfo.activeDirectoryFeatures = {
+        supportsUPN: true,
+        supportsDomainUsername: true,
+        supportsGlobalCatalog: true,
+        checksAccountDisabled: true
+      }
+    }
+
     return configInfo
   }
 }

From 088cf8401fa4f13fb0407bbe914ff58bbdcf65da Mon Sep 17 00:00:00 2001
From: Feng Yue <2525275@gmail.com>
Date: Wed, 3 Sep 2025 13:35:47 +0800
Subject: [PATCH 10/15] fix prettier issue

---
 config/config.example.js | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/config/config.example.js b/config/config.example.js
index 88074000..3302c1ff 100644
--- a/config/config.example.js
+++ b/config/config.example.js
@@ -143,8 +143,20 @@ const config = {
       searchAttributes: process.env.LDAP_SEARCH_ATTRIBUTES
         ? process.env.LDAP_SEARCH_ATTRIBUTES.split(',')
         : process.env.LDAP_SERVER_TYPE === 'activedirectory'
-        ? ['dn', 'sAMAccountName', 'userPrincipalName', 'cn', 'displayName', 'mail', 'givenName', 'sn', 'memberOf', 'objectClass', 'userAccountControl']
-        : ['dn', 'uid', 'cn', 'mail', 'givenName', 'sn'],
+          ? [
+              'dn',
+              'sAMAccountName',
+              'userPrincipalName',
+              'cn',
+              'displayName',
+              'mail',
+              'givenName',
+              'sn',
+              'memberOf',
+              'objectClass',
+              'userAccountControl'
+            ]
+          : ['dn', 'uid', 'cn', 'mail', 'givenName', 'sn'],
       timeout: parseInt(process.env.LDAP_TIMEOUT) || 5000,
       connectTimeout: parseInt(process.env.LDAP_CONNECT_TIMEOUT) || 10000,
       // TLS/SSL 配置
@@ -169,8 +181,12 @@ const config = {
     },
     // 用户属性映射 - 根据服务器类型自动设置默认值
     userMapping: {
-      username: process.env.LDAP_USER_ATTR_USERNAME || (process.env.LDAP_SERVER_TYPE === 'activedirectory' ? 'sAMAccountName' : 'uid'),
-      displayName: process.env.LDAP_USER_ATTR_DISPLAY_NAME || (process.env.LDAP_SERVER_TYPE === 'activedirectory' ? 'displayName' : 'cn'),
+      username:
+        process.env.LDAP_USER_ATTR_USERNAME ||
+        (process.env.LDAP_SERVER_TYPE === 'activedirectory' ? 'sAMAccountName' : 'uid'),
+      displayName:
+        process.env.LDAP_USER_ATTR_DISPLAY_NAME ||
+        (process.env.LDAP_SERVER_TYPE === 'activedirectory' ? 'displayName' : 'cn'),
       email: process.env.LDAP_USER_ATTR_EMAIL || 'mail',
       firstName: process.env.LDAP_USER_ATTR_FIRST_NAME || 'givenName',
       lastName: process.env.LDAP_USER_ATTR_LAST_NAME || 'sn'

From 00395694713eb26d5cf0c518b3fb0cf9781aa38e Mon Sep 17 00:00:00 2001
From: Feng Yue <2525275@gmail.com>
Date: Wed, 3 Sep 2025 15:02:38 +0800
Subject: [PATCH 11/15] Revert "fix prettier issue"

This reverts commit 088cf8401fa4f13fb0407bbe914ff58bbdcf65da.
---
 config/config.example.js | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/config/config.example.js b/config/config.example.js
index 3302c1ff..88074000 100644
--- a/config/config.example.js
+++ b/config/config.example.js
@@ -143,20 +143,8 @@ const config = {
       searchAttributes: process.env.LDAP_SEARCH_ATTRIBUTES
         ? process.env.LDAP_SEARCH_ATTRIBUTES.split(',')
         : process.env.LDAP_SERVER_TYPE === 'activedirectory'
-          ? [
-              'dn',
-              'sAMAccountName',
-              'userPrincipalName',
-              'cn',
-              'displayName',
-              'mail',
-              'givenName',
-              'sn',
-              'memberOf',
-              'objectClass',
-              'userAccountControl'
-            ]
-          : ['dn', 'uid', 'cn', 'mail', 'givenName', 'sn'],
+        ? ['dn', 'sAMAccountName', 'userPrincipalName', 'cn', 'displayName', 'mail', 'givenName', 'sn', 'memberOf', 'objectClass', 'userAccountControl']
+        : ['dn', 'uid', 'cn', 'mail', 'givenName', 'sn'],
       timeout: parseInt(process.env.LDAP_TIMEOUT) || 5000,
       connectTimeout: parseInt(process.env.LDAP_CONNECT_TIMEOUT) || 10000,
       // TLS/SSL 配置
@@ -181,12 +169,8 @@ const config = {
     },
     // 用户属性映射 - 根据服务器类型自动设置默认值
     userMapping: {
-      username:
-        process.env.LDAP_USER_ATTR_USERNAME ||
-        (process.env.LDAP_SERVER_TYPE === 'activedirectory' ? 'sAMAccountName' : 'uid'),
-      displayName:
-        process.env.LDAP_USER_ATTR_DISPLAY_NAME ||
-        (process.env.LDAP_SERVER_TYPE === 'activedirectory' ? 'displayName' : 'cn'),
+      username: process.env.LDAP_USER_ATTR_USERNAME || (process.env.LDAP_SERVER_TYPE === 'activedirectory' ? 'sAMAccountName' : 'uid'),
+      displayName: process.env.LDAP_USER_ATTR_DISPLAY_NAME || (process.env.LDAP_SERVER_TYPE === 'activedirectory' ? 'displayName' : 'cn'),
       email: process.env.LDAP_USER_ATTR_EMAIL || 'mail',
       firstName: process.env.LDAP_USER_ATTR_FIRST_NAME || 'givenName',
       lastName: process.env.LDAP_USER_ATTR_LAST_NAME || 'sn'

From f69333f312a73e57f8d89987e3b4243ef95d1214 Mon Sep 17 00:00:00 2001
From: Feng Yue <2525275@gmail.com>
Date: Wed, 3 Sep 2025 15:03:14 +0800
Subject: [PATCH 12/15] Revert "add support of Windows AD Server"

This reverts commit a1005e91c830b913a7ae10b35b1ba34bae1605a7.
---
 .env.example                |  20 +--
 config/config.example.js    |  11 +-
 src/services/ldapService.js | 347 +++++-------------------------------
 3 files changed, 44 insertions(+), 334 deletions(-)

diff --git a/.env.example b/.env.example
index b4866560..62f7fcfb 100644
--- a/.env.example
+++ b/.env.example
@@ -64,16 +64,11 @@ TRUST_PROXY=true
 
 # 🔐 LDAP 认证配置
 LDAP_ENABLED=false
-# 服务器类型：openldap 或 activedirectory
-LDAP_SERVER_TYPE=openldap
-# LDAP 服务器配置
 LDAP_URL=ldaps://ldap-1.test1.bj.yxops.net:636
 LDAP_BIND_DN=cn=admin,dc=example,dc=com
 LDAP_BIND_PASSWORD=admin_password
 LDAP_SEARCH_BASE=dc=example,dc=com
-# 搜索过滤器 (OpenLDAP 使用 uid，AD 会自动使用 sAMAccountName/userPrincipalName)
 LDAP_SEARCH_FILTER=(uid={{username}})
-# 搜索属性 (根据服务器类型自动设置，也可手动指定)
 LDAP_SEARCH_ATTRIBUTES=dn,uid,cn,mail,givenName,sn
 LDAP_TIMEOUT=5000
 LDAP_CONNECT_TIMEOUT=10000
@@ -90,26 +85,13 @@ LDAP_TLS_REJECT_UNAUTHORIZED=true
 # 服务器名称 (可选，用于 SNI)
 # LDAP_TLS_SERVERNAME=ldap.example.com
 
-# 🗺️ LDAP 用户属性映射 (根据服务器类型自动设置默认值)
+# 🗺️ LDAP 用户属性映射
 LDAP_USER_ATTR_USERNAME=uid
 LDAP_USER_ATTR_DISPLAY_NAME=cn
 LDAP_USER_ATTR_EMAIL=mail
 LDAP_USER_ATTR_FIRST_NAME=givenName
 LDAP_USER_ATTR_LAST_NAME=sn
 
-# 🏢 Windows Active Directory 示例配置
-# LDAP_SERVER_TYPE=activedirectory
-# LDAP_URL=ldaps://ad-server.company.com:636
-# # 或使用全局目录端口进行森林范围搜索
-# LDAP_URL=ldap://ad-server.company.com:3268
-# LDAP_BIND_DN=CN=Service Account,CN=Users,DC=company,DC=com
-# LDAP_BIND_PASSWORD=service_account_password
-# LDAP_SEARCH_BASE=DC=company,DC=com
-# # AD 用户属性映射 (可选，会自动使用 AD 默认值)
-# LDAP_USER_ATTR_USERNAME=sAMAccountName
-# LDAP_USER_ATTR_DISPLAY_NAME=displayName
-# LDAP_USER_ATTR_EMAIL=mail
-
 # 👥 用户管理配置
 USER_MANAGEMENT_ENABLED=false
 DEFAULT_USER_ROLE=user
diff --git a/config/config.example.js b/config/config.example.js
index 88074000..433ecd1f 100644
--- a/config/config.example.js
+++ b/config/config.example.js
@@ -130,20 +130,14 @@ const config = {
   // 🔐 LDAP 认证配置
   ldap: {
     enabled: process.env.LDAP_ENABLED === 'true',
-    // 服务器类型：'openldap' 或 'activedirectory'
-    serverType: process.env.LDAP_SERVER_TYPE || 'openldap',
     server: {
       url: process.env.LDAP_URL || 'ldap://localhost:389',
       bindDN: process.env.LDAP_BIND_DN || 'cn=admin,dc=example,dc=com',
       bindCredentials: process.env.LDAP_BIND_PASSWORD || 'admin',
       searchBase: process.env.LDAP_SEARCH_BASE || 'dc=example,dc=com',
-      // 搜索过滤器 - OpenLDAP 默认使用 uid，Windows AD 会自动使用 sAMAccountName/userPrincipalName
       searchFilter: process.env.LDAP_SEARCH_FILTER || '(uid={{username}})',
-      // 搜索属性 - 根据服务器类型自动设置默认值
       searchAttributes: process.env.LDAP_SEARCH_ATTRIBUTES
         ? process.env.LDAP_SEARCH_ATTRIBUTES.split(',')
-        : process.env.LDAP_SERVER_TYPE === 'activedirectory'
-        ? ['dn', 'sAMAccountName', 'userPrincipalName', 'cn', 'displayName', 'mail', 'givenName', 'sn', 'memberOf', 'objectClass', 'userAccountControl']
         : ['dn', 'uid', 'cn', 'mail', 'givenName', 'sn'],
       timeout: parseInt(process.env.LDAP_TIMEOUT) || 5000,
       connectTimeout: parseInt(process.env.LDAP_CONNECT_TIMEOUT) || 10000,
@@ -167,10 +161,9 @@ const config = {
         servername: process.env.LDAP_TLS_SERVERNAME || undefined
       }
     },
-    // 用户属性映射 - 根据服务器类型自动设置默认值
     userMapping: {
-      username: process.env.LDAP_USER_ATTR_USERNAME || (process.env.LDAP_SERVER_TYPE === 'activedirectory' ? 'sAMAccountName' : 'uid'),
-      displayName: process.env.LDAP_USER_ATTR_DISPLAY_NAME || (process.env.LDAP_SERVER_TYPE === 'activedirectory' ? 'displayName' : 'cn'),
+      username: process.env.LDAP_USER_ATTR_USERNAME || 'uid',
+      displayName: process.env.LDAP_USER_ATTR_DISPLAY_NAME || 'cn',
       email: process.env.LDAP_USER_ATTR_EMAIL || 'mail',
       firstName: process.env.LDAP_USER_ATTR_FIRST_NAME || 'givenName',
       lastName: process.env.LDAP_USER_ATTR_LAST_NAME || 'sn'
diff --git a/src/services/ldapService.js b/src/services/ldapService.js
index 1cfb3ba5..75b4e704 100644
--- a/src/services/ldapService.js
+++ b/src/services/ldapService.js
@@ -8,10 +8,6 @@ class LdapService {
     this.config = config.ldap || {}
     this.client = null
 
-    // 设置服务器类型，默认为 OpenLDAP
-    this.serverType = this.config.serverType || 'openldap'
-    this.isActiveDirectory = this.serverType === 'activedirectory'
-
     // 验证配置 - 只有在 LDAP 配置存在且启用时才验证
     if (this.config && this.config.enabled) {
       this.validateConfiguration()
@@ -58,93 +54,6 @@ class LdapService {
     }
   }
 
-  // 🔍 解析Windows AD用户名格式
-  parseActiveDirectoryUsername(username) {
-    if (!this.isActiveDirectory) {
-      return { username, domain: null, format: 'simple' }
-    }
-
-    const trimmedUsername = username.trim()
-
-    // 检查UPN格式 (user@domain.com)
-    if (trimmedUsername.includes('@')) {
-      const parts = trimmedUsername.split('@')
-      if (parts.length === 2 && parts[0] && parts[1]) {
-        return {
-          username: parts[0],
-          domain: parts[1],
-          format: 'upn',
-          fullUsername: trimmedUsername
-        }
-      }
-    }
-
-    // 检查域\用户名格式 (DOMAIN\user)
-    if (trimmedUsername.includes('\\')) {
-      const parts = trimmedUsername.split('\\')
-      if (parts.length === 2 && parts[0] && parts[1]) {
-        return {
-          username: parts[1],
-          domain: parts[0],
-          format: 'domain',
-          fullUsername: trimmedUsername
-        }
-      }
-    }
-
-    // 简单用户名格式
-    return {
-      username: trimmedUsername,
-      domain: null,
-      format: 'simple',
-      fullUsername: trimmedUsername
-    }
-  }
-
-  // 🔍 获取服务器类型特定的搜索过滤器
-  getServerSpecificSearchFilter(usernameInfo) {
-    if (this.isActiveDirectory) {
-      const { username, fullUsername } = usernameInfo
-      // Windows AD: 支持 sAMAccountName 和 userPrincipalName
-      if (fullUsername && fullUsername.includes('@')) {
-        // 如果是UPN格式，优先使用userPrincipalName搜索
-        return `(|(userPrincipalName=${fullUsername})(sAMAccountName=${username}))`
-      } else {
-        // 否则同时搜索两个属性
-        return `(|(sAMAccountName=${username})(userPrincipalName=${username}))`
-      }
-    } else {
-      // OpenLDAP: 使用配置的搜索过滤器或默认的uid
-      const filterTemplate = this.config.server.searchFilter || '(uid={{username}})'
-      return filterTemplate.replace('{{username}}', usernameInfo.username)
-    }
-  }
-
-  // 🔍 获取服务器类型特定的搜索属性
-  getServerSpecificSearchAttributes() {
-    if (this.isActiveDirectory) {
-      // Windows AD 特定属性
-      return (
-        this.config.server.searchAttributes || [
-          'dn',
-          'sAMAccountName',
-          'userPrincipalName',
-          'cn',
-          'displayName',
-          'mail',
-          'givenName',
-          'sn',
-          'memberOf',
-          'objectClass',
-          'userAccountControl'
-        ]
-      )
-    } else {
-      // OpenLDAP 默认属性
-      return this.config.server.searchAttributes || ['dn', 'uid', 'cn', 'mail', 'givenName', 'sn']
-    }
-  }
-
   // 🔍 提取LDAP条目的DN
   extractDN(ldapEntry) {
     if (!ldapEntry) {
@@ -310,12 +219,9 @@ class LdapService {
   // 🔍 搜索用户
   async searchUser(client, username) {
     return new Promise((resolve, reject) => {
-      // 解析用户名（对Windows AD进行特殊处理）
-      const usernameInfo = this.parseActiveDirectoryUsername(username)
-
       // 防止LDAP注入：转义特殊字符
       // 根据RFC 4515，需要转义的特殊字符：* ( ) \ NUL
-      const escapedUsername = usernameInfo.username
+      const escapedUsername = username
         .replace(/\\/g, '\\5c') // 反斜杠必须先转义
         .replace(/\*/g, '\\2a') // 星号
         .replace(/\(/g, '\\28') // 左括号
@@ -323,41 +229,14 @@ class LdapService {
         .replace(/\0/g, '\\00') // NUL字符
         .replace(/\//g, '\\2f') // 斜杠
 
-      // 如果是UPN格式，也需要转义完整用户名
-      let escapedFullUsername = usernameInfo.fullUsername
-      if (escapedFullUsername && escapedFullUsername !== usernameInfo.username) {
-        escapedFullUsername = escapedFullUsername
-          .replace(/\\/g, '\\5c')
-          .replace(/\*/g, '\\2a')
-          .replace(/\(/g, '\\28')
-          .replace(/\)/g, '\\29')
-          .replace(/\0/g, '\\00')
-          .replace(/\//g, '\\2f')
-      }
-
-      // 构建转义后的用户名信息
-      const escapedUsernameInfo = {
-        ...usernameInfo,
-        username: escapedUsername,
-        fullUsername: escapedFullUsername
-      }
-
-      // 获取服务器特定的搜索过滤器和属性
-      const searchFilter = this.getServerSpecificSearchFilter(escapedUsernameInfo)
-      const searchAttributes = this.getServerSpecificSearchAttributes()
-
+      const searchFilter = this.config.server.searchFilter.replace('{{username}}', escapedUsername)
       const searchOptions = {
         scope: 'sub',
         filter: searchFilter,
-        attributes: searchAttributes
+        attributes: this.config.server.searchAttributes
       }
 
-      logger.debug(
-        `🔍 Searching for user: ${username} (${usernameInfo.format} format) with filter: ${searchFilter}`
-      )
-      if (this.isActiveDirectory && usernameInfo.domain) {
-        logger.debug(`🏢 Domain detected: ${usernameInfo.domain}`)
-      }
+      logger.debug(`🔍 Searching for user: ${username} with filter: ${searchFilter}`)
 
       const entries = []
 
@@ -375,8 +254,7 @@ class LdapService {
             type: typeof entry.dn,
             entryType: typeof entry,
             hasAttributes: !!entry.attributes,
-            attributeCount: entry.attributes ? entry.attributes.length : 0,
-            serverType: this.serverType
+            attributeCount: entry.attributes ? entry.attributes.length : 0
           })
           entries.push(entry)
         })
@@ -392,7 +270,7 @@ class LdapService {
 
         res.on('end', (result) => {
           logger.debug(
-            `✅ LDAP search completed. Status: ${result.status}, Found ${entries.length} entries (${this.serverType})`
+            `✅ LDAP search completed. Status: ${result.status}, Found ${entries.length} entries`
           )
 
           if (entries.length === 0) {
@@ -404,17 +282,14 @@ class LdapService {
                 entryType: typeof entries[0],
                 entryConstructor: entries[0].constructor?.name,
                 entryKeys: Object.keys(entries[0]),
-                entryStringified: JSON.stringify(entries[0], null, 2).substring(0, 500),
-                serverType: this.serverType
+                entryStringified: JSON.stringify(entries[0], null, 2).substring(0, 500)
               })
             }
 
             if (entries.length === 1) {
               resolve(entries[0])
             } else {
-              logger.warn(
-                `⚠️ Multiple LDAP entries found for username: ${username} (${this.serverType})`
-              )
+              logger.warn(`⚠️ Multiple LDAP entries found for username: ${username}`)
               resolve(entries[0]) // 使用第一个结果
             }
           }
@@ -475,70 +350,13 @@ class LdapService {
         attrMap[name] = values.length === 1 ? values[0] : values
       })
 
-      // 根据服务器类型和配置映射用户属性
-      if (this.isActiveDirectory) {
-        // Windows AD 特定属性映射
-        const mapping = this.config.userMapping || {}
+      // 根据配置映射用户属性
+      const mapping = this.config.userMapping
 
-        // 显示名称：优先使用displayName，其次cn
-        userInfo.displayName =
-          attrMap[mapping.displayName || 'displayName'] ||
-          attrMap[mapping.displayName || 'cn'] ||
-          attrMap['displayName'] ||
-          attrMap['cn'] ||
-          username
-
-        // 邮箱
-        userInfo.email =
-          attrMap[mapping.email || 'mail'] ||
-          attrMap['mail'] ||
-          attrMap['userPrincipalName'] || // UPN作为后备邮箱
-          ''
-
-        // 名字
-        userInfo.firstName = attrMap[mapping.firstName || 'givenName'] || attrMap['givenName'] || ''
-
-        // 姓氏
-        userInfo.lastName = attrMap[mapping.lastName || 'sn'] || attrMap['sn'] || ''
-
-        // Windows AD 特有信息
-        userInfo.sAMAccountName = attrMap['sAMAccountName'] || username
-        userInfo.userPrincipalName = attrMap['userPrincipalName'] || ''
-
-        // 检查用户账户是否被禁用
-        const { userAccountControl } = attrMap
-        if (userAccountControl) {
-          // 检查 ADS_UF_ACCOUNTDISABLE 标志位 (0x02)
-          const isDisabled = (parseInt(userAccountControl) & 0x02) !== 0
-          if (isDisabled) {
-            userInfo.accountDisabled = true
-            logger.warn(`⚠️ Windows AD account is disabled: ${username}`)
-          }
-        }
-
-        logger.debug('📋 Extracted Windows AD user info:', {
-          username: userInfo.username,
-          displayName: userInfo.displayName,
-          email: userInfo.email,
-          sAMAccountName: userInfo.sAMAccountName,
-          userPrincipalName: userInfo.userPrincipalName,
-          accountDisabled: userInfo.accountDisabled || false
-        })
-      } else {
-        // OpenLDAP 标准属性映射
-        const mapping = this.config.userMapping || {}
-
-        userInfo.displayName = attrMap[mapping.displayName || 'cn'] || attrMap['cn'] || username
-        userInfo.email = attrMap[mapping.email || 'mail'] || attrMap['mail'] || ''
-        userInfo.firstName = attrMap[mapping.firstName || 'givenName'] || attrMap['givenName'] || ''
-        userInfo.lastName = attrMap[mapping.lastName || 'sn'] || attrMap['sn'] || ''
-
-        logger.debug('📋 Extracted OpenLDAP user info:', {
-          username: userInfo.username,
-          displayName: userInfo.displayName,
-          email: userInfo.email
-        })
-      }
+      userInfo.displayName = attrMap[mapping.displayName] || username
+      userInfo.email = attrMap[mapping.email] || ''
+      userInfo.firstName = attrMap[mapping.firstName] || ''
+      userInfo.lastName = attrMap[mapping.lastName] || ''
 
       // 如果没有displayName，尝试组合firstName和lastName
       if (!userInfo.displayName || userInfo.displayName === username) {
@@ -547,6 +365,12 @@ class LdapService {
         }
       }
 
+      logger.debug('📋 Extracted user info:', {
+        username: userInfo.username,
+        displayName: userInfo.displayName,
+        email: userInfo.email
+      })
+
       return userInfo
     } catch (error) {
       logger.error('❌ Error extracting user info:', error)
@@ -562,87 +386,23 @@ class LdapService {
 
     const trimmedUsername = username.trim()
 
-    if (this.isActiveDirectory) {
-      // Windows AD 用户名验证：支持 UPN 和 domain\username 格式
-      // UPN 格式：user@domain.com
-      if (trimmedUsername.includes('@')) {
-        const emailRegex = /^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/
-        if (!emailRegex.test(trimmedUsername)) {
-          throw new Error('Invalid UPN format (user@domain.com)')
-        }
-
-        if (trimmedUsername.length > 256) {
-          throw new Error('UPN cannot exceed 256 characters')
-        }
-
-        return trimmedUsername
-      }
-
-      // Domain\username 格式
-      if (trimmedUsername.includes('\\')) {
-        const parts = trimmedUsername.split('\\')
-        if (parts.length !== 2 || !parts[0] || !parts[1]) {
-          throw new Error('Invalid domain\\username format')
-        }
-
-        const domain = parts[0]
-        const user = parts[1]
-
-        // 验证域名（允许字母数字和连字符）
-        const domainRegex = /^[a-zA-Z0-9-]+$/
-        if (!domainRegex.test(domain)) {
-          throw new Error('Domain name can only contain letters, numbers, and hyphens')
-        }
-
-        // 验证用户名部分
-        const userRegex = /^[a-zA-Z0-9._-]+$/
-        if (!userRegex.test(user)) {
-          throw new Error(
-            'Username can only contain letters, numbers, dots, underscores, and hyphens'
-          )
-        }
-
-        if (trimmedUsername.length > 256) {
-          throw new Error('Domain\\username cannot exceed 256 characters')
-        }
-
-        return trimmedUsername
-      }
-
-      // 简单用户名格式（sAMAccountName）
-      const samAccountRegex = /^[a-zA-Z0-9._-]+$/
-      if (!samAccountRegex.test(trimmedUsername)) {
-        throw new Error(
-          'sAMAccountName can only contain letters, numbers, dots, underscores, and hyphens'
-        )
-      }
-
-      // sAMAccountName 长度限制（AD 限制为 20 字符）
-      if (trimmedUsername.length > 20) {
-        throw new Error('sAMAccountName cannot exceed 20 characters')
-      }
-
-      return trimmedUsername
-    } else {
-      // OpenLDAP 用户名验证（原有逻辑）
-      // 用户名只能包含字母、数字、下划线和连字符
-      const usernameRegex = /^[a-zA-Z0-9_-]+$/
-      if (!usernameRegex.test(trimmedUsername)) {
-        throw new Error('Username can only contain letters, numbers, underscores, and hyphens')
-      }
-
-      // 长度限制 (防止过长的输入)
-      if (trimmedUsername.length > 64) {
-        throw new Error('Username cannot exceed 64 characters')
-      }
-
-      // 不能以连字符开头或结尾
-      if (trimmedUsername.startsWith('-') || trimmedUsername.endsWith('-')) {
-        throw new Error('Username cannot start or end with a hyphen')
-      }
-
-      return trimmedUsername
+    // 用户名只能包含字母、数字、下划线和连字符
+    const usernameRegex = /^[a-zA-Z0-9_-]+$/
+    if (!usernameRegex.test(trimmedUsername)) {
+      throw new Error('Username can only contain letters, numbers, underscores, and hyphens')
     }
+
+    // 长度限制 (防止过长的输入)
+    if (trimmedUsername.length > 64) {
+      throw new Error('Username cannot exceed 64 characters')
+    }
+
+    // 不能以连字符开头或结尾
+    if (trimmedUsername.startsWith('-') || trimmedUsername.endsWith('-')) {
+      throw new Error('Username cannot start or end with a hyphen')
+    }
+
+    return trimmedUsername
   }
 
   // 🔐 主要的登录验证方法
@@ -728,21 +488,10 @@ class LdapService {
       // 5. 提取用户信息
       const userInfo = this.extractUserInfo(ldapEntry, sanitizedUsername)
 
-      // 6. Windows AD 特定检查：验证账户是否被禁用
-      if (this.isActiveDirectory && userInfo.accountDisabled) {
-        logger.security(
-          `🔒 Disabled Windows AD account login attempt: ${sanitizedUsername} from LDAP authentication`
-        )
-        return {
-          success: false,
-          message: 'Your account has been disabled. Please contact administrator.'
-        }
-      }
-
-      // 7. 创建或更新本地用户
+      // 6. 创建或更新本地用户
       const user = await userService.createOrUpdateUser(userInfo)
 
-      // 8. 检查用户是否被禁用
+      // 7. 检查用户是否被禁用
       if (!user.isActive) {
         logger.security(
           `🔒 Disabled user LDAP login attempt: ${sanitizedUsername} from LDAP authentication`
@@ -753,15 +502,13 @@ class LdapService {
         }
       }
 
-      // 9. 记录登录
+      // 8. 记录登录
       await userService.recordUserLogin(user.id)
 
-      // 10. 创建用户会话
+      // 9. 创建用户会话
       const sessionToken = await userService.createUserSession(user.id)
 
-      logger.info(
-        `✅ LDAP authentication successful for user: ${sanitizedUsername} (${this.serverType})`
-      )
+      logger.info(`✅ LDAP authentication successful for user: ${sanitizedUsername}`)
 
       return {
         success: true,
@@ -851,8 +598,6 @@ class LdapService {
   getConfigInfo() {
     const configInfo = {
       enabled: this.config.enabled,
-      serverType: this.serverType,
-      isActiveDirectory: this.isActiveDirectory,
       server: {
         url: this.config.server.url,
         searchBase: this.config.server.searchBase,
@@ -874,16 +619,6 @@ class LdapService {
       }
     }
 
-    // Windows AD 特定配置信息
-    if (this.isActiveDirectory) {
-      configInfo.activeDirectoryFeatures = {
-        supportsUPN: true,
-        supportsDomainUsername: true,
-        supportsGlobalCatalog: true,
-        checksAccountDisabled: true
-      }
-    }
-
     return configInfo
   }
 }

From bec9cf565bf80d2918c03f2059fd0404f56260a5 Mon Sep 17 00:00:00 2001
From: Feng Yue <2525275@gmail.com>
Date: Wed, 3 Sep 2025 15:15:13 +0800
Subject: [PATCH 13/15] feat: add Windows Active Directory LDAP authentication
 support

---
 src/services/ldapService.js | 133 +++++++++++++++++++++++++++++++++++-
 1 file changed, 130 insertions(+), 3 deletions(-)

diff --git a/src/services/ldapService.js b/src/services/ldapService.js
index 75b4e704..86fdb88d 100644
--- a/src/services/ldapService.js
+++ b/src/services/ldapService.js
@@ -97,6 +97,38 @@ class LdapService {
     return null
   }
 
+  // 🌐 从DN中提取域名，用于Windows AD UPN格式认证
+  extractDomainFromDN(dnString) {
+    try {
+      if (!dnString || typeof dnString !== 'string') {
+        return null
+      }
+
+      // 提取所有DC组件：DC=test,DC=demo,DC=com
+      const dcMatches = dnString.match(/DC=([^,]+)/gi)
+      if (!dcMatches || dcMatches.length === 0) {
+        return null
+      }
+
+      // 提取DC值并连接成域名
+      const domainParts = dcMatches.map((match) => {
+        const value = match.replace(/DC=/i, '').trim()
+        return value
+      })
+
+      if (domainParts.length > 0) {
+        const domain = domainParts.join('.')
+        logger.debug(`🌐 从DN提取域名: ${domain}`)
+        return domain
+      }
+
+      return null
+    } catch (error) {
+      logger.debug('⚠️ 域名提取失败:', error.message)
+      return null
+    }
+  }
+
   // 🔗 创建LDAP客户端连接
   createClient() {
     try {
@@ -336,6 +368,79 @@ class LdapService {
     })
   }
 
+  // 🔐 Windows AD兼容认证 - 在DN认证失败时尝试多种格式
+  async tryWindowsADAuthentication(username, password) {
+    if (!username || !password) {
+      return false
+    }
+
+    // 从searchBase提取域名
+    const domain = this.extractDomainFromDN(this.config.server.searchBase)
+
+    const adFormats = []
+
+    if (domain) {
+      // UPN格式（Windows AD标准）
+      adFormats.push(`${username}@${domain}`)
+
+      // 如果域名有多个部分，也尝试简化版本
+      const domainParts = domain.split('.')
+      if (domainParts.length > 1) {
+        adFormats.push(`${username}@${domainParts.slice(-2).join('.')}`) // 只取后两部分
+      }
+
+      // 域\用户名格式
+      const firstDomainPart = domainParts[0]
+      if (firstDomainPart) {
+        adFormats.push(`${firstDomainPart}\\${username}`)
+        adFormats.push(`${firstDomainPart.toUpperCase()}\\${username}`)
+      }
+    }
+
+    // 纯用户名（最后尝试）
+    adFormats.push(username)
+
+    logger.info(`🔄 尝试 ${adFormats.length} 种Windows AD认证格式...`)
+
+    for (const format of adFormats) {
+      try {
+        logger.info(`🔍 尝试格式: ${format}`)
+        const result = await this.tryDirectBind(format, password)
+        if (result) {
+          logger.info(`✅ Windows AD认证成功: ${format}`)
+          return true
+        }
+        logger.debug(`❌ 认证失败: ${format}`)
+      } catch (error) {
+        logger.debug(`认证异常 ${format}:`, error.message)
+      }
+    }
+
+    logger.info(`🚫 所有Windows AD格式认证都失败了`)
+    return false
+  }
+
+  // 🔐 直接尝试绑定认证的辅助方法
+  async tryDirectBind(identifier, password) {
+    return new Promise((resolve, reject) => {
+      const authClient = this.createClient()
+
+      authClient.bind(identifier, password, (err) => {
+        authClient.unbind()
+
+        if (err) {
+          if (err.name === 'InvalidCredentialsError') {
+            resolve(false)
+          } else {
+            reject(err)
+          }
+        } else {
+          resolve(true)
+        }
+      })
+    })
+  }
+
   // 📝 提取用户信息
   extractUserInfo(ldapEntry, username) {
     try {
@@ -478,10 +583,32 @@ class LdapService {
         return { success: false, message: 'Authentication service error' }
       }
 
-      // 4. 验证用户密码
-      const isPasswordValid = await this.authenticateUser(userDN, password)
+      // 4. 验证用户密码 - 支持传统LDAP和Windows AD
+      let isPasswordValid = false
+
+      // 首先尝试传统的DN认证（保持原有LDAP逻辑）
+      try {
+        isPasswordValid = await this.authenticateUser(userDN, password)
+        if (isPasswordValid) {
+          logger.info(`✅ DN authentication successful for user: ${sanitizedUsername}`)
+        }
+      } catch (error) {
+        logger.debug(
+          `DN authentication failed for user: ${sanitizedUsername}, error: ${error.message}`
+        )
+      }
+
+      // 如果DN认证失败，尝试Windows AD多格式认证
       if (!isPasswordValid) {
-        logger.info(`🚫 Invalid password for user: ${sanitizedUsername}`)
+        logger.debug(`🔄 Trying Windows AD authentication formats for user: ${sanitizedUsername}`)
+        isPasswordValid = await this.tryWindowsADAuthentication(sanitizedUsername, password)
+        if (isPasswordValid) {
+          logger.info(`✅ Windows AD authentication successful for user: ${sanitizedUsername}`)
+        }
+      }
+
+      if (!isPasswordValid) {
+        logger.info(`🚫 All authentication methods failed for user: ${sanitizedUsername}`)
         return { success: false, message: 'Invalid username or password' }
       }
 

From ff99f5d1234c316df0e04a3f8f1e405c6a6cb622 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 3 Sep 2025 06:38:38 +0000
Subject: [PATCH 14/15] chore: sync VERSION file with release v1.1.126 [skip
 ci]

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 599d6ff7..5bd0c3a6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.125
+1.1.126

From 16d397125a5c78490e225c8005fdd167bfff6d69 Mon Sep 17 00:00:00 2001
From: shaw <shaw-wei@foxmail.com>
Date: Wed, 3 Sep 2025 17:28:13 +0800
Subject: [PATCH 15/15] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81apikey=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/routes/admin.js                           | 13 ++++++++
 .../components/apikeys/EditApiKeyModal.vue    | 13 +++++---
 web/admin-spa/src/views/ApiKeysView.vue       | 31 +++++++++++++------
 3 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/src/routes/admin.js b/src/routes/admin.js
index 31792278..8c824eab 100644
--- a/src/routes/admin.js
+++ b/src/routes/admin.js
@@ -873,6 +873,7 @@ router.put('/api-keys/:keyId', authenticateAdmin, async (req, res) => {
   try {
     const { keyId } = req.params
     const {
+      name, // 添加名称字段
       tokenLimit,
       concurrencyLimit,
       rateLimitWindow,
@@ -899,6 +900,18 @@ router.put('/api-keys/:keyId', authenticateAdmin, async (req, res) => {
     // 只允许更新指定字段
     const updates = {}
 
+    // 处理名称字段
+    if (name !== undefined && name !== null && name !== '') {
+      const trimmedName = name.toString().trim()
+      if (trimmedName.length === 0) {
+        return res.status(400).json({ error: 'API Key name cannot be empty' })
+      }
+      if (trimmedName.length > 100) {
+        return res.status(400).json({ error: 'API Key name must be less than 100 characters' })
+      }
+      updates.name = trimmedName
+    }
+
     if (tokenLimit !== undefined && tokenLimit !== null && tokenLimit !== '') {
       if (!Number.isInteger(Number(tokenLimit)) || Number(tokenLimit) < 0) {
         return res.status(400).json({ error: 'Token limit must be a non-negative integer' })
diff --git a/web/admin-spa/src/components/apikeys/EditApiKeyModal.vue b/web/admin-spa/src/components/apikeys/EditApiKeyModal.vue
index 1484f41a..c84aeb37 100644
--- a/web/admin-spa/src/components/apikeys/EditApiKeyModal.vue
+++ b/web/admin-spa/src/components/apikeys/EditApiKeyModal.vue
@@ -33,12 +33,16 @@
               >名称</label
             >
             <input
-              class="form-input w-full cursor-not-allowed bg-gray-100 text-sm dark:border-gray-600 dark:bg-gray-800 dark:text-gray-400"
-              disabled
+              v-model="form.name"
+              class="form-input w-full text-sm dark:border-gray-600 dark:bg-gray-700 dark:text-gray-200 dark:placeholder-gray-400"
+              maxlength="100"
+              placeholder="请输入API Key名称"
+              required
               type="text"
-              :value="form.name"
             />
-            <p class="mt-1 text-xs text-gray-500 dark:text-gray-400 sm:mt-2">名称不可修改</p>
+            <p class="mt-1 text-xs text-gray-500 dark:text-gray-400 sm:mt-2">
+              用于识别此 API Key 的用途
+            </p>
           </div>
 
           <!-- 所有者选择 -->
@@ -798,6 +802,7 @@ const updateApiKey = async () => {
   try {
     // 准备提交的数据
     const data = {
+      name: form.name, // 添加名称字段
       tokenLimit: 0, // 清除历史token限制
       rateLimitWindow:
         form.rateLimitWindow !== '' && form.rateLimitWindow !== null
diff --git a/web/admin-spa/src/views/ApiKeysView.vue b/web/admin-spa/src/views/ApiKeysView.vue
index d1c36f59..20e48a7a 100644
--- a/web/admin-spa/src/views/ApiKeysView.vue
+++ b/web/admin-spa/src/views/ApiKeysView.vue
@@ -105,7 +105,7 @@
                   <input
                     v-model="searchKeyword"
                     class="w-full rounded-lg border border-gray-200 bg-white px-3 py-2 pl-9 text-sm text-gray-700 placeholder-gray-400 shadow-sm transition-all duration-200 hover:border-gray-300 focus:border-cyan-500 focus:outline-none focus:ring-2 focus:ring-cyan-500/20 dark:border-gray-600 dark:bg-gray-800 dark:text-gray-200 dark:placeholder-gray-500 dark:hover:border-gray-500"
-                    placeholder="搜索名称或所有者..."
+                    :placeholder="isLdapEnabled ? '搜索名称或所有者...' : '搜索名称...'"
                     type="text"
                     @input="currentPage = 1"
                   />
@@ -405,7 +405,10 @@
                             </div>
                           </div>
                           <!-- 显示所有者信息 -->
-                          <div v-if="key.ownerDisplayName" class="mt-1 text-xs text-red-600">
+                          <div
+                            v-if="isLdapEnabled && key.ownerDisplayName"
+                            class="mt-1 text-xs text-red-600"
+                          >
                             <i class="fas fa-user mr-1" />
                             {{ key.ownerDisplayName }}
                           </div>
@@ -1031,7 +1034,7 @@
                   使用共享池
                 </div>
                 <!-- 显示所有者信息 -->
-                <div v-if="key.ownerDisplayName" class="text-xs text-red-600">
+                <div v-if="isLdapEnabled && key.ownerDisplayName" class="text-xs text-red-600">
                   <i class="fas fa-user mr-1" />
                   {{ key.ownerDisplayName }}
                 </div>
@@ -1337,6 +1340,7 @@
                       名称
                     </th>
                     <th
+                      v-if="isLdapEnabled"
                       class="w-[15%] min-w-[120px] px-3 py-4 text-left text-xs font-bold uppercase tracking-wider text-gray-700 dark:text-gray-300"
                     >
                       创建者
@@ -1393,7 +1397,7 @@
                         </div>
                       </div>
                     </td>
-                    <td class="px-3 py-4">
+                    <td v-if="isLdapEnabled" class="px-3 py-4">
                       <div class="text-sm">
                         <span v-if="key.createdBy === 'admin'" class="text-blue-600">
                           <i class="fas fa-user-shield mr-1" />
@@ -1555,6 +1559,7 @@ import { ref, computed, onMounted, watch } from 'vue'
 import { showToast } from '@/utils/toast'
 import { apiClient } from '@/config/api'
 import { useClientsStore } from '@/stores/clients'
+import { useAuthStore } from '@/stores/auth'
 import CreateApiKeyModal from '@/components/apikeys/CreateApiKeyModal.vue'
 import EditApiKeyModal from '@/components/apikeys/EditApiKeyModal.vue'
 import RenewApiKeyModal from '@/components/apikeys/RenewApiKeyModal.vue'
@@ -1568,8 +1573,12 @@ import CustomDropdown from '@/components/common/CustomDropdown.vue'
 
 // 响应式数据
 const clientsStore = useClientsStore()
+const authStore = useAuthStore()
 const apiKeys = ref([])
 
+// 获取 LDAP 启用状态
+const isLdapEnabled = computed(() => authStore.oemSettings?.ldapEnabled || false)
+
 // 多选相关状态
 const selectedApiKeys = ref([])
 const selectAllChecked = ref(false)
@@ -1663,11 +1672,15 @@ const sortedApiKeys = computed(() => {
     filteredKeys = filteredKeys.filter((key) => {
       // 搜索API Key名称
       const nameMatch = key.name && key.name.toLowerCase().includes(keyword)
-      // 搜索所有者名称
-      const ownerMatch =
-        key.ownerDisplayName && key.ownerDisplayName.toLowerCase().includes(keyword)
-      // 如果API Key名称或所有者名称匹配，则包含该条目
-      return nameMatch || ownerMatch
+      // 如果启用了 LDAP，搜索所有者名称
+      if (isLdapEnabled.value) {
+        const ownerMatch =
+          key.ownerDisplayName && key.ownerDisplayName.toLowerCase().includes(keyword)
+        // 如果API Key名称或所有者名称匹配，则包含该条目
+        return nameMatch || ownerMatch
+      }
+      // 未启用 LDAP 时只搜索名称
+      return nameMatch
     })
   }