0f8e2d0934
Account.Credentials 是 JSONB map，混合存放可编辑的非敏感配置（base_url、 model_mapping、project_id 等）与敏感秘钥（OAuth access/refresh/id token、 API key、AWS secret、Vertex private key 等）。当前所有 admin 账号接口直接 透传该 map，token 经由浏览器 DevTools、抓包、日志等途径泄漏。 - service 包新增 SensitiveCredentialKeys 清单与 MergePreservingSensitiveCreds 作为单一权威定义。 - dto 层 RedactCredentials 在响应里剥离敏感子键，输出 credentials_status （has_<key> 布尔标识）告知前端存在性，不暴露原值。 - AccountFromServiceShallow 接入脱敏，覆盖 list、get、create、update、 refresh、batch、bulk-update、OAuth 创建等 9 个 handler。 - service.UpdateAccount 改为合并语义：incoming 没传敏感键则保留 existing， 让前端"全对象 PUT"流程在脱敏后无感工作；显式提供新 token 仍会覆盖。 - 前端 EditAccountModal 修复脱敏后会崩的两处兜底：apikey 必填检查和 Vertex SA JSON 存在性校验改读 credentials_status.has_*。 - 导出端点 /admin/accounts/data 走独立的 DataAccount 结构，按设计保留 完整 credentials 作为管理员备份路径。 测试：RedactCredentials 单元测试、mapper 端到端 JSON 断言（确认序列化 后无 token 子串）、UpdateAccount 合并语义三种场景（保留 / 覆盖 / 空 map 跳过）。 Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
98 lines
3.0 KiB
Go
98 lines
3.0 KiB
Go
package dto
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestRedactCredentials_NilInput(t *testing.T) {
|
|
out, status := RedactCredentials(nil)
|
|
require.Nil(t, out)
|
|
require.Nil(t, status)
|
|
}
|
|
|
|
func TestRedactCredentials_StripsSensitiveKeysAndReportsStatus(t *testing.T) {
|
|
in := map[string]any{
|
|
"refresh_token": "rt-secret",
|
|
"access_token": "at-secret",
|
|
"api_key": "sk-secret",
|
|
"aws_secret_access_key": "aws-secret",
|
|
"service_account_json": map[string]any{"private_key": "..."},
|
|
"private_key": "raw-key",
|
|
// 非敏感
|
|
"base_url": "https://api.example.com",
|
|
"model_mapping": map[string]any{"foo": "bar"},
|
|
"project_id": "proj-1",
|
|
"expires_at": int64(123456),
|
|
}
|
|
|
|
out, status := RedactCredentials(in)
|
|
|
|
require.NotContains(t, out, "refresh_token")
|
|
require.NotContains(t, out, "access_token")
|
|
require.NotContains(t, out, "api_key")
|
|
require.NotContains(t, out, "aws_secret_access_key")
|
|
require.NotContains(t, out, "service_account_json")
|
|
require.NotContains(t, out, "private_key")
|
|
|
|
require.Equal(t, "https://api.example.com", out["base_url"])
|
|
require.Equal(t, map[string]any{"foo": "bar"}, out["model_mapping"])
|
|
require.Equal(t, "proj-1", out["project_id"])
|
|
require.Equal(t, int64(123456), out["expires_at"])
|
|
|
|
require.True(t, status["has_refresh_token"])
|
|
require.True(t, status["has_access_token"])
|
|
require.True(t, status["has_api_key"])
|
|
require.True(t, status["has_aws_secret_access_key"])
|
|
require.True(t, status["has_service_account_json"])
|
|
require.True(t, status["has_private_key"])
|
|
|
|
// 状态 map 不应携带非敏感键的 has_*
|
|
require.NotContains(t, status, "has_base_url")
|
|
require.NotContains(t, status, "has_project_id")
|
|
}
|
|
|
|
func TestRedactCredentials_EmptyValuesNotMarkedPresent(t *testing.T) {
|
|
in := map[string]any{
|
|
"refresh_token": "",
|
|
"access_token": nil,
|
|
"api_key": false,
|
|
"id_token": "actual-id",
|
|
}
|
|
out, status := RedactCredentials(in)
|
|
require.Empty(t, out, "敏感键即使为空也不应出现在 redacted output")
|
|
require.False(t, status["has_refresh_token"])
|
|
require.False(t, status["has_access_token"])
|
|
require.False(t, status["has_api_key"])
|
|
require.True(t, status["has_id_token"])
|
|
}
|
|
|
|
func TestRedactCredentials_DoesNotMutateInput(t *testing.T) {
|
|
in := map[string]any{
|
|
"refresh_token": "secret",
|
|
"base_url": "x",
|
|
}
|
|
_, _ = RedactCredentials(in)
|
|
require.Equal(t, "secret", in["refresh_token"], "原始 map 不应被修改")
|
|
require.Equal(t, "x", in["base_url"])
|
|
}
|
|
|
|
func TestRedactCredentials_AllKnownSensitiveKeys(t *testing.T) {
|
|
keys := []string{
|
|
"access_token", "refresh_token", "id_token",
|
|
"api_key", "session_key", "cookie",
|
|
"aws_secret_access_key", "aws_session_token",
|
|
"service_account_json", "service_account", "private_key",
|
|
}
|
|
in := make(map[string]any, len(keys))
|
|
for _, k := range keys {
|
|
in[k] = "filled"
|
|
}
|
|
out, status := RedactCredentials(in)
|
|
require.Empty(t, out)
|
|
for _, k := range keys {
|
|
require.True(t, status["has_"+k], "key %s 应在 status 中标记为已配置", k)
|
|
}
|
|
}
|