完善证书管理与初始化流程
This commit is contained in:
1 parent
07636abe44
commit
c74372284a
84 files changed
+10151
-3502
No files matched your search
@@ -0,0 +1,42 @@
|
||||
package auth
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"net/mail"
|
||||
"strings"
|
||||
)
|
||||
|
||||
var ErrInvalidIdentifier = errors.New("登录标识无效")
|
||||
var ErrInvalidCredentials = errors.New("账号或密码错误")
|
||||
|
||||
// NormalizeIdentifier 将用户名或邮箱统一为可比较的登录标识。
|
||||
func NormalizeIdentifier(identifier string) (string, error) {
|
||||
identifier = strings.TrimSpace(identifier)
|
||||
if identifier == "" || strings.ContainsAny(identifier, "\r\n") {
|
||||
return "", ErrInvalidIdentifier
|
||||
}
|
||||
if !strings.Contains(identifier, "@") {
|
||||
return strings.ToLower(identifier), nil
|
||||
}
|
||||
identifier = strings.ToLower(identifier)
|
||||
parsed, err := mail.ParseAddress(identifier)
|
||||
if err != nil || parsed.Address != identifier || parsed.Name != "" {
|
||||
return "", ErrInvalidIdentifier
|
||||
}
|
||||
parts := strings.Split(identifier, "@")
|
||||
if len(parts) != 2 || parts[0] == "" || parts[1] == "" {
|
||||
return "", ErrInvalidIdentifier
|
||||
}
|
||||
return identifier, nil
|
||||
}
|
||||
|
||||
// IsMatch 判断登录标识是否匹配指定的用户名或绑定邮箱。
|
||||
func IsMatch(identifier, username, email string) bool {
|
||||
normalized, err := NormalizeIdentifier(identifier)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
username = strings.ToLower(strings.TrimSpace(username))
|
||||
email = strings.ToLower(strings.TrimSpace(email))
|
||||
return normalized == username || (email != "" && normalized == email)
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
package auth
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"strings"
|
||||
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
)
|
||||
|
||||
const dummyPasswordHash = "$2a$10$N9qo8uLOickgx2ZMRZoMyeIjZAgcfl7p92ldGxad68LJZdL17lhWy"
|
||||
|
||||
type AdminAccount struct {
|
||||
Username string
|
||||
Email string
|
||||
Role string
|
||||
}
|
||||
|
||||
// AuthenticateAdmin 统一执行用户名或邮箱登录,并只返回后端确认的真实权限。
|
||||
func AuthenticateAdmin(identifier, password, username, email, passwordHash string) (AdminAccount, error) {
|
||||
matched := IsMatch(identifier, username, email)
|
||||
if !matched || strings.TrimSpace(password) == "" || len([]byte(password)) > 256 {
|
||||
_ = bcrypt.CompareHashAndPassword([]byte(dummyPasswordHash), []byte(password))
|
||||
return AdminAccount{}, ErrInvalidCredentials
|
||||
}
|
||||
if err := bcrypt.CompareHashAndPassword([]byte(passwordHash), []byte(password)); err != nil {
|
||||
return AdminAccount{}, ErrInvalidCredentials
|
||||
}
|
||||
return AdminAccount{
|
||||
Username: strings.TrimSpace(username),
|
||||
Email: strings.TrimSpace(email),
|
||||
Role: "super_admin",
|
||||
}, nil
|
||||
}
|
||||
|
||||
func IsInvalidCredentials(err error) bool {
|
||||
return errors.Is(err, ErrInvalidCredentials)
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
package auth
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
)
|
||||
|
||||
func TestNormalizeIdentifier(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
input string
|
||||
expected string
|
||||
shouldErr bool
|
||||
}{
|
||||
{name: "username", input: " Admin ", expected: "admin"},
|
||||
{name: "email", input: " Admin@Example.COM ", expected: "admin@example.com"},
|
||||
{name: "display name rejected", input: "Admin <admin@example.com>", shouldErr: true},
|
||||
{name: "line break rejected", input: "admin\n@example.com", shouldErr: true},
|
||||
}
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
actual, err := NormalizeIdentifier(test.input)
|
||||
if test.shouldErr {
|
||||
if err == nil {
|
||||
t.Fatal("应拒绝无效登录标识")
|
||||
}
|
||||
return
|
||||
}
|
||||
if err != nil || actual != test.expected {
|
||||
t.Fatalf("登录标识归一化结果错误:%q,错误:%v", actual, err)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestAuthenticateAdminByUsernameOrEmail(t *testing.T) {
|
||||
hash, err := bcrypt.GenerateFromPassword([]byte("Password123"), bcrypt.MinCost)
|
||||
if err != nil {
|
||||
t.Fatalf("生成测试密码摘要失败:%v", err)
|
||||
}
|
||||
for _, identifier := range []string{"Admin", "admin@example.com"} {
|
||||
account, err := AuthenticateAdmin(identifier, "Password123", "admin", "admin@example.com", string(hash))
|
||||
if err != nil {
|
||||
t.Fatalf("使用 %s 登录失败:%v", identifier, err)
|
||||
}
|
||||
if account.Role != "super_admin" {
|
||||
t.Fatalf("登录权限错误:%s", account.Role)
|
||||
}
|
||||
}
|
||||
if _, err := AuthenticateAdmin("other@example.com", "Password123", "admin", "admin@example.com", string(hash)); !IsInvalidCredentials(err) {
|
||||
t.Fatalf("未匹配账号时应返回统一认证错误:%v", err)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user