7x31
/
anylink
mirror of https://github.com/bjdgyc/anylink.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修复防爆功能并发的问题

This commit is contained in:
wsczx 2024-11-09 00:12:26 +08:00
parent c7d6a76759
commit ffb7dbfb1c
4 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/admin/lockmanager.go
View File

@ -2,7 +2,6 @@ package admin
import (
"encoding/json"
"fmt"
"io"
"net"
"net/http"
@ -89,7 +88,7 @@ func UnlockUser(w http.ResponseWriter, r *http.Request) {
}
if lockinfo.State == nil {
RespError(w, RespInternalErr, fmt.Errorf("未找到锁定用户！"))
RespError(w, RespInternalErr, "未找到锁定用户！")
return
}
lm := GetLockManager()
@ -111,7 +110,7 @@ func UnlockUser(w http.ResponseWriter, r *http.Request) {
}
if state == nil || !state.Locked {
RespError(w, RespInternalErr, fmt.Errorf("锁定状态未找到或已解锁"))
RespError(w, RespInternalErr, "锁定状态未找到或已解锁")
return
}
@ -238,14 +237,14 @@ func (lm *LockManager) CleanupExpiredLocks() {
defer lm.mu.Unlock()
for ip, state := range lm.ipLocks {
if !lm.CheckLockState(state, now, base.Cfg.GlobalIPLockTime) ||
if !lm.CheckLockState(state, now, base.Cfg.GlobalIPBanResetTime) ||
now.Sub(state.LastAttempt) > time.Duration(base.Cfg.GlobalLockStateExpirationTime)*time.Second {
delete(lm.ipLocks, ip)
}
}
for user, state := range lm.userLocks {
if !lm.CheckLockState(state, now, base.Cfg.GlobalUserLockTime) ||
if !lm.CheckLockState(state, now, base.Cfg.GlobalUserBanResetTime) ||
now.Sub(state.LastAttempt) > time.Duration(base.Cfg.GlobalLockStateExpirationTime)*time.Second {
delete(lm.userLocks, user)
}
@ -253,7 +252,7 @@ func (lm *LockManager) CleanupExpiredLocks() {
for user, ipMap := range lm.ipUserLocks {
for ip, state := range ipMap {
if !lm.CheckLockState(state, now, base.Cfg.LockTime) ||
if !lm.CheckLockState(state, now, base.Cfg.BanResetTime) ||
now.Sub(state.LastAttempt) > time.Duration(base.Cfg.GlobalLockStateExpirationTime)*time.Second {
delete(ipMap, ip)
if len(ipMap) == 0 {

6
server/handler/antiBruteForce.go
View File

@ -14,8 +14,6 @@ import (
var lockManager = admin.GetLockManager()
const loginStatusKey = "login_status"
// 防爆破中间件
func antiBruteForce(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@ -96,7 +94,7 @@ func antiBruteForce(next http.Handler) http.Handler {
next.ServeHTTP(w, r)
// 检查登录状态
Status, _ := lockManager.LoginStatus.Load(loginStatusKey)
Status, _ := lockManager.LoginStatus.Load(cr.SessionId)
loginStatus, _ := Status.(bool)
// 更新用户登录状态
@ -105,6 +103,6 @@ func antiBruteForce(next http.Handler) http.Handler {
lockManager.UpdateUserIPLock(username, ip, now, loginStatus)
// 清除登录状态
lockManager.LoginStatus.Delete(loginStatusKey)
lockManager.LoginStatus.Delete(cr.SessionId)
})
}

14
server/handler/link_auth.go
View File

@ -94,7 +94,7 @@ func LinkAuth(w http.ResponseWriter, r *http.Request) {
// TODO 用户密码校验
err = dbdata.CheckUser(cr.Auth.Username, cr.Auth.Password, cr.GroupSelect)
if err != nil {
lockManager.LoginStatus.Store(loginStatusKey, false) // 记录登录失败状态
lockManager.LoginStatus.Store(cr.SessionId, false) // 记录登录失败状态
base.Warn(err, r.RemoteAddr)
ua.Info = err.Error()
ua.Status = dbdata.UserAuthFail
@ -119,18 +119,12 @@ func LinkAuth(w http.ResponseWriter, r *http.Request) {
}
// 用户otp验证
if !v.DisableOtp {
lockManager.LoginStatus.Store(loginStatusKey, true) // 重置OTP验证计数
sessionID, err := GenerateSessionID()
if err != nil {
base.Error("Failed to generate session ID: ", err)
http.Error(w, "Failed to generate session ID", http.StatusInternalServerError)
return
}
lockManager.LoginStatus.Store(cr.SessionId, true) // 重置OTP验证计数
sessionData.ClientRequest.Auth.OtpSecret = v.OtpSecret
SessStore.SaveAuthSession(sessionID, sessionData)
SessStore.SaveAuthSession(cr.SessionId, sessionData)
SetCookie(w, "auth-session-id", sessionID, 0)
SetCookie(w, "auth-session-id", cr.SessionId, 0)
data := RequestData{}
w.WriteHeader(http.StatusOK)

22
server/handler/link_auth_otp.go
View File

@ -11,7 +11,6 @@ import (
"github.com/bjdgyc/anylink/base"
"github.com/bjdgyc/anylink/dbdata"
"github.com/bjdgyc/anylink/pkg/utils"
"github.com/bjdgyc/anylink/sessdata"
)
@ -66,14 +65,14 @@ func (s *SessionStore) DeleteAuthSession(sessionID string) {
// return int(newI)
// }
func GenerateSessionID() (string, error) {
sessionID := utils.RandomRunes(32)
if sessionID == "" {
return "", fmt.Errorf("failed to generate session ID")
}
// func GenerateSessionID() (string, error) {
// sessionID := utils.RandomRunes(32)
// if sessionID == "" {
// return "", fmt.Errorf("failed to generate session ID")
// }
return sessionID, nil
}
// return sessionID, nil
// }
func SetCookie(w http.ResponseWriter, name, value string, maxAge int) {
cookie := &http.Cookie{
@ -109,11 +108,12 @@ func DeleteCookie(w http.ResponseWriter, name string) {
http.SetCookie(w, cookie)
}
func CreateSession(w http.ResponseWriter, r *http.Request, authSession *AuthSession) {
lockManager.LoginStatus.Store(loginStatusKey, true) // 更新登录成功状态
cr := authSession.ClientRequest
ua := authSession.UserActLog
lockManager.LoginStatus.Store(cr.SessionId, true) // 更新登录成功状态
lockManager.LoginStatus.Delete(cr.SessionId) // 清除登录状态
sess := sessdata.NewSession("")
sess.Username = cr.Auth.Username
sess.Group = cr.GroupSelect
@ -201,7 +201,7 @@ func LinkAuth_otp(w http.ResponseWriter, r *http.Request) {
// http.Error(w, "TooManyError, please login again", http.StatusBadRequest)
// return
// }
lockManager.LoginStatus.Store(loginStatusKey, false) // 记录登录失败状态
lockManager.LoginStatus.Store(cr.SessionId, false) // 记录登录失败状态
base.Warn("OTP 动态码错误", username, r.RemoteAddr)
ua.Info = "OTP 动态码错误"