开发检查点:保存项目绑定授权与事务审计源码,待统一测试
This commit is contained in:
1 parent
709c1ef063
commit
f38e290b22
10 files changed
+571
-42
No files matched your search
@@ -0,0 +1,32 @@
|
||||
package repository
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"time"
|
||||
)
|
||||
|
||||
// 失败范围由实际域名解析;不存在的资源保留未知范围,不相信请求中的项目或操作者。
|
||||
func (r *SQLProjectMemberRepository) RecordProjectBindingFailure(ctx context.Context, failure ProjectBindingFailure) error {
|
||||
if err := r.ensureDB(); err != nil {
|
||||
return err
|
||||
}
|
||||
if failure.StatusCode < 400 || failure.StatusCode > 599 || len(failure.ActorID) > 128 || len(failure.DomainID) > 128 || len(failure.RequestID) > 128 {
|
||||
return errors.New("项目绑定失败审计参数无效")
|
||||
}
|
||||
result, err := r.db.ExecContext(ctx, Rebind(r.driver, `INSERT INTO audit_logs
|
||||
(action, resource_type, resource_id, status, message, created_at, scope_type, project_id, task_id, operator_id)
|
||||
SELECT 'domain.servers.replace', 'domain', ?, 'failed', ?, ?,
|
||||
CASE WHEN d.id IS NULL THEN 'unknown' ELSE 'project' END, COALESCE(d.project_id, ''), '', ?
|
||||
FROM (SELECT 1 AS marker) audit_event LEFT JOIN domains d ON d.id = ?`),
|
||||
failure.DomainID, fmt.Sprintf("绑定请求被拒绝或执行失败:HTTP %d;请求编号:%s", failure.StatusCode, failure.RequestID),
|
||||
time.Now().UTC(), failure.ActorID, failure.DomainID)
|
||||
if err != nil {
|
||||
return fmt.Errorf("保存项目绑定失败审计失败:%w", err)
|
||||
}
|
||||
if count, err := result.RowsAffected(); err != nil || count != 1 {
|
||||
return errors.New("项目绑定失败审计未写入")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@@ -0,0 +1,191 @@
|
||||
package repository
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"errors"
|
||||
"fmt"
|
||||
"sort"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/deployment"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/domain"
|
||||
)
|
||||
|
||||
const MaxProjectBindingServers = 100
|
||||
|
||||
var ErrProjectBindingInput = errors.New("服务器列表必须明确提供,最多包含 100 个有效服务器标识")
|
||||
|
||||
type ProjectBindingFailure struct {
|
||||
ActorID string
|
||||
DomainID string
|
||||
StatusCode int
|
||||
RequestID string
|
||||
}
|
||||
|
||||
type ProjectBindingRepository interface {
|
||||
ReplaceProjectDomainServers(context.Context, string, string, []string) ([]deployment.Server, error)
|
||||
RecordProjectBindingFailure(context.Context, ProjectBindingFailure) error
|
||||
}
|
||||
|
||||
var _ ProjectBindingRepository = (*SQLProjectMemberRepository)(nil)
|
||||
|
||||
// 绑定变更只负责保存关联,不部署证书、不连接 SSH、不接收客户端的项目归属。
|
||||
func (r *SQLProjectMemberRepository) ReplaceProjectDomainServers(ctx context.Context, actorID, domainID string, serverIDs []string) ([]deployment.Server, error) {
|
||||
if err := r.resourceReaderReady(actorID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if domainID == "" || len(domainID) > 128 {
|
||||
return nil, ErrProjectAccessDenied
|
||||
}
|
||||
if serverIDs == nil || len(serverIDs) > MaxProjectBindingServers {
|
||||
return nil, ErrProjectBindingInput
|
||||
}
|
||||
ids := make([]string, 0, len(serverIDs))
|
||||
seen := make(map[string]bool, len(serverIDs))
|
||||
for _, id := range serverIDs {
|
||||
if id == "" || len(id) > 128 || strings.TrimSpace(id) != id {
|
||||
return nil, ErrProjectBindingInput
|
||||
}
|
||||
if !seen[id] {
|
||||
ids = append(ids, id)
|
||||
seen[id] = true
|
||||
}
|
||||
}
|
||||
// 所有请求按相同次序锁定服务器,降低反向选择时的死锁概率。
|
||||
sort.Strings(ids)
|
||||
tx, err := r.db.BeginTx(ctx, nil)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("开始项目绑定事务失败:%w", err)
|
||||
}
|
||||
defer tx.Rollback()
|
||||
if r.driver == "mysql" {
|
||||
var count int
|
||||
if err := tx.QueryRowContext(ctx, `SELECT COUNT(*) FROM information_schema.tables
|
||||
WHERE table_schema=DATABASE() AND table_name IN
|
||||
('users', 'projects', 'project_members', 'domains', 'servers', 'domain_servers', 'audit_logs')
|
||||
AND engine='InnoDB'`).Scan(&count); err != nil {
|
||||
return nil, fmt.Errorf("检查项目绑定存储失败:%w", err)
|
||||
}
|
||||
if count != 7 {
|
||||
return nil, errors.New("项目绑定及授权审计相关表必须使用 InnoDB")
|
||||
}
|
||||
}
|
||||
var projectID string
|
||||
if err := tx.QueryRowContext(ctx, Rebind(r.driver,
|
||||
`SELECT project_id FROM domains WHERE id = ?`+r.resourceWriteLock()), domainID).Scan(&projectID); err != nil {
|
||||
return nil, projectBindingReadError(err)
|
||||
}
|
||||
if err := r.authorizeBindingTransaction(ctx, tx, actorID, projectID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
items := make([]deployment.Server, 0, len(ids))
|
||||
for _, id := range ids {
|
||||
item, err := scanServer(tx.QueryRowContext(ctx, Rebind(r.driver,
|
||||
serverSelectQualified+` WHERE servers.id = ?`+r.resourceWriteLock()), id))
|
||||
if err != nil {
|
||||
return nil, projectBindingReadError(err)
|
||||
}
|
||||
if item.ProjectID != projectID {
|
||||
return nil, ErrProjectAccessDenied
|
||||
}
|
||||
items = append(items, item)
|
||||
}
|
||||
if _, err := tx.ExecContext(ctx, Rebind(r.driver, `DELETE FROM domain_servers WHERE domain_id = ?`), domainID); err != nil {
|
||||
return nil, fmt.Errorf("清理项目绑定失败:%w", err)
|
||||
}
|
||||
for _, id := range ids {
|
||||
result, err := tx.ExecContext(ctx, Rebind(r.driver,
|
||||
`INSERT INTO domain_servers (domain_id, server_id, project_id) VALUES (?, ?, ?)`), domainID, id, projectID)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("保存项目绑定失败:%w", err)
|
||||
}
|
||||
if count, err := result.RowsAffected(); err != nil || count != 1 {
|
||||
return nil, errors.New("项目绑定未完整写入,已回滚本次变更")
|
||||
}
|
||||
}
|
||||
result, err := tx.ExecContext(ctx, Rebind(r.driver, `INSERT INTO audit_logs
|
||||
(action, resource_type, resource_id, status, message, created_at, scope_type, project_id, task_id, operator_id)
|
||||
VALUES ('domain.servers.replace', 'domain', ?, 'success', ?, ?, 'project', ?, '', ?)`),
|
||||
domainID, fmt.Sprintf("已更新部署服务器绑定,共 %d 台", len(ids)), time.Now().UTC(), projectID, actorID)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("保存项目绑定审计失败:%w", err)
|
||||
}
|
||||
if count, err := result.RowsAffected(); err != nil || count != 1 {
|
||||
return nil, errors.New("项目绑定审计未写入,已回滚本次变更")
|
||||
}
|
||||
if err := tx.Commit(); err != nil {
|
||||
return nil, fmt.Errorf("提交项目绑定失败:%w", err)
|
||||
}
|
||||
sort.Slice(items, func(i, j int) bool {
|
||||
if items[i].Name == items[j].Name {
|
||||
return items[i].ID < items[j].ID
|
||||
}
|
||||
return items[i].Name < items[j].Name
|
||||
})
|
||||
return items, nil
|
||||
}
|
||||
|
||||
func (r *SQLProjectMemberRepository) resourceWriteLock() string {
|
||||
if r.driver == "mysql" || r.driver == "postgres" {
|
||||
return " FOR UPDATE"
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func projectBindingReadError(err error) error {
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return ErrProjectAccessDenied
|
||||
}
|
||||
return fmt.Errorf("读取项目绑定资源失败:%w", err)
|
||||
}
|
||||
|
||||
// 使用事务内的当前读取并持有账户、项目和现有成员行锁,避免撤权或停用后继续写入。
|
||||
// SQLite 使用自身事务串行写入保证;遇到并发升级失败时回滚,不绕过授权重试。
|
||||
func (r *SQLProjectMemberRepository) authorizeBindingTransaction(ctx context.Context, tx *sql.Tx, actorID, projectID string) error {
|
||||
var status, userRole, existingProject string
|
||||
if err := tx.QueryRowContext(ctx, Rebind(r.driver,
|
||||
`SELECT status, role FROM users WHERE id = ?`+r.resourceWriteLock()), actorID).Scan(&status, &userRole); err != nil {
|
||||
return projectBindingReadError(err)
|
||||
}
|
||||
if status != UserStatusActive || (userRole != UserRoleSuperAdmin && userRole != UserRoleAdmin && userRole != UserRoleUser) {
|
||||
return ErrProjectAccessDenied
|
||||
}
|
||||
if err := tx.QueryRowContext(ctx, Rebind(r.driver,
|
||||
`SELECT id FROM projects WHERE id = ?`+r.resourceWriteLock()), projectID).Scan(&existingProject); err != nil {
|
||||
return projectBindingReadError(err)
|
||||
}
|
||||
if userRole == UserRoleSuperAdmin {
|
||||
return nil
|
||||
}
|
||||
rows, err := tx.QueryContext(ctx, Rebind(r.driver,
|
||||
`SELECT role FROM project_members WHERE project_id = ? AND user_id = ? ORDER BY role`+r.resourceWriteLock()), projectID, actorID)
|
||||
if err != nil {
|
||||
return fmt.Errorf("读取绑定操作权限失败:%w", err)
|
||||
}
|
||||
defer rows.Close()
|
||||
permissions := map[domain.ProjectPermission]bool{
|
||||
domain.PermissionCertificateRead: false,
|
||||
domain.PermissionServerRead: false,
|
||||
domain.PermissionDeploymentExecute: false,
|
||||
}
|
||||
for rows.Next() {
|
||||
var role domain.ProjectRole
|
||||
if err := rows.Scan(&role); err != nil {
|
||||
return err
|
||||
}
|
||||
for permission := range permissions {
|
||||
permissions[permission] = permissions[permission] || role.Allows(permission)
|
||||
}
|
||||
}
|
||||
if err := rows.Err(); err != nil {
|
||||
return err
|
||||
}
|
||||
for _, allowed := range permissions {
|
||||
if !allowed {
|
||||
return ErrProjectAccessDenied
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@@ -0,0 +1,124 @@
|
||||
package repository
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"errors"
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// 复用真实资源与六类项目成员夹具;由 SQLite 和隔离 MySQL 入口分别调用。
|
||||
func checkProjectBindings(t *testing.T, db, admin *sql.DB, repo *SQLProjectMemberRepository, driver string) {
|
||||
t.Helper()
|
||||
unchanged := func(t *testing.T) {
|
||||
t.Helper()
|
||||
items, err := NewSQLServerRepository(db, driver).ListServersByDomainID(t.Context(), "domain-a")
|
||||
if err != nil || len(items) != 1 || items[0].ID != "server-a" {
|
||||
t.Fatalf("原绑定未保留:%+v,%v", items, err)
|
||||
}
|
||||
}
|
||||
t.Run("bindings_role_matrix_and_audit", func(t *testing.T) {
|
||||
for _, actor := range []string{"root", "manager", "deploy", "cert", "dns", "audit", "reader", "outsider", "missing"} {
|
||||
items, err := repo.ReplaceProjectDomainServers(t.Context(), actor, "domain-a", []string{"server-a", "server-a"})
|
||||
allowed := actor == "root" || actor == "manager" || actor == "deploy"
|
||||
if !allowed {
|
||||
if !errors.Is(err, ErrProjectAccessDenied) {
|
||||
t.Fatalf("未授权角色仍可写绑定:%s,%v", actor, err)
|
||||
}
|
||||
continue
|
||||
}
|
||||
if err != nil || len(items) != 1 || items[0].ID != "server-a" {
|
||||
t.Fatalf("授权绑定失败或未去重:%s,%+v,%v", actor, items, err)
|
||||
}
|
||||
var count int
|
||||
if err := db.QueryRowContext(t.Context(), Rebind(driver, `SELECT COUNT(*) FROM audit_logs
|
||||
WHERE action='domain.servers.replace' AND status='success' AND project_id='project-a'
|
||||
AND resource_id='domain-a' AND operator_id=?`), actor).Scan(&count); err != nil || count != 1 {
|
||||
t.Fatalf("成功审计范围或操作者错误:%s,%d,%v", actor, count, err)
|
||||
}
|
||||
}
|
||||
unchanged(t)
|
||||
})
|
||||
t.Run("bindings_cross_scope_and_unknown_preserve_existing", func(t *testing.T) {
|
||||
for _, actor := range []string{"manager", "root"} {
|
||||
for _, id := range []string{"server-b", "missing", "server-a' OR 1=1 --"} {
|
||||
if _, err := repo.ReplaceProjectDomainServers(t.Context(), actor, "domain-a", []string{"server-a", id}); !errors.Is(err, ErrProjectAccessDenied) {
|
||||
t.Fatalf("越权、未知或注入资源未拒绝:%s,%s,%v", actor, id, err)
|
||||
}
|
||||
unchanged(t)
|
||||
}
|
||||
}
|
||||
for _, id := range []string{"domain-b", "missing"} {
|
||||
if _, err := repo.ReplaceProjectDomainServers(t.Context(), "manager", id, []string{}); !errors.Is(err, ErrProjectAccessDenied) {
|
||||
t.Fatalf("未知或越权域名允许清空:%s,%v", id, err)
|
||||
}
|
||||
}
|
||||
})
|
||||
t.Run("bindings_explicit_empty_and_invalid_input", func(t *testing.T) {
|
||||
items, err := repo.ReplaceProjectDomainServers(t.Context(), "manager", "domain-a", []string{})
|
||||
if err != nil || items == nil || len(items) != 0 {
|
||||
t.Fatalf("明确清空未返回空列表:%+v,%v", items, err)
|
||||
}
|
||||
loaded, err := NewSQLServerRepository(db, driver).ListServersByDomainID(t.Context(), "domain-a")
|
||||
if err != nil || len(loaded) != 0 {
|
||||
t.Fatalf("清空未持久化:%+v,%v", loaded, err)
|
||||
}
|
||||
if _, err := repo.ReplaceProjectDomainServers(t.Context(), "manager", "domain-a", []string{"server-a"}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, ids := range [][]string{nil, {""}, {" server-a"}, make([]string, MaxProjectBindingServers+1)} {
|
||||
if _, err := repo.ReplaceProjectDomainServers(t.Context(), "manager", "domain-a", ids); !errors.Is(err, ErrProjectBindingInput) {
|
||||
t.Fatalf("非法列表未拒绝:%v", err)
|
||||
}
|
||||
unchanged(t)
|
||||
}
|
||||
ctx, cancel := context.WithCancel(t.Context())
|
||||
cancel()
|
||||
if _, err := repo.ReplaceProjectDomainServers(ctx, "root", "domain-a", []string{}); err == nil {
|
||||
t.Fatal("取消后仍修改了绑定")
|
||||
}
|
||||
unchanged(t)
|
||||
})
|
||||
t.Run("bindings_audit_failure_rolls_back", func(t *testing.T) {
|
||||
executor := db
|
||||
triggerName := "reject_binding_audit"
|
||||
trigger := `CREATE TRIGGER reject_binding_audit BEFORE INSERT ON audit_logs
|
||||
BEGIN SELECT RAISE(ABORT, 'audit-failure'); END`
|
||||
if driver == "mysql" {
|
||||
var schema string
|
||||
if err := db.QueryRowContext(t.Context(), "SELECT DATABASE()").Scan(&schema); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// 仅隔离测试管理员建触发器,不提升应用账户权限。
|
||||
triggerName = "`" + strings.ReplaceAll(schema, "`", "``") + "`.reject_binding_audit"
|
||||
trigger = "CREATE TRIGGER " + triggerName + " BEFORE INSERT ON `" + strings.ReplaceAll(schema, "`", "``") +
|
||||
"`.audit_logs FOR EACH ROW SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='audit-failure'"
|
||||
executor = admin
|
||||
}
|
||||
if _, err := executor.ExecContext(t.Context(), trigger); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
t.Cleanup(func() {
|
||||
if _, err := executor.ExecContext(context.Background(), "DROP TRIGGER "+triggerName); err != nil {
|
||||
t.Error(err)
|
||||
}
|
||||
})
|
||||
if _, err := repo.ReplaceProjectDomainServers(t.Context(), "manager", "domain-a", []string{}); err == nil {
|
||||
t.Fatal("审计失败时仍提交了清空操作")
|
||||
}
|
||||
unchanged(t)
|
||||
})
|
||||
if driver == "sqlite" {
|
||||
t.Run("bindings_ignored_audit_rolls_back", func(t *testing.T) {
|
||||
if _, err := db.ExecContext(t.Context(), `CREATE TRIGGER ignore_binding_audit BEFORE INSERT ON audit_logs BEGIN SELECT RAISE(IGNORE); END`); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
t.Cleanup(func() { _, _ = db.ExecContext(context.Background(), "DROP TRIGGER ignore_binding_audit") })
|
||||
if _, err := repo.ReplaceProjectDomainServers(t.Context(), "manager", "domain-a", []string{}); err == nil {
|
||||
t.Fatal("审计未落库仍返回成功")
|
||||
}
|
||||
unchanged(t)
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,7 @@ package repository
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"errors"
|
||||
"testing"
|
||||
|
||||
@@ -13,15 +14,15 @@ import (
|
||||
)
|
||||
|
||||
func TestProjectResourcesSQLite(t *testing.T) {
|
||||
checkProjectResources(t, config.Default(t.TempDir()).Database)
|
||||
checkProjectResources(t, config.Default(t.TempDir()).Database, nil)
|
||||
}
|
||||
|
||||
func TestProjectResourcesMySQLReal(t *testing.T) {
|
||||
server := mysqltest.New(t)
|
||||
checkProjectResources(t, server.Database(t))
|
||||
checkProjectResources(t, server.Database(t), server.Admin())
|
||||
}
|
||||
|
||||
func checkProjectResources(t *testing.T, cfg config.DatabaseConfig) {
|
||||
func checkProjectResources(t *testing.T, cfg config.DatabaseConfig, admin *sql.DB) {
|
||||
t.Helper()
|
||||
db, err := database.Open(t.Context(), cfg)
|
||||
if err != nil {
|
||||
@@ -135,6 +136,7 @@ func checkProjectResources(t *testing.T, cfg config.DatabaseConfig) {
|
||||
t.Fatalf("越权绑定查询未拒绝:%v", err)
|
||||
}
|
||||
})
|
||||
checkProjectBindings(t, db.DB, admin, repo, cfg.Driver)
|
||||
t.Run("revocation_and_disabled_account_are_not_cached", func(t *testing.T) {
|
||||
if err := repo.RevokeProjectRole(t.Context(), "root", "project-a", "reader", domain.ProjectRoleReadOnly); err != nil {
|
||||
t.Fatal(err)
|
||||
@@ -146,6 +148,9 @@ func checkProjectResources(t *testing.T, cfg config.DatabaseConfig) {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, actor := range []string{"reader", "manager"} {
|
||||
if _, err := repo.ReplaceProjectDomainServers(t.Context(), actor, "domain-a", []string{}); !errors.Is(err, ErrProjectAccessDenied) {
|
||||
t.Fatalf("撤权或停用后仍可修改绑定:%s,%v", actor, err)
|
||||
}
|
||||
items, err := repo.ListVisibleServers(t.Context(), actor)
|
||||
if err != nil || len(items) != 0 {
|
||||
t.Fatalf("撤权或停用后仍有资源:%s,%+v,%v", actor, items, err)
|
||||
|
||||
Reference in new issue
Block a user