7x31/anylink
1
0
Fork 0
mirror of https://github.com/bjdgyc/anylink.git synced 2025-08-08 17:06:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #345 from wsczx/dev

Browse Source 
防爆增加前端手动解锁的功能
This commit is contained in:
bjdgyc
2024-10-31 17:30:40 +08:00
committed by GitHub
parent 874b6914e2 9d5b7070d9
commit 6ac4e90901
5 changed files with 160 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
server/admin/lockmanager.go
View File

@@ -97,7 +97,25 @@ func UnlockUser(w http.ResponseWriter, r *http.Request) {
lm.mu.Lock()
defer lm.mu.Unlock()
lm.Unlock(lockinfo.State)
// 根据用户名和IP查找锁定状态
var state *LockState
switch {
case lockinfo.IP == "" && lockinfo.Username != "":
state = lm.userLocks[lockinfo.Username] // 全局用户锁定
case lockinfo.Username != "" && lockinfo.IP != "":
if userIPMap, exists := lm.ipUserLocks[lockinfo.Username]; exists {
state = userIPMap[lockinfo.IP] // 单用户 IP 锁定
}
default:
state = lm.ipLocks[lockinfo.IP] // 全局 IP 锁定
}
if state == nil || !state.Locked {
RespError(w, RespInternalErr, fmt.Errorf("锁定状态未找到或已解锁"))
return
}
lm.Unlock(state)
base.Info("解锁成功:", lockinfo.Description, lockinfo.Username, lockinfo.IP)
RespSucess(w, "解锁成功！")
@@ -110,9 +128,9 @@ func (lm *LockManager) GetLocksInfo() []LockInfo {
defer lm.mu.Unlock()
for ip, state := range lm.ipLocks {
if state.Locked {
if base.Cfg.MaxGlobalIPBanCount > 0 && state.Locked {
info := LockInfo{
Description: "全局 IP 锁定",
Description: "全局IP锁定",
Username: "",
IP: ip,
State: &LockState{
@@ -127,7 +145,7 @@ func (lm *LockManager) GetLocksInfo() []LockInfo {
}
for username, state := range lm.userLocks {
if state.Locked {
if base.Cfg.MaxGlobalUserBanCount > 0 && state.Locked {
info := LockInfo{
Description: "全局用户锁定",
Username: username,
@@ -145,9 +163,9 @@ func (lm *LockManager) GetLocksInfo() []LockInfo {
for username, ipStates := range lm.ipUserLocks {
for ip, state := range ipStates {
if state.Locked {
if base.Cfg.MaxBanCount > 0 && state.Locked {
info := LockInfo{
Description: "单用户 IP 锁定",
Description: "单用户IP锁定",
Username: username,
IP: ip,
State: &LockState{
@@ -205,7 +223,7 @@ func (lm *LockManager) IsWhitelisted(ip string) bool {
}
func (lm *LockManager) StartCleanupTicker() {
lm.cleanupTicker = time.NewTicker(5 * time.Minute)
lm.cleanupTicker = time.NewTicker(1 * time.Minute)
go func() {
for range lm.cleanupTicker.C {
lm.CleanupExpiredLocks()
@@ -220,20 +238,23 @@ func (lm *LockManager) CleanupExpiredLocks() {
defer lm.mu.Unlock()
for ip, state := range lm.ipLocks {
if now.Sub(state.LastAttempt) > time.Duration(base.Cfg.GlobalLockStateExpirationTime)*time.Second {
if !lm.CheckLockState(state, now, base.Cfg.GlobalIPLockTime) ||
now.Sub(state.LastAttempt) > time.Duration(base.Cfg.GlobalLockStateExpirationTime)*time.Second {
delete(lm.ipLocks, ip)
}
}
for user, state := range lm.userLocks {
if now.Sub(state.LastAttempt) > time.Duration(base.Cfg.GlobalLockStateExpirationTime)*time.Second {
if !lm.CheckLockState(state, now, base.Cfg.GlobalUserLockTime) ||
now.Sub(state.LastAttempt) > time.Duration(base.Cfg.GlobalLockStateExpirationTime)*time.Second {
delete(lm.userLocks, user)
}
}
for user, ipMap := range lm.ipUserLocks {
for ip, state := range ipMap {
if now.Sub(state.LastAttempt) > time.Duration(base.Cfg.GlobalLockStateExpirationTime)*time.Second {
if !lm.CheckLockState(state, now, base.Cfg.LockTime) ||
now.Sub(state.LastAttempt) > time.Duration(base.Cfg.GlobalLockStateExpirationTime)*time.Second {
delete(ipMap, ip)
if len(ipMap) == 0 {
delete(lm.ipUserLocks, user)

1
server/admin/server.go
View File

@@ -88,6 +88,7 @@ func StartAdmin() {
r.HandleFunc("/statsinfo/list", StatsInfoList)
r.HandleFunc("/locksinfo/list", GetLocksInfo)
r.HandleFunc("/locksinfo/unlok", UnlockUser)
// pprof
if base.Cfg.Pprof {