优化

internal/service/security.go

@@ -2,11 +2,22 @@ package service
 
 import (
 	"context"
+	"errors"
 
 	"kra/internal/biz"
 	"kra/internal/service/dto"
 )
 
+type PasswordPolicyError struct{ Err error }
+
+func (e *PasswordPolicyError) Error() string { return e.Err.Error() }
+func (e *PasswordPolicyError) Unwrap() error { return e.Err }
+
+func IsPasswordPolicyError(err error) bool {
+	var policyErr *PasswordPolicyError
+	return errors.As(err, &policyErr)
+}
+
 func securityDTO(v *biz.SecurityConfig) *dto.SecurityConfigResponse {
 	return &dto.SecurityConfigResponse{ID: v.ID, CreatedAt: v.CreatedAt, UpdatedAt: v.UpdatedAt, DeletedAt: nil, CaptchaOpen: v.CaptchaOpen, CaptchaTimeout: v.CaptchaTimeout, KeyLong: v.KeyLong, ImgWidth: v.ImgWidth, ImgHeight: v.ImgHeight, PwdMinLength: v.PwdMinLength, PwdRequireUpper: v.PwdRequireUpper, PwdRequireLower: v.PwdRequireLower, PwdRequireDigit: v.PwdRequireDigit, PwdRequireSpecial: v.PwdRequireSpecial, LimitEnable: v.LimitEnable, LimitWindow: v.LimitWindow, LimitCount: v.LimitCount, LockEnable: v.LockEnable, LockThreshold: v.LockThreshold, LockDuration: v.LockDuration, PwdExpireEnable: v.PwdExpireEnable, PwdExpireDays: v.PwdExpireDays, ForceNewUserChangePassword: v.ForceNewUserChangePassword}
 }
@@ -44,5 +55,8 @@ func (s *SecurityService) ValidatePassword(ctx context.Context, password string)
 	if err != nil {
 		return err
 	}
-	return s.uc.ValidatePassword(cfg, password)
+	if err := s.uc.ValidatePassword(cfg, password); err != nil {
+		return &PasswordPolicyError{Err: err}
+	}
+	return nil
 }