- 内置 SSH 终端(/terminal):复用已保存的 SSH 密码/私钥与独立 known_hosts 校验 - 终端二次认证、会话审计(/terminal/audits)、录像审计与常用命令 - DDNS 服务商名称与自定义 IP,新增迁移 037/038/039 - CHANGELOG 与 VERSION 更新至 2.0.0
This commit is contained in:
@@ -135,6 +135,39 @@ func (s *Service) AdminIDForSession(ctx context.Context, sessionID string) (int,
|
||||
return adminID, nil
|
||||
}
|
||||
|
||||
// AdminUsername 反查管理员用户名:审计记录要写清「谁」操作的。
|
||||
func (s *Service) AdminUsername(ctx context.Context, adminID int) (string, error) {
|
||||
var username string
|
||||
err := s.db.QueryRowContext(ctx, `SELECT username FROM admins WHERE id = ?`, adminID).Scan(&username)
|
||||
if err != nil {
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return "", ErrUnauthorized
|
||||
}
|
||||
return "", err
|
||||
}
|
||||
return username, nil
|
||||
}
|
||||
|
||||
// VerifyPassword 校验管理员密码,供终端二次认证使用。
|
||||
// 复用登录密码的 bcrypt hash,不新增任何存储;密码本身不落日志、不落盘。
|
||||
func (s *Service) VerifyPassword(ctx context.Context, adminID int, password string) error {
|
||||
if adminID <= 0 || password == "" {
|
||||
return ErrUnauthorized
|
||||
}
|
||||
var hash string
|
||||
err := s.db.QueryRowContext(ctx, `SELECT password_hash FROM admins WHERE id = ?`, adminID).Scan(&hash)
|
||||
if err != nil {
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return ErrUnauthorized
|
||||
}
|
||||
return err
|
||||
}
|
||||
if err := bcrypt.CompareHashAndPassword([]byte(hash), []byte(password)); err != nil {
|
||||
return ErrUnauthorized
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *Service) ChangePassword(ctx context.Context, adminID int, oldPassword, newPassword, keepSessionID string) error {
|
||||
if err := validate.Password(newPassword); err != nil {
|
||||
return err
|
||||
|
||||
@@ -2,6 +2,7 @@ package auth
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"log/slog"
|
||||
"os"
|
||||
"path/filepath"
|
||||
@@ -10,6 +11,45 @@ import (
|
||||
"github.com/havline/havline/internal/db"
|
||||
)
|
||||
|
||||
// TestVerifyPassword:终端二次认证依赖的密码校验——对的放行,错的与不存在的账号都拒绝。
|
||||
func TestVerifyPassword(t *testing.T) {
|
||||
conn, err := db.Open(filepath.Join(t.TempDir(), "havline.db"))
|
||||
if err != nil {
|
||||
t.Fatalf("open db: %v", err)
|
||||
}
|
||||
defer conn.Close()
|
||||
if err := db.Migrate(context.Background(), conn, filepath.Join("..", "..", "migrations")); err != nil {
|
||||
t.Fatalf("migrate: %v", err)
|
||||
}
|
||||
|
||||
ctx := context.Background()
|
||||
svc := New(conn)
|
||||
if err := svc.Setup(ctx, "admin", "admin-password-123"); err != nil {
|
||||
t.Fatalf("setup: %v", err)
|
||||
}
|
||||
sessionID, err := svc.Login(ctx, "admin", "admin-password-123")
|
||||
if err != nil {
|
||||
t.Fatalf("login: %v", err)
|
||||
}
|
||||
adminID, err := svc.AdminIDForSession(ctx, sessionID)
|
||||
if err != nil {
|
||||
t.Fatalf("admin id: %v", err)
|
||||
}
|
||||
|
||||
if err := svc.VerifyPassword(ctx, adminID, "admin-password-123"); err != nil {
|
||||
t.Fatalf("正确密码应当通过:%v", err)
|
||||
}
|
||||
if err := svc.VerifyPassword(ctx, adminID, "admin-password-124"); !errors.Is(err, ErrUnauthorized) {
|
||||
t.Fatalf("错误密码应当拒绝,实际 %v", err)
|
||||
}
|
||||
if err := svc.VerifyPassword(ctx, adminID, ""); !errors.Is(err, ErrUnauthorized) {
|
||||
t.Fatalf("空密码应当拒绝,实际 %v", err)
|
||||
}
|
||||
if err := svc.VerifyPassword(ctx, 9999, "admin-password-123"); !errors.Is(err, ErrUnauthorized) {
|
||||
t.Fatalf("不存在的账号应当拒绝,实际 %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestEnsureDefaultAdminCreatesOnce(t *testing.T) {
|
||||
conn, err := db.Open(filepath.Join(t.TempDir(), "havline.db"))
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user