yml/hfb_sys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

后台登陆验证码

Browse Source
This commit is contained in:
yml
2026-05-22 17:20:47 +08:00
parent 6edee641fb
commit 7df557d668
12 changed files with 218 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/internal/modules/adminauth/dto.go
+10 -2
View File
@@ -15,11 +15,19 @@ type AdminDTO struct {
}
type LoginRequest struct {
Username string `json:"username" binding:"required"`
Password string `json:"password" binding:"required"`
Username string `json:"username" binding:"required"`
Password string `json:"password" binding:"required"`
CaptchaID string `json:"captcha_id" binding:"required"`
CaptchaCode string `json:"captcha_code" binding:"required"`
}
type LoginResult struct {
Admin AdminDTO `json:"admin"`
Tokens auth.TokenPair `json:"tokens"`
}
type CaptchaDTO struct {
CaptchaID string `json:"captcha_id"`
Image string `json:"image"`
ExpiresIn int64 `json:"expires_in"`
}
backend/internal/modules/adminauth/handler.go
+13 -2
View File
@@ -19,13 +19,22 @@ func NewHandler(service *Service) *Handler {
return &Handler{service: service}
}
func (h *Handler) Captcha(c *gin.Context) {
item, err := h.service.Captcha()
if err != nil {
writeAdminAuthError(c, err)
return
}
response.OK(c, item)
}
func (h *Handler) Login(c *gin.Context) {
var req LoginRequest
if err := c.ShouldBindJSON(&req); err != nil {
response.BadRequest(c, "用户名和密码不能为空")
response.BadRequest(c, "用户名、密码和验证码不能为空")
return
}
result, err := h.service.Login(strings.TrimSpace(req.Username), req.Password)
result, err := h.service.Login(strings.TrimSpace(req.Username), req.Password, strings.TrimSpace(req.CaptchaID), strings.TrimSpace(req.CaptchaCode))
if err != nil {
writeAdminAuthError(c, err)
return
@@ -62,6 +71,8 @@ func writeAdminAuthError(c *gin.Context, err error) {
response.ServiceUnavailable(c, "数据库未连接")
case errors.Is(err, ErrInvalidCredential):
response.BadRequest(c, "用户名或密码错误")
case errors.Is(err, ErrCaptchaInvalid):
response.BadRequest(c, "验证码错误或已过期")
case errors.Is(err, ErrAdminDisabled):
response.Error(c, http.StatusForbidden, "admin_disabled", "管理员已禁用")
default:
backend/internal/modules/adminauth/repository.go
+97 -5
View File
@@ -1,12 +1,20 @@
package adminauth
import (
"context"
"crypto/rand"
"encoding/base64"
"errors"
"fmt"
"html"
"math/big"
"strings"
"time"
"hfb_sys/backend/internal/model"
"hfb_sys/backend/internal/modules/auth"
"github.com/redis/go-redis/v9"
"golang.org/x/crypto/bcrypt"
"gorm.io/gorm"
)
@@ -14,18 +22,46 @@ import (
const (
defaultAdminUsername = "admin"
defaultAdminPassword = "admin123456"
captchaTTL = 3 * time.Minute
)
type Repository struct {
db *gorm.DB
jwt *auth.JWTManager
db *gorm.DB
redis *redis.Client
jwt *auth.JWTManager
}
func NewRepository(db *gorm.DB, jwt *auth.JWTManager) *Repository {
return &Repository{db: db, jwt: jwt}
func NewRepository(db *gorm.DB, redis *redis.Client, jwt *auth.JWTManager) *Repository {
return &Repository{db: db, redis: redis, jwt: jwt}
}
func (r *Repository) Login(username string, password string) (LoginResult, error) {
func (r *Repository) Captcha() (*CaptchaDTO, error) {
if r.redis == nil {
return nil, ErrDependencyUnavailable
}
captchaID, err := randomToken(16)
if err != nil {
return nil, err
}
code, err := randomCaptchaCode(4)
if err != nil {
return nil, err
}
ctx := context.Background()
if err := r.redis.Set(ctx, captchaKey(captchaID), strings.ToUpper(code), captchaTTL).Err(); err != nil {
return nil, err
}
return &CaptchaDTO{
CaptchaID: captchaID,
Image: captchaImageDataURL(code),
ExpiresIn: int64(captchaTTL.Seconds()),
}, nil
}
func (r *Repository) Login(username string, password string, captchaID string, captchaCode string) (LoginResult, error) {
if err := r.verifyCaptcha(captchaID, captchaCode); err != nil {
return LoginResult{}, err
}
if err := r.ensureDefaultAdmin(); err != nil {
return LoginResult{}, err
}
@@ -54,6 +90,26 @@ func (r *Repository) Login(username string, password string) (LoginResult, error
return LoginResult{Admin: toDTO(admin), Tokens: tokens}, nil
}
func (r *Repository) verifyCaptcha(captchaID string, captchaCode string) error {
if r.redis == nil {
return ErrDependencyUnavailable
}
ctx := context.Background()
key := captchaKey(captchaID)
stored, err := r.redis.Get(ctx, key).Result()
if errors.Is(err, redis.Nil) {
return ErrCaptchaInvalid
}
if err != nil {
return err
}
_ = r.redis.Del(ctx, key).Err()
if strings.ToUpper(strings.TrimSpace(captchaCode)) != stored {
return ErrCaptchaInvalid
}
return nil
}
func (r *Repository) FindByID(id uint64) (*AdminDTO, error) {
var admin model.AdminUser
if err := r.db.First(&admin, id).Error; err != nil {
@@ -96,3 +152,39 @@ func toDTO(admin model.AdminUser) AdminDTO {
LastLoginAt: admin.LastLoginAt,
}
}
func captchaKey(id string) string {
return "admin:captcha:" + id
}
func randomToken(length int) (string, error) {
buf := make([]byte, length)
if _, err := rand.Read(buf); err != nil {
return "", err
}
return base64.RawURLEncoding.EncodeToString(buf), nil
}
func randomCaptchaCode(length int) (string, error) {
const alphabet = "23456789ABCDEFGHJKLMNPQRSTUVWXYZ"
result := make([]byte, length)
for i := range result {
n, err := rand.Int(rand.Reader, big.NewInt(int64(len(alphabet))))
if err != nil {
return "", err
}
result[i] = alphabet[n.Int64()]
}
return string(result), nil
}
func captchaImageDataURL(code string) string {
safeCode := html.EscapeString(strings.ToUpper(code))
svg := fmt.Sprintf(`<svg xmlns="http://www.w3.org/2000/svg" width="132" height="44" viewBox="0 0 132 44">
<rect width="132" height="44" rx="8" fill="#eef5f7"/>
<path d="M8 32 C32 2, 62 52, 124 12" stroke="#0f766e" stroke-width="2" fill="none" opacity=".28"/>
<path d="M10 13 C42 42, 86 0, 122 31" stroke="#2563eb" stroke-width="2" fill="none" opacity=".22"/>
<text x="66" y="29" text-anchor="middle" font-family="Menlo,Consolas,monospace" font-size="24" font-weight="700" letter-spacing="4" fill="#111827">%s</text>
</svg>`, safeCode)
return "data:image/svg+xml;base64," + base64.StdEncoding.EncodeToString([]byte(svg))
}
backend/internal/modules/adminauth/service.go
+11 -3
View File
@@ -5,6 +5,7 @@ import "errors"
var (
ErrDependencyUnavailable = errors.New("dependency unavailable")
ErrInvalidCredential = errors.New("invalid credential")
ErrCaptchaInvalid = errors.New("captcha invalid")
ErrAdminDisabled = errors.New("admin disabled")
)
@@ -16,14 +17,21 @@ func NewService(repo *Repository) *Service {
return &Service{repo: repo}
}
func (s *Service) Login(username string, password string) (LoginResult, error) {
func (s *Service) Captcha() (*CaptchaDTO, error) {
if s.repo == nil {
return nil, ErrDependencyUnavailable
}
return s.repo.Captcha()
}
func (s *Service) Login(username string, password string, captchaID string, captchaCode string) (LoginResult, error) {
if s.repo == nil {
return LoginResult{}, ErrDependencyUnavailable
}
if username == "" || password == "" {
if username == "" || password == "" || captchaID == "" || captchaCode == "" {
return LoginResult{}, ErrInvalidCredential
}
return s.repo.Login(username, password)
return s.repo.Login(username, password, captchaID, captchaCode)
}
func (s *Service) Me(adminID uint64) (*AdminDTO, error) {