diff --git a/frontend/src/locales/en.ts b/frontend/src/locales/en.ts index d6ccafb..c077f45 100644 --- a/frontend/src/locales/en.ts +++ b/frontend/src/locales/en.ts @@ -150,8 +150,9 @@ export default { selectUserAndIp: 'Please select a user and fill in at least one IP address', confirmDeleteReservation: 'Delete this reservation?', kick: 'Kick', - confirmKick: 'Disconnect all VPN connections for user {username}?', + confirmKick: 'Disconnect all VPN connections for user {username} and disable their account?', kickFailed: 'Failed to kick user', + cannotKickSelf: 'Cannot kick yourself. To disconnect your own devices, please change your password.', }, footer: { lastCommit: 'Last commit', diff --git a/frontend/src/locales/zh.ts b/frontend/src/locales/zh.ts index 1a3c808..dec89d1 100644 --- a/frontend/src/locales/zh.ts +++ b/frontend/src/locales/zh.ts @@ -149,8 +149,9 @@ export default { selectUserAndIp: '请选择用户并至少填写一个 IP 地址', confirmDeleteReservation: '确认删除该预留?', kick: '踢下线', - confirmKick: '确定要断开用户 {username} 的所有 VPN 连接吗?', + confirmKick: '确定要断开用户 {username} 的所有 VPN 连接并禁用其账号吗?', kickFailed: '踢下线失败', + cannotKickSelf: '不能踢自己下线,如需断开自己的设备请修改密码', }, footer: { lastCommit: '最后提交', diff --git a/frontend/src/views/AdminView.vue b/frontend/src/views/AdminView.vue index c930316..66e9929 100644 --- a/frontend/src/views/AdminView.vue +++ b/frontend/src/views/AdminView.vue @@ -83,8 +83,12 @@ async function fetchVpnStatus() { } async function handleKick(userId: number, username: string) { - if (!confirm(t('vpn.confirmKick', { username }))) return kickError.value = '' + if (userId === authStore.user?.id) { + kickError.value = t('vpn.cannotKickSelf') + return + } + if (!confirm(t('vpn.confirmKick', { username }))) return try { const res = await fetch(`/api/admin/vpn/clients/${userId}`, { method: 'DELETE', diff --git a/internal/handler/vpn.go b/internal/handler/vpn.go index 148bd92..10af5db 100644 --- a/internal/handler/vpn.go +++ b/internal/handler/vpn.go @@ -421,11 +421,19 @@ func KickUserClient(c *gin.Context) { return } - if vpn.VPN == nil || !vpn.VPN.Running() { - c.JSON(http.StatusOK, gin.H{"message": "VPN 服务未运行", "kicked": 0}) + currentUserID, _ := c.Get("user_id") + if uint(id) == currentUserID.(uint) { + c.JSON(http.StatusBadRequest, gin.H{"error": "不能踢自己下线,如需断开自己的设备请修改密码"}) return } - n := vpn.VPN.KickUser(uint(id)) - c.JSON(http.StatusOK, gin.H{"message": "已断开用户连接", "kicked": n}) + n := 0 + if vpn.VPN != nil && vpn.VPN.Running() { + n = vpn.VPN.KickUser(uint(id)) + } + + db.DB.Model(&user).Update("status", 0) + db.DB.Model(&model.Session{}).Where("user_id = ?", id).Update("invalid", true) + + c.JSON(http.StatusOK, gin.H{"message": "已断开用户连接并禁用账号", "kicked": n}) }