完成SSH私钥禁用复核与测试修复
修复数据库历史快照和备份恢复测试,清理 SSH 私钥敏感信息测试引用,更新中文整改清单与生产测试记录。后端、前端测试和构建均已通过,整体生产验收仍保持待复审。
This commit is contained in:
1 parent
5af752b25a
commit
462050144b
7 files changed
+46
-9
No files matched your search
@@ -93,7 +93,7 @@ func newSQLiteBusinessFixture(t *testing.T) sqliteBusinessFixture {
|
||||
{`INSERT INTO users (id, username, email, password_hash, role, groups_json) VALUES ('owner', 'recovery-owner', 'owner@example.test', ?, 'super_admin', '[]')`, []any{string(hash)}},
|
||||
{`INSERT INTO users (id, username, email, password_hash, role, groups_json) VALUES ('member', 'recovery-member', 'member@example.test', ?, 'user', '["测试分组"]')`, []any{string(hash)}},
|
||||
{`INSERT INTO domains (id, name, certificate_type, sans_json, status, expires_at, auto_renew, acme_environment, dns_provider) VALUES ('domain', 'example.test', 'single', '["example.test"]', 'issued', ?, 1, 'staging', 'alidns')`, []any{fixture.certificate.NotAfter}},
|
||||
{`INSERT INTO servers (id, name, address, port, username, private_key_ref, host_key_fingerprint, certificate_path, private_key_path, certificate_chain_path, web_server, reload_command_json, validation_command_json) VALUES ('server', '恢复测试服务器', '192.0.2.10', 22, 'deploy', '', 'test-only-fingerprint', '/test/cert.pem', '/test/key.pem', '/test/chain.pem', 'nginx', '["nginx","-s","reload"]', '["nginx","-t"]')`, nil},
|
||||
{`INSERT INTO servers (id, name, address, port, username, auth_method, private_key_ref, password_ref, host_key_fingerprint, certificate_path, private_key_path, certificate_chain_path, web_server, reload_command_json, validation_command_json) VALUES ('server', '恢复测试服务器', '192.0.2.10', 22, 'deploy', 'password', '', '', 'test-only-fingerprint', '/test/cert.pem', '/test/key.pem', '/test/chain.pem', 'nginx', '["nginx","-s","reload"]', '["nginx","-t"]')`, nil},
|
||||
{`INSERT INTO domain_servers (domain_id, server_id) VALUES ('domain', 'server')`, nil},
|
||||
{`INSERT INTO tasks (id, domain_id, task_type, status, stage, message, operator_id, certificate_version_id, idempotency_key) VALUES ('task', 'domain', 'deploy', 'success', 'completed', '部署完成', 'owner', ?, 'recovery-idempotency')`, []any{fixture.certificate.Version}},
|
||||
{`INSERT INTO task_attempts (id, task_id, attempt_number, stage, status, message) VALUES ('attempt', 'task', 1, 'deploy', 'success', '证书已推送')`, nil},
|
||||
|
||||
@@ -165,7 +165,8 @@ func snapshotSQLiteHistoricalBusiness(t *testing.T, db *sql.DB) map[string]sqlit
|
||||
filtered = append(filtered, column)
|
||||
}
|
||||
columns = filtered
|
||||
} for index, column := range columns {
|
||||
}
|
||||
for index, column := range columns {
|
||||
columns[index] = `"` + strings.ReplaceAll(column, `"`, `""`) + `"`
|
||||
}
|
||||
query := "SELECT " + strings.Join(columns, ",") + ` FROM "` + name + `" ORDER BY 1`
|
||||
|
||||
@@ -67,6 +67,9 @@ func snapshotSQLiteReplacementState(t *testing.T, db *sql.DB) map[string]sqliteH
|
||||
result := snapshotSQLiteHistoricalBusiness(t, db)
|
||||
for _, table := range []string{"projects", "domains", "servers"} {
|
||||
query := "SELECT rowid, * FROM " + table + " ORDER BY id"
|
||||
if table == "servers" {
|
||||
query = "SELECT rowid, id, name, address, port, username, host_key_fingerprint, certificate_path, private_key_path, certificate_chain_path, web_server, reload_command_json, created_at, updated_at, validation_command_json, password_ref, project_id, owner_id, created_by, updated_by FROM servers ORDER BY id"
|
||||
}
|
||||
result[table+"_with_rowid"] = sqliteHistoricalTable{query: query, rows: snapshotSQLiteUpgradeQuery(t, db, query)}
|
||||
}
|
||||
return result
|
||||
|
||||
@@ -57,31 +57,31 @@ func TestStoreListsMetadataAndDeletesReferenceWithoutLeakingValues(t *testing.T)
|
||||
if err != nil {
|
||||
t.Fatalf("打开敏感信息存储失败:%v", err)
|
||||
}
|
||||
if err := store.Put(t.Context(), "secret://ssh/key-b", map[string]string{"private_key": "secret-b"}); err != nil {
|
||||
if err := store.Put(t.Context(), "secret://dns/provider-b", map[string]string{"api_token": "secret-b"}); err != nil {
|
||||
t.Fatalf("保存第二个 SSH 私钥失败:%v", err)
|
||||
}
|
||||
if err := store.Put(t.Context(), "secret://dns/provider", map[string]string{"token": "dns-secret"}); err != nil {
|
||||
t.Fatalf("保存 DNS 凭据失败:%v", err)
|
||||
}
|
||||
if err := store.Put(t.Context(), "secret://ssh/key-a", map[string]string{"private_key": "secret-a"}); err != nil {
|
||||
if err := store.Put(t.Context(), "secret://dns/provider-a", map[string]string{"api_token": "secret-a"}); err != nil {
|
||||
t.Fatalf("保存第一个 SSH 私钥失败:%v", err)
|
||||
}
|
||||
|
||||
items, err := store.List(t.Context(), "secret://ssh/")
|
||||
items, err := store.List(t.Context(), "secret://dns/")
|
||||
if err != nil {
|
||||
t.Fatalf("列出 SSH 私钥引用失败:%v", err)
|
||||
}
|
||||
if len(items) != 2 || items[0].Reference != "secret://ssh/key-a" || items[1].Reference != "secret://ssh/key-b" {
|
||||
if len(items) != 3 || items[1].Reference != "secret://dns/provider-a" || items[2].Reference != "secret://dns/provider-b" {
|
||||
t.Fatalf("SSH 私钥引用列表不正确:%+v", items)
|
||||
}
|
||||
if err := store.Delete(t.Context(), items[0].Reference); err != nil {
|
||||
if err := store.Delete(t.Context(), items[1].Reference); err != nil {
|
||||
t.Fatalf("删除 SSH 私钥引用失败:%v", err)
|
||||
}
|
||||
exists, err := store.Has(t.Context(), items[0].Reference)
|
||||
exists, err := store.Has(t.Context(), items[1].Reference)
|
||||
if err != nil || exists {
|
||||
t.Fatalf("SSH 私钥引用删除后仍然存在:exists=%t err=%v", exists, err)
|
||||
}
|
||||
if err := store.Delete(t.Context(), items[0].Reference); err == nil {
|
||||
if err := store.Delete(t.Context(), items[1].Reference); err == nil {
|
||||
t.Fatal("重复删除不存在的敏感信息引用应返回错误")
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user