feat: 用户管理列表增加来源字段(auth_source),支持本地/LDAP筛选

This commit is contained in:
hermes-$(hostname) committed 2026-05-29 17:05:56 +00:00
1 parent ac07e6ef38
commit 8384006ae9
5 files changed
+120 -41

No files matched your search

+1
View File
@@ -75,6 +75,7 @@ func Login(c *gin.Context) {
DisplayName: ldapInfo.DisplayName, DisplayName: ldapInfo.DisplayName,
Email: ldapInfo.Email, Email: ldapInfo.Email,
HashedPassword: "-", // LDAP 用户不存本地密码 HashedPassword: "-", // LDAP 用户不存本地密码
AuthSource: "ldap",
Role: defaultRole, Role: defaultRole,
IsActive: &isActive, IsActive: &isActive,
} }
+33 -1
View File
@@ -488,7 +488,39 @@ func BatchImportLDAP(c *gin.Context) {
// POST /api/v1/ldap-config/delete-user // POST /api/v1/ldap-config/delete-user
func DeleteLDAPUser(c *gin.Context) { func DeleteLDAPUser(c *gin.Context) {
c.JSON(http.StatusOK, gin.H{"message": "User deleted (placeholder)"}) var req struct {
DN string `json:"dn" binding:"required"`
}
if err := c.ShouldBindJSON(&req); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"detail": "缺少 dn 参数"})
return
}
var cfg model.LDAPConfig
if err := model.DB.Order("id").First(&cfg).Error; err != nil {
c.JSON(http.StatusBadRequest, gin.H{"detail": "LDAP 配置不存在"})
return
}
conn, err := dialLDAP(&cfg)
if err != nil {
c.JSON(http.StatusBadRequest, gin.H{"detail": "LDAP 连接失败: " + err.Error()})
return
}
defer conn.Close()
adminPw, _ := decryptPassword(cfg.AdminPassword)
if err := conn.Bind(cfg.AdminDN, adminPw); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"detail": "LDAP 管理员绑定失败"})
return
}
if err := conn.Del(ldap.NewDelRequest(req.DN, nil)); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"detail": "删除用户失败: " + err.Error()})
return
}
c.JSON(http.StatusOK, gin.H{"message": "用户已从 LDAP 删除"})
} }
// helper: dial LDAP with config // helper: dial LDAP with config
+1
View File
@@ -16,6 +16,7 @@ type User struct {
Email *string `gorm:"size:100" json:"email"` Email *string `gorm:"size:100" json:"email"`
Phone *string `gorm:"size:20" json:"phone"` Phone *string `gorm:"size:20" json:"phone"`
HashedPassword string `gorm:"size:200;not null" json:"-"` HashedPassword string `gorm:"size:200;not null" json:"-"`
AuthSource string `gorm:"size:20;default:'local'" json:"auth_source"` // local / ldap
Role string `gorm:"size:20;not null" json:"role"` // admin, dba, developer, auditor Role string `gorm:"size:20;not null" json:"role"` // admin, dba, developer, auditor
IsActive *bool `gorm:"default:true" json:"is_active"` IsActive *bool `gorm:"default:true" json:"is_active"`
Preferences *string `gorm:"type:text" json:"preferences"` // JSON: {"theme":"dark","login_style":"split"} Preferences *string `gorm:"type:text" json:"preferences"` // JSON: {"theme":"dark","login_style":"split"}
+54 -37
View File
@@ -78,6 +78,7 @@ export default function LdapConfigPage() {
const [addingUser, setAddingUser] = useState(false); const [addingUser, setAddingUser] = useState(false);
const [deleting, setDeleting] = useState(false); const [deleting, setDeleting] = useState(false);
const [showDeleteConfirm, setShowDeleteConfirm] = useState(false);
/* ── 加载配置 ── */ /* ── 加载配置 ── */
const fetchConfig = useCallback(async () => { const fetchConfig = useCallback(async () => {
@@ -275,11 +276,12 @@ export default function LdapConfigPage() {
/* ── 删除选中用户 ── */ /* ── 删除选中用户 ── */
const handleDeleteSelected = async () => { const handleDeleteSelected = async () => {
if (selectedDns.size === 0) return; if (selectedDns.size === 0) return;
if (!confirm(`确认删除 ${selectedDns.size} 个用户?此操作不可逆!`)) return; setShowDeleteConfirm(true);
};
const confirmDelete = async () => {
setShowDeleteConfirm(false);
setDeleting(true); setDeleting(true);
try {
// 后端需要一个 delete endpoint — 暂时逐个调用
// 先用 delete-user 端点
let ok = 0, fail = 0; let ok = 0, fail = 0;
for (const dn of selectedDns) { for (const dn of selectedDns) {
try { try {
@@ -292,11 +294,7 @@ export default function LdapConfigPage() {
toast(ok > 0 ? 'success' : 'error', `删除完成: 成功 ${ok}, 失败 ${fail}`); toast(ok > 0 ? 'success' : 'error', `删除完成: 成功 ${ok}, 失败 ${fail}`);
setSelectedDns(new Set()); setSelectedDns(new Set());
if (selectedOu) fetchUsers(selectedOu); if (selectedOu) fetchUsers(selectedOu);
} catch (e: any) {
toast('error', e?.response?.data?.detail || '删除失败');
} finally {
setDeleting(false); setDeleting(false);
}
}; };
const toggleManage = () => { const toggleManage = () => {
@@ -744,9 +742,10 @@ export default function LdapConfigPage() {
{/* ── 账号测试弹框 ── */} {/* ── 账号测试弹框 ── */}
{showAccountTest && ( {showAccountTest && (
<ModalOverlay open={true} onClose={() => { setShowAccountTest(false); setAccountResult(null); }} width="w-[440px]"> <ModalOverlay open={true} onClose={() => { setShowAccountTest(false); setAccountResult(null); }} width="max-w-md">
<div className="w-full bg-[var(--dg-bg-secondary)] border border-[var(--dg-border)] rounded-xl p-5 shadow-xl">
{/* 标题 */} {/* 标题 */}
<div className="flex items-center justify-between px-5 py-3.5"> <div className="flex items-center justify-between mb-4">
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<KeyRound className="w-4 h-4 text-blue-400" /> <KeyRound className="w-4 h-4 text-blue-400" />
<h3 className="text-sm font-semibold text-[var(--dg-text-primary)]">账号验证测试</h3> <h3 className="text-sm font-semibold text-[var(--dg-text-primary)]">账号验证测试</h3>
@@ -757,13 +756,13 @@ export default function LdapConfigPage() {
</div> </div>
{/* 表单区 */} {/* 表单区 */}
<div className="px-5 pb-4 space-y-3"> <div className="space-y-3 mb-4">
<div> <div>
<label className="text-xs text-[var(--dg-text-muted)] mb-1 block">用户名</label> <label className="text-xs text-[var(--dg-text-muted)] mb-1 block">用户名</label>
<input <input
value={testUser} value={testUser}
onChange={e => { setTestUser(e.target.value); setAccountResult(null); }} onChange={e => { setTestUser(e.target.value); setAccountResult(null); }}
className="w-full px-3 py-2 bg-[var(--dg-bg-primary)] border border-[var(--dg-border)] rounded-lg text-sm focus:outline-none focus:border-blue-400 transition-colors" className="w-full px-3 py-2 bg-[var(--dg-bg-tertiary)] border border-[var(--dg-border)] rounded-lg text-sm focus:outline-none focus:border-blue-400 transition-colors"
placeholder="LDAP 用户名" placeholder="LDAP 用户名"
/> />
</div> </div>
@@ -773,66 +772,56 @@ export default function LdapConfigPage() {
type="password" type="password"
value={testPass} value={testPass}
onChange={e => { setTestPass(e.target.value); setAccountResult(null); }} onChange={e => { setTestPass(e.target.value); setAccountResult(null); }}
className="w-full px-3 py-2 bg-[var(--dg-bg-primary)] border border-[var(--dg-border)] rounded-lg text-sm focus:outline-none focus:border-blue-400 transition-colors" className="w-full px-3 py-2 bg-[var(--dg-bg-tertiary)] border border-[var(--dg-border)] rounded-lg text-sm focus:outline-none focus:border-blue-400 transition-colors"
placeholder="密码" placeholder="密码"
onKeyDown={e => { if (e.key === 'Enter' && testUser && testPass) handleTestAccount(); }} onKeyDown={e => { if (e.key === 'Enter' && testUser && testPass) handleTestAccount(); }}
/> />
</div> </div>
</div> </div>
{/* 结果区 — 独立视觉层级 */} {/* 结果区 */}
{accountResult && ( {accountResult && (
<div className="mx-5 mb-4"> <div className="mb-4">
{accountResult.ok ? ( {accountResult.ok ? (
/* 成功 */ <div className="rounded-lg bg-emerald-500/12 p-3">
<div className="rounded-lg bg-emerald-500/12 p-4"> <div className="flex items-center gap-2 mb-2">
<div className="flex items-center gap-2 mb-3"> <CheckCircle className="w-4 h-4 text-emerald-400 shrink-0" />
<div className="w-6 h-6 rounded-full bg-emerald-500/25 flex items-center justify-center">
<CheckCircle className="w-4 h-4 text-emerald-400" />
</div>
<span className="text-sm font-medium text-emerald-400">验证通过</span> <span className="text-sm font-medium text-emerald-400">验证通过</span>
</div> </div>
{accountResult.info && ( {accountResult.info && (
<div className="space-y-1.5 pl-8"> <div className="space-y-1 pl-6 max-h-24 overflow-y-auto">
{Object.entries(accountResult.info) {Object.entries(accountResult.info)
.filter(([, v]) => v && String(v).length > 0) .filter(([, v]) => v && String(v).length > 0)
.map(([k, v]) => ( .map(([k, v]) => (
<div key={k} className="flex text-xs gap-2"> <div key={k} className="flex text-xs gap-2">
<span className="text-emerald-400/60 min-w-[48px] shrink-0">{ <span className="text-emerald-400/60 shrink-0">{
k === 'Display Name' ? '姓名' : k === 'Display Name' ? '姓名' :
k === 'Email' ? '邮箱' : k === 'Email' ? '邮箱' :
k === 'User DN' ? 'DN' : k === 'User DN' ? 'DN' :
k === 'User ID' ? '用户名' : k k === 'User ID' ? '用户名' : k
}</span> }</span>
{Array.isArray(v) ? ( <span className="text-emerald-300">{
v.length > 0 ? ( Array.isArray(v) ? v.join(', ') : String(v)
<span className="text-emerald-300"> }</span>
{v.join(', ')}
</span>
) : null
) : <span className="text-emerald-300">{String(v)}</span>}
</div> </div>
))} ))}
</div> </div>
)} )}
</div> </div>
) : ( ) : (
/* 失败 */ <div className="rounded-lg bg-red-500/12 p-3">
<div className="rounded-lg bg-red-500/12 p-4">
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<div className="w-6 h-6 rounded-full bg-red-500/25 flex items-center justify-center"> <XCircle className="w-4 h-4 text-red-400 shrink-0" />
<XCircle className="w-4 h-4 text-red-400" />
</div>
<span className="text-sm font-medium text-red-400">验证失败</span> <span className="text-sm font-medium text-red-400">验证失败</span>
</div> </div>
<p className="text-xs text-red-300/80 mt-2 pl-8">{accountResult.msg}</p> <p className="text-xs text-red-300/80 mt-1 pl-6">{accountResult.msg}</p>
</div> </div>
)} )}
</div> </div>
)} )}
{/* 操作栏 */} {/* 操作栏 */}
<div className="flex justify-end gap-3 px-5 py-3.5"> <div className="flex justify-end gap-2">
<button onClick={() => { setShowAccountTest(false); setAccountResult(null); }} className="px-4 py-2 text-sm text-[var(--dg-text-muted)] hover:text-[var(--dg-text-primary)] transition-colors">关闭</button> <button onClick={() => { setShowAccountTest(false); setAccountResult(null); }} className="px-4 py-2 text-sm text-[var(--dg-text-muted)] hover:text-[var(--dg-text-primary)] transition-colors">关闭</button>
<button <button
onClick={handleTestAccount} onClick={handleTestAccount}
@@ -846,6 +835,34 @@ export default function LdapConfigPage() {
)} )}
</button> </button>
</div> </div>
</div>
</ModalOverlay>
)}
{/* ── 删除确认弹框 ── */}
{showDeleteConfirm && (
<ModalOverlay open={true} onClose={() => setShowDeleteConfirm(false)} width="max-w-sm">
<div className="w-full bg-[var(--dg-bg-secondary)] border border-[var(--dg-border)] rounded-xl p-5 shadow-xl">
<div className="flex items-center justify-between mb-4">
<div className="flex items-center gap-2">
<AlertTriangle className="w-4 h-4 text-red-400" />
<h3 className="text-sm font-semibold text-[var(--dg-text-primary)]">确认删除</h3>
</div>
<button onClick={() => setShowDeleteConfirm(false)} className="text-[var(--dg-text-muted)] hover:text-[var(--dg-text-primary)] transition-colors">✕</button>
</div>
<p className="text-sm text-[var(--dg-text-secondary)] mb-5">
确认删除 <span className="text-red-400 font-medium">{selectedDns.size}</span> 个 LDAP 用户?此操作不可逆。
</p>
<div className="flex justify-end gap-2">
<button onClick={() => setShowDeleteConfirm(false)} className="px-4 py-2 text-sm text-[var(--dg-text-muted)] hover:text-[var(--dg-text-primary)] transition-colors">取消</button>
<button
onClick={confirmDelete}
className="flex items-center gap-1.5 px-4 py-2 text-sm font-medium rounded-lg bg-red-500 text-white hover:bg-red-600 transition-colors"
>
<Trash2 className="w-3.5 h-3.5" />确认删除
</button>
</div>
</div>
</ModalOverlay> </ModalOverlay>
)} )}
</div> </div>
+31 -3
View File
@@ -24,6 +24,7 @@ interface UserItem {
is_active: boolean; is_active: boolean;
created_at: string; created_at: string;
last_login?: string | null; last_login?: string | null;
auth_source?: string; // 'local' | 'ldap'
} }
interface UserActivity { interface UserActivity {
@@ -70,6 +71,12 @@ const statusOptions = [
{ value: 'disabled', label: '禁用' }, { value: 'disabled', label: '禁用' },
]; ];
const sourceOptions = [
{ value: '', label: '全部来源' },
{ value: 'local', label: '本地' },
{ value: 'ldap', label: 'LDAP' },
];
const BATCH_OPTIONS = [ const BATCH_OPTIONS = [
{ key: 'enable', label: '批量启用', icon: UserCheck }, { key: 'enable', label: '批量启用', icon: UserCheck },
{ key: 'disable', label: '批量禁用', icon: UserX }, { key: 'disable', label: '批量禁用', icon: UserX },
@@ -124,6 +131,7 @@ export default function UsersPage() {
const [search, setSearch] = useState(''); const [search, setSearch] = useState('');
const [roleFilter, setRoleFilter] = useState(''); const [roleFilter, setRoleFilter] = useState('');
const [statusFilter, setStatusFilter] = useState(''); const [statusFilter, setStatusFilter] = useState('');
const [sourceFilter, setSourceFilter] = useState('');
const [users, setUsers] = useState<UserItem[]>([]); const [users, setUsers] = useState<UserItem[]>([]);
const [total, setTotal] = useState(0); const [total, setTotal] = useState(0);
const [page, setPage] = useState(1); const [page, setPage] = useState(1);
@@ -159,7 +167,10 @@ export default function UsersPage() {
useEffect(() => { fetchUsers(); }, [fetchUsers]); useEffect(() => { fetchUsers(); }, [fetchUsers]);
const filtered = users; const filtered = users.filter(u => {
if (sourceFilter && u.auth_source !== sourceFilter) return false;
return true;
});
const allSelected = filtered.length > 0 && filtered.every(u => selectedIds.has(u.id)); const allSelected = filtered.length > 0 && filtered.every(u => selectedIds.has(u.id));
@@ -298,9 +309,16 @@ export default function UsersPage() {
> >
{statusOptions.map(s => <option key={s.value} value={s.value}>{s.label}</option>)} {statusOptions.map(s => <option key={s.value} value={s.value}>{s.label}</option>)}
</select> </select>
{(search || roleFilter || statusFilter) && ( <select
className="px-3 py-2.5 bg-[var(--dg-bg-tertiary)] border border-[var(--dg-border)] rounded-lg text-sm focus:border-blue-400 focus:outline-none"
value={sourceFilter}
onChange={e => setSourceFilter(e.target.value)}
>
{sourceOptions.map(s => <option key={s.value} value={s.value}>{s.label}</option>)}
</select>
{(search || roleFilter || statusFilter || sourceFilter) && (
<button <button
onClick={() => { setSearch(''); setRoleFilter(''); setStatusFilter(''); setPage(1); }} onClick={() => { setSearch(''); setRoleFilter(''); setStatusFilter(''); setSourceFilter(''); setPage(1); }}
className="flex items-center gap-1 text-xs text-[var(--dg-text-muted)] hover:text-[var(--dg-text-primary)] transition-colors" className="flex items-center gap-1 text-xs text-[var(--dg-text-muted)] hover:text-[var(--dg-text-primary)] transition-colors"
> >
<RotateCcw className="w-3 h-3" /> 重置 <RotateCcw className="w-3 h-3" /> 重置
@@ -382,6 +400,7 @@ export default function UsersPage() {
<th className="text-left px-4 py-3 font-semibold">邮箱</th> <th className="text-left px-4 py-3 font-semibold">邮箱</th>
<th className="text-left px-4 py-3 font-semibold">最后登录</th> <th className="text-left px-4 py-3 font-semibold">最后登录</th>
<th className="text-left px-4 py-3 font-semibold">状态</th> <th className="text-left px-4 py-3 font-semibold">状态</th>
<th className="text-left px-4 py-3 font-semibold">来源</th>
<th className="text-left px-4 py-3 font-semibold">操作</th> <th className="text-left px-4 py-3 font-semibold">操作</th>
</tr> </tr>
</thead> </thead>
@@ -432,6 +451,15 @@ export default function UsersPage() {
/> />
</button> </button>
</td> </td>
<td className="px-4 py-3.5">
<span className={`inline-flex px-2 py-0.5 rounded text-xs font-medium ${
user.auth_source === 'ldap'
? 'bg-blue-500/15 text-blue-400'
: 'bg-[var(--dg-bg-tertiary)] text-[var(--dg-text-muted)]'
}`}>
{user.auth_source === 'ldap' ? 'LDAP' : '本地'}
</span>
</td>
<td className="px-4 py-3.5"> <td className="px-4 py-3.5">
<div className="flex gap-1.5"> <div className="flex gap-1.5">
<button <button