diff --git a/cmd/agent-system/dispatch_test.go b/cmd/agent-system/dispatch_test.go new file mode 100644 index 0000000..d4f7096 --- /dev/null +++ b/cmd/agent-system/dispatch_test.go @@ -0,0 +1,28 @@ +package main + +import ( + "os" + "os/exec" + "strings" + "testing" +) + +func TestUnknownSubcommandExits(t *testing.T) { + if os.Getenv("DISPATCH_CHILD") == "1" { + os.Args = []string{"agent-system", "not-a-command"} + main() + return + } + cmd := exec.Command(os.Args[0], "-test.run=TestUnknownSubcommandExits") + cmd.Env = append(os.Environ(), "DISPATCH_CHILD=1") + out, err := cmd.CombinedOutput() + if err == nil { + t.Fatalf("未知子命令应非零退出:%s", out) + } + if !strings.Contains(string(out), "未知子命令") { + t.Fatalf("输出:%s", out) + } + if strings.Contains(string(out), "agent-system starting") || strings.Contains(string(out), "serving") { + t.Fatalf("未知子命令落入了服务路径:%s", out) + } +} diff --git a/cmd/agent-system/main.go b/cmd/agent-system/main.go index 4dc04e1..3bcf5a0 100644 --- a/cmd/agent-system/main.go +++ b/cmd/agent-system/main.go @@ -9,6 +9,7 @@ import ( "flag" "fmt" "os" + "strings" "time" "agent-system-backend/internal/app" @@ -20,9 +21,16 @@ import ( var version = "0.1.0-dev" func main() { - if len(os.Args) > 1 { + if len(os.Args) > 1 && !strings.HasPrefix(os.Args[1], "-") { switch os.Args[1] { case "version", "--version": + if len(os.Args) > 2 && os.Args[2] == "--json" { + if err := identity.WriteDocument(os.Stdout, "agent-system", version); err != nil { + fmt.Fprintln(os.Stderr, "version:", err) + os.Exit(1) + } + return + } fmt.Println("agent-system", version) return case "serve": @@ -37,6 +45,10 @@ func main() { os.Exit(runIdentity(os.Args[2:])) case "capabilities": os.Exit(runCapabilities(os.Args[2:])) + default: + fmt.Fprintf(os.Stderr, "agent-system: 未知子命令 %s\n", os.Args[1]) + fmt.Fprintln(os.Stderr, "用法:agent-system [参数]") + os.Exit(2) } } fs := flag.NewFlagSet("serve", flag.ExitOnError) diff --git a/internal/app/account_lister_test.go b/internal/app/account_lister_test.go new file mode 100644 index 0000000..30821a7 --- /dev/null +++ b/internal/app/account_lister_test.go @@ -0,0 +1,53 @@ +package app + +// EXT-19 消费测试:inprocHost.ListAccounts——最小目录(owner/valid)、游标分页、 +// limit 钳制(1-200,缺省 50)。数据来自 users 表(真实 store,非桩)。 +import ( + "testing" + + "agent-system-backend/internal/store" +) + +func TestInprocHostListAccounts(t *testing.T) { + dir := t.TempDir() + st, err := store.OpenSQLite(dir + "/test.db") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { st.Close() }) + for _, o := range []string{"carol", "alice", "bob", "dave"} { + if _, err := st.CreateAPIKey(o, "e2e"); err != nil { + t.Fatal(err) + } + } + h := inprocHost{caps: hostcaps{st: st}} + + // 首页(limit=2):alice/bob,next=bob。 + page, next, err := h.ListAccounts("", 2) + if err != nil { + t.Fatal(err) + } + if len(page) != 2 || page[0].Owner != "alice" || page[1].Owner != "bob" { + t.Fatalf("首页不符: %+v", page) + } + for _, e := range page { + if !e.Valid { + t.Fatalf("现有账号应 valid: %+v", e) + } + } + if next != "bob" { + t.Fatalf("next 应为 bob, got %q", next) + } + // 次页:carol/dave,next=""(末页)。 + page2, next2, _ := h.ListAccounts(next, 2) + if len(page2) != 2 || page2[0].Owner != "carol" || page2[1].Owner != "dave" || next2 != "" { + t.Fatalf("次页不符: %+v next=%q", page2, next2) + } + // limit 钳制:0 → 50 缺省;超 200 → 200(不炸)。 + if p, _, _ := h.ListAccounts("", 0); len(p) != 4 { + t.Fatalf("limit=0 应取缺省(4 账号全量), got %d", len(p)) + } + if _, _, err := h.ListAccounts("", 999); err != nil { + t.Fatalf("limit 超限应钳制不报错: %v", err) + } +} diff --git a/internal/app/app.go b/internal/app/app.go index 143ddfe..f6947f0 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -836,6 +836,16 @@ func withStore(storageDSN, dataDir string, fn func(*store.Store) error) error { return withStoreMode(storageDSN, dataDir, false, fn) } +// withIdentityStore 只打开既有库:不建文件、不建目录、不迁移。 +func withIdentityStore(storageDSN, dataDir string, fn func(*store.Store) error) error { + st, err := store.OpenIdentity(storageDSN, dataDir) + if err != nil { + return err + } + defer st.Close() + return fn(st) +} + func withStoreMode(storageDSN, dataDir string, openExisting bool, fn func(*store.Store) error) error { var st *store.Store var err error @@ -910,17 +920,29 @@ func RevokeAPIKey(storageDSN, dataDir, owner, name string) (bool, error) { } // EnsureSystemIdentity CLI:显式建立库内服务身份(svc init / I2→I3 引导)。 +// 只打开既有库,不建库、不迁移。 func EnsureSystemIdentity(storageDSN, dataDir, instanceID, dbref string) error { - return withStore(storageDSN, dataDir, func(st *store.Store) error { + return withIdentityStore(storageDSN, dataDir, func(st *store.Store) error { return st.EnsureSystemIdentity(instanceID, dbref) }) } // VerifySystemIdentity CLI:校验库内服务身份(svc start 前;失败不插入)。 -func VerifySystemIdentity(storageDSN, dataDir, instanceID, dbref string) error { - return withStoreMode(storageDSN, dataDir, true, func(st *store.Store) error { - return st.VerifySystemIdentity(instanceID, dbref) +// 只打开既有库,不建库、不迁移。schemaVersion 取身份行上的值。 +func VerifySystemIdentity(storageDSN, dataDir, instanceID, dbref string) (int, error) { + var schemaVersion int + err := withIdentityStore(storageDSN, dataDir, func(st *store.Store) error { + if err := st.VerifySystemIdentity(instanceID, dbref); err != nil { + return err + } + row, err := st.GetSystemIdentity() + if err != nil { + return err + } + schemaVersion = row.SchemaVersion + return nil }) + return schemaVersion, err } func cliActor() string { diff --git a/internal/app/hostcaps.go b/internal/app/hostcaps.go index 0e9ce60..89c440e 100644 --- a/internal/app/hostcaps.go +++ b/internal/app/hostcaps.go @@ -171,6 +171,46 @@ func (h inprocHost) IsAdmin() bool { return state.IsAdmin } +// ListAccounts 实现 EXT-19 AccountLister(最小账号目录):仅授权管理读面用。 +// 有效态=账号存在且非停用(当前 users 表无停用位——must_change_password 不影响 +// 有效性;后续加停用位在此映射)。游标=owner 升序偏移。 +func (h inprocHost) ListAccounts(cursor string, limit int) ([]extension.AccountEntry, string, error) { + if limit <= 0 || limit > 200 { + limit = 50 + } + users, err := h.caps.st.ListUsersAdmin() + if err != nil { + return nil, "", err + } + entries := make([]extension.AccountEntry, 0, len(users)) + for _, u := range users { + entries = append(entries, extension.AccountEntry{Owner: u.Owner, Valid: true}) + } + // 排序+游标(owner 升序;cursor 为上一页末 owner,空=首页)。 + for i := 0; i < len(entries); i++ { + for j := i + 1; j < len(entries); j++ { + if entries[j].Owner < entries[i].Owner { + entries[i], entries[j] = entries[j], entries[i] + } + } + } + start := 0 + if cursor != "" { + for start < len(entries) && entries[start].Owner <= cursor { + start++ + } + } + end := start + limit + if end > len(entries) { + end = len(entries) + } + next := "" + if end < len(entries) { + next = entries[end-1].Owner + } + return entries[start:end], next, nil +} + func (h inprocHost) KVPut(key, value string) error { return h.caps.st.PutPluginKV(h.pluginID, h.owner, key, value) } diff --git a/internal/store/migrate_compat.go b/internal/store/migrate_compat.go new file mode 100644 index 0000000..e43cd02 --- /dev/null +++ b/internal/store/migrate_compat.go @@ -0,0 +1,50 @@ +package store + +// migrationBreaksOldReaders 登记每个迁移版本落地后,schema.target 更低的旧制品 +// 还能不能读这个库。新增迁移漏登记时 TestMigrationCompatRegistered 失败。 +// true 会抬高 SchemaCompatFloor:候选若要把库迁过该版本,而旧制品的 target +// 低于该下限,切换必须在停旧服务前拒绝,除非走已确认的 forward-only 迁移。 +var migrationBreaksOldReaders = map[int]bool{ + 1: false, + 2: false, + 3: false, + 4: false, + 5: false, + 6: false, + 7: false, + 8: false, + 9: false, + 10: false, + 11: false, + 12: false, + 13: false, + 14: false, + 15: false, + 16: false, + 17: false, + 18: false, + 19: false, + 20: false, + 21: false, + 22: false, + 23: false, + 24: false, + 25: false, + 26: false, + 27: false, + 28: false, // account_audit 给 audit_events 增加带默认值的列,旧制品按列名读取 +} + +// SchemaTarget 是本二进制会迁移到的 schema 版本。 +func SchemaTarget() int { return latestMigrationVersion() } + +// SchemaCompatFloor 是旧制品仍能读取的最高破坏性版本。0 表示当前全部迁移都不破坏旧读。 +func SchemaCompatFloor() int { + floor := 0 + for version, breaks := range migrationBreaksOldReaders { + if breaks && version > floor { + floor = version + } + } + return floor +} diff --git a/internal/store/migrate_compat_test.go b/internal/store/migrate_compat_test.go new file mode 100644 index 0000000..6c46cf7 --- /dev/null +++ b/internal/store/migrate_compat_test.go @@ -0,0 +1,20 @@ +package store + +import "testing" + +func TestMigrationCompatRegistered(t *testing.T) { + if len(migrationBreaksOldReaders) != len(migrations) { + t.Fatalf("兼容登记 %d 条,迁移 %d 条", len(migrationBreaksOldReaders), len(migrations)) + } + for _, m := range migrations { + if _, ok := migrationBreaksOldReaders[m.version]; !ok { + t.Fatalf("迁移 v%d %s 未登记是否破坏旧制品读取", m.version, m.name) + } + } + if SchemaTarget() != latestMigrationVersion() { + t.Fatalf("target=%d latest=%d", SchemaTarget(), latestMigrationVersion()) + } + if SchemaCompatFloor() < 0 || SchemaCompatFloor() > SchemaTarget() { + t.Fatalf("compatFloor=%d target=%d", SchemaCompatFloor(), SchemaTarget()) + } +} diff --git a/internal/store/store.go b/internal/store/store.go index 9595115..98f526e 100644 --- a/internal/store/store.go +++ b/internal/store/store.go @@ -91,6 +91,87 @@ func OpenSQLite(path string) (*Store, error) { return openSQLiteFile(path, true, true) } +// OpenIdentity 打开既有库做身份 ensure/verify:不创建文件或目录,不执行迁移。 +// 缺少 agent_system_identity 表时返回 ErrIdentityTableMissing。 +func OpenIdentity(storageDSN, dataDir string) (*Store, error) { + if storageDSN != "" { + return openIdentityPostgres(storageDSN) + } + return openIdentitySQLite(filepath.Join(dataDir, "agent-system.db")) +} + +func openIdentitySQLite(path string) (*Store, error) { + if _, err := os.Stat(path); err != nil { + if os.IsNotExist(err) { + return nil, fmt.Errorf("%w: %s", ErrIdentityDBMissing, path) + } + return nil, err + } + dsn := fmt.Sprintf("file:%s?_pragma=busy_timeout(30000)&_pragma=foreign_keys(1)&_txlock=immediate", path) + db, err := sql.Open("sqlite", dsn) + if err != nil { + return nil, err + } + db.SetMaxOpenConns(1) + if err := requireIdentityTable(db, "sqlite"); err != nil { + db.Close() + return nil, err + } + return &Store{db: db, dialect: sqliteDialect{}}, nil +} + +func openIdentityPostgres(dsn string) (*Store, error) { + db, err := sql.Open("pgx", dsn) + if err != nil { + return nil, err + } + db.SetMaxOpenConns(2) + if err := db.Ping(); err != nil { + db.Close() + return nil, err + } + if err := requireIdentityTable(db, "postgres"); err != nil { + db.Close() + return nil, err + } + return &Store{db: db, dialect: postgresDialect{}}, nil +} + +func requireIdentityTable(db *sql.DB, kind string) error { + var name string + var err error + switch kind { + case "postgres": + err = db.QueryRow(`SELECT COALESCE(to_regclass('public.agent_system_identity')::text, '')`).Scan(&name) + default: + err = db.QueryRow(`SELECT COALESCE((SELECT name FROM sqlite_master WHERE type='table' AND name='agent_system_identity'), '')`).Scan(&name) + } + if err != nil { + return err + } + if name == "" { + return fmt.Errorf("%w: 先执行受控迁移(服务启动或 migrate),身份命令不建库、不迁移", ErrIdentityTableMissing) + } + return nil +} + +// SchemaVersion 读取 schema_migrations 的最大版本。表不存在时返回 0。 +func (s *Store) SchemaVersion() (int, error) { + var v sql.NullInt64 + err := s.db.QueryRow(`SELECT MAX(version) FROM schema_migrations`).Scan(&v) + if err != nil { + msg := strings.ToLower(err.Error()) + if strings.Contains(msg, "no such table") || strings.Contains(msg, "does not exist") { + return 0, nil + } + return 0, err + } + if !v.Valid { + return 0, nil + } + return int(v.Int64), nil +} + // OpenExistingSQLite 打开既有嵌入式库:数据文件不存在则失败,不创建空库或父目录,也不迁移。 // schema 与本二进制不一致时拒绝,并提示使用 migrate 或先启动服务。 func OpenExistingSQLite(path string) (*Store, error) { diff --git a/internal/store/system_identity.go b/internal/store/system_identity.go index 0aeaaa5..453f2ad 100644 --- a/internal/store/system_identity.go +++ b/internal/store/system_identity.go @@ -12,6 +12,15 @@ var ErrSystemIdentityMismatch = errors.New("system identity mismatch") // ErrSystemIdentityMissing 表中无身份行——须先 Ensure(svc init / 首次建立),禁止静默插入。 var ErrSystemIdentityMissing = errors.New("system identity missing") +// ErrIdentityDBMissing 身份 CLI 拒绝创建数据库文件或父目录。 +var ErrIdentityDBMissing = errors.New("identity database missing") + +// ErrIdentityTableMissing 库存在但没有冻结的身份表,须走受控迁移而不是身份 CLI。 +var ErrIdentityTableMissing = errors.New("identity table missing") + +// IdentityColumns 是 agent_system_identity 的冻结列序(v27)。新增列会破坏旧制品读取,必须先改本常量并补兼容测试。 +const IdentityColumns = "instance_id,dbref,schema_version,created_at" + // SystemIdentity 是 agent_system_identity 表的一行(一库一服务身份)。 type SystemIdentity struct { InstanceID string @@ -43,7 +52,13 @@ func (s *Store) EnsureSystemIdentity(instanceID, dbref string) error { } return nil } - ver := latestMigrationVersion() + ver, err := s.SchemaVersion() + if err != nil { + return err + } + if ver <= 0 { + ver = 27 + } _, err = s.db.Exec(s.q(`INSERT INTO agent_system_identity(instance_id, dbref, schema_version, created_at) VALUES(?,?,?,?)`), instanceID, dbref, ver, nowISO()) if err != nil { diff --git a/internal/store/system_identity_test.go b/internal/store/system_identity_test.go index f0b4f6e..9edaea7 100644 --- a/internal/store/system_identity_test.go +++ b/internal/store/system_identity_test.go @@ -1,8 +1,11 @@ package store import ( + "database/sql" "errors" + "os" "path/filepath" + "strings" "testing" ) @@ -67,4 +70,89 @@ func TestSystemIdentityMigrationCreatesTable(t *testing.T) { if err := st.DB().QueryRow(`SELECT name FROM sqlite_master WHERE type='table' AND name='agent_system_identity'`).Scan(&name); err != nil || name != "agent_system_identity" { t.Fatalf("table missing: name=%q err=%v", name, err) } + cols := identityColumnNames(t, st.DB()) + if cols != IdentityColumns { + t.Fatalf("身份表列已偏离冻结契约:%s", cols) + } +} + +func TestOpenIdentityReadsFutureSchemaWithoutMigrating(t *testing.T) { + dir := t.TempDir() + path := filepath.Join(dir, "agent-system.db") + raw, err := sql.Open("sqlite", "file:"+path) + if err != nil { + t.Fatal(err) + } + stmts := []string{ + `CREATE TABLE schema_migrations (version INTEGER PRIMARY KEY, name TEXT NOT NULL, applied_at TEXT NOT NULL)`, + `INSERT INTO schema_migrations(version, name, applied_at) VALUES (99, 'future', 't')`, + `CREATE TABLE agent_system_identity ( + instance_id TEXT NOT NULL PRIMARY KEY, + dbref TEXT NOT NULL, + schema_version INTEGER NOT NULL, + created_at TEXT NOT NULL)`, + `INSERT INTO agent_system_identity(instance_id, dbref, schema_version, created_at) VALUES ('svc-future-aaaa', 'sqlite', 99, 't')`, + } + for _, stmt := range stmts { + if _, err := raw.Exec(stmt); err != nil { + t.Fatal(err) + } + } + raw.Close() + st, err := OpenIdentity("", dir) + if err != nil { + t.Fatal(err) + } + defer st.Close() + if err := st.VerifySystemIdentity("svc-future-aaaa", "sqlite"); err != nil { + t.Fatal(err) + } + ver, err := st.SchemaVersion() + if err != nil || ver != 99 { + t.Fatalf("schema=%d err=%v,身份打开不得改写迁移版本", ver, err) + } + if cols := identityColumnNames(t, st.DB()); cols != IdentityColumns { + t.Fatalf("列=%s", cols) + } +} + +func TestOpenIdentityMissingFileOrTable(t *testing.T) { + dir := t.TempDir() + if _, err := OpenIdentity("", filepath.Join(dir, "missing")); !errors.Is(err, ErrIdentityDBMissing) { + t.Fatalf("缺文件:%v", err) + } + if _, err := os.Stat(filepath.Join(dir, "missing")); !os.IsNotExist(err) { + t.Fatal("缺库时创建了目录") + } + path := filepath.Join(dir, "agent-system.db") + raw, err := sql.Open("sqlite", "file:"+path) + if err != nil { + t.Fatal(err) + } + if _, err := raw.Exec(`CREATE TABLE schema_migrations (version INTEGER PRIMARY KEY, name TEXT NOT NULL, applied_at TEXT NOT NULL)`); err != nil { + t.Fatal(err) + } + raw.Close() + parent := filepath.Dir(path) + if _, err := OpenIdentity("", parent); !errors.Is(err, ErrIdentityTableMissing) { + t.Fatalf("缺表:%v", err) + } +} + +func identityColumnNames(t *testing.T, db *sql.DB) string { + t.Helper() + rows, err := db.Query(`SELECT name FROM pragma_table_info('agent_system_identity') ORDER BY cid`) + if err != nil { + t.Fatal(err) + } + defer rows.Close() + var names []string + for rows.Next() { + var name string + if err := rows.Scan(&name); err != nil { + t.Fatal(err) + } + names = append(names, name) + } + return strings.Join(names, ",") } diff --git a/pkg/extension/account_lister_test.go b/pkg/extension/account_lister_test.go new file mode 100644 index 0000000..d448879 --- /dev/null +++ b/pkg/extension/account_lister_test.go @@ -0,0 +1,26 @@ +package extension + +// EXT-19 红测(方案 r1 U3/KTD2 最小账号目录):公开面新增可选能力接口 +// AccountLister(ListAccounts:owner+有效态+游标分页——授权管理所需的最小身份, +// 不含姓名/邮箱/联系方式)。红:类型未定义,编译红先行。 +import ( + "encoding/json" + "strings" + "testing" +) + +func TestAccountListerSurface(t *testing.T) { + if !strings.HasPrefix(SurfaceVersion, "2.11.0") { + t.Fatalf("SurfaceVersion 应升至 2.11.0-experimental(新增导出符号须升版),got %s", SurfaceVersion) + } + // 接口方法签名即契约:游标分页 + 最小字段。 + var _ AccountLister = (AccountLister)(nil) + e := AccountEntry{Owner: "u1", Valid: true} + b, err := json.Marshal(e) + if err != nil { + t.Fatal(err) + } + if !strings.Contains(string(b), `"owner":"u1"`) || !strings.Contains(string(b), `"valid":true`) { + t.Fatalf("AccountEntry 序列化不符(最小字段 owner/valid): %s", b) + } +} diff --git a/pkg/extension/extension.go b/pkg/extension/extension.go index d8dbf72..93939a0 100644 --- a/pkg/extension/extension.go +++ b/pkg/extension/extension.go @@ -25,12 +25,14 @@ import ( // 2.8.0-experimental:EXT-17 新增可选能力接口 SurfaceHost(SurfaceSave/Get/List/ // Activation;Generative UI U2)。实现由基座 hostcaps 注入;未装配时类型断言 // 不成立即明确拒绝,不给必实现 Host 接口加方法(不破坏既有消费者)。 +// 2.11.0-experimental:EXT-19 新增可选能力接口 AccountLister(ListAccounts: +// 最小账号目录——owner+有效态+游标分页,U3/KTD2;不含姓名/联系方式)。 // 2.10.0-experimental:EXT-8b 新增 ResourceAuthzQuery/ResourceAuthorizerV2 与 // Registry.RegisterResourceAuthorizerV2(资源级授权,U9 首切片)。 // 2.9.0-experimental:Registry.AddAdminZone 与 AdminZoneSpec(WP3-I3/KTD4:编译 // 插件向基座管理区声明展示分区;分区入口不做基座级权限判定,数据能力由 // 分区组件自身的命令面 fail-closed)。 -const SurfaceVersion = "2.10.0-experimental" +const SurfaceVersion = "2.11.0-experimental" // ErrNotLinked 表示进程没有空白导入 link 包,Main 无法启动服务。 var ErrNotLinked = errors.New("extension: runner not linked; blank-import agent-system-backend/pkg/extension/link") @@ -80,6 +82,20 @@ type Registry interface { AddAdminZone(spec json.RawMessage) error } +// AccountEntry 最小账号目录行(U3/KTD2):owner+有效态——授权管理所需的最小 +// 身份;姓名/邮箱/联系方式一律不下发(隐私边界)。 +type AccountEntry struct { + Owner string `json:"owner"` + Valid bool `json:"valid"` +} + +// AccountLister EXT-19 可选能力接口(实现由宿主注入):游标分页列举系统账号。 +// 未实现时下游回落现行行为(成员添加不做账号有效性校验);实现后仅用于 +// 授权管理读面——不授予任何写权。 +type AccountLister interface { + ListAccounts(cursor string, limit int) (entries []AccountEntry, next string, err error) +} + // AdminZoneSpec 管理区分区声明(WP3-I3):ID 是分区身份(建议形如 // .
,前端按 ID 映射内置分区组件);Title/Icon/Desc 为展示 // 元数据(icon 取基座前端 IconName 词表,未知值前端回退通用图标);Order diff --git a/pkg/extension/resource_authz_v2_test.go b/pkg/extension/resource_authz_v2_test.go index 395287f..9feb0c4 100644 --- a/pkg/extension/resource_authz_v2_test.go +++ b/pkg/extension/resource_authz_v2_test.go @@ -13,8 +13,8 @@ import ( ) func TestResourceAuthzV2SurfacePresent(t *testing.T) { - if !strings.HasPrefix(SurfaceVersion, "2.10.0") { - t.Fatalf("SurfaceVersion 应升至 2.10.0-experimental(新增导出符号须升版),got %s", SurfaceVersion) + if SurfaceVersion < "2.10.0" { + t.Fatalf("SurfaceVersion 应 ≥2.10.0-experimental(EXT-8b 起生效),got %s", SurfaceVersion) } var _ ResourceAuthorizerV2 = func(q ResourceAuthzQuery) (bool, error) { return q.Actor != "" && q.Action != "" && q.ResourceType != "" && q.ResourceID != "", nil diff --git a/pkg/extension/surface.txt b/pkg/extension/surface.txt index 327acb4..a893299 100644 --- a/pkg/extension/surface.txt +++ b/pkg/extension/surface.txt @@ -1,3 +1,6 @@ +AccountEntry +AccountLister +AccountLister.ListAccounts AdminProvider AdminProvider.IsAdmin AdminZoneSpec diff --git a/pkg/identity/identity.go b/pkg/identity/identity.go index 8e525b0..76a4e92 100644 --- a/pkg/identity/identity.go +++ b/pkg/identity/identity.go @@ -1,26 +1,91 @@ // Package identity 提供服务实例库内身份子命令的公共 CLI(U1 I3: // manifest.instance_id ↔ agent_system_identity 表)。 -// 独立可导出包:下游组合仓(Agent-System-RDM 等)与基座二进制共用同一实现, -// identity 语义跨产物一致。契约(2026-10-12 rdm1/rdmcand 事故后确立): -// - 无参/未知子命令打印用法并以非零码退出,绝不落入服务启动路径—— -// 部署侧能力探测必须无副作用; -// - `identity capabilities` 输出版本化能力清单,供探测优先消费。 +// 独立可导出包:下游组合仓(Agent-System-RDM 等)与基座二进制共用同一实现。 +// 契约:无参/未知子命令打印用法并以非零码退出;只打开既有库,不建库、不迁移。 package identity import ( + "encoding/json" "flag" "fmt" + "io" "os" + "runtime/debug" + "strings" "agent-system-backend/internal/app" + "agent-system-backend/internal/store" ) // Usage 无参/未知子命令时打印到 stderr 的用法行。探测契约:同时含 "identity" -// 与 "ensure" 字样(svc.sh svc_bin_has_identity 按 usage 形态判有能力)。 -const Usage = "用法:identity --instance-id ID [--dbref REF] [--data DIR] [--dsn DSN]" +// 与 "ensure" 字样(旧 svc 探测仍按 usage 形态判有能力)。 +const Usage = "用法:identity --instance-id ID [--dbref REF] [--data DIR] [--dsn-file FILE]" -// Capabilities 版本化能力输出(新增子命令在此登记并递增 vN)。 -const Capabilities = "identity-capabilities: v1 ensure,verify" +// Product 写入能力文档的产品名。组合仓在调用 Run 前改成自己的名字。 +var Product = "agent-system" + +// Document 是 version --json 与 identity capabilities 共用的能力文档。 +type Document struct { + Protocol int `json:"protocol"` + Product string `json:"product"` + Version string `json:"version"` + Identity IdentityCaps `json:"identity"` + CLI CLICaps `json:"cli"` + Schema *SchemaCaps `json:"schema,omitempty"` +} + +// IdentityCaps 描述身份子命令的打开方式。 +type IdentityCaps struct { + Ops []string `json:"ops"` + Open string `json:"open"` + DSN string `json:"dsn"` +} + +// CLICaps 描述未知子命令的行为。 +type CLICaps struct { + UnknownSubcommand string `json:"unknownSubcommand"` +} + +// SchemaCaps 由 D2 填入。零值时从 JSON 省略。 +type SchemaCaps struct { + Target int `json:"target"` + CompatFloor int `json:"compatFloor"` +} + +// NewDocument 构造当前进程的能力文档。 +func NewDocument(product, version string) Document { + if product == "" { + product = Product + } + if version == "" { + version = binaryVersion() + } + return Document{ + Protocol: 1, + Product: product, + Version: version, + Identity: IdentityCaps{Ops: []string{"ensure", "verify"}, Open: "existing-no-migrate", DSN: "env"}, + CLI: CLICaps{UnknownSubcommand: "reject"}, + Schema: &SchemaCaps{Target: store.SchemaTarget(), CompatFloor: store.SchemaCompatFloor()}, + } +} + +// WriteDocument 把能力文档写成一行 JSON。 +func WriteDocument(w io.Writer, product, version string) error { + raw, err := json.Marshal(NewDocument(product, version)) + if err != nil { + return err + } + _, err = fmt.Fprintf(w, "%s\n", raw) + return err +} + +func binaryVersion() string { + if bi, ok := debug.ReadBuildInfo(); ok && bi.Main.Version != "" && bi.Main.Version != "(devel)" { + return bi.Main.Version + } + return "(devel)" +} // Run 执行 identity 子命令;args 不含 "identity" 自身,返回进程退出码。 func Run(args []string) int { @@ -30,22 +95,36 @@ func Run(args []string) int { } sub := args[0] if sub == "capabilities" { - fmt.Println(Capabilities) + if err := WriteDocument(os.Stdout, Product, ""); err != nil { + fmt.Fprintln(os.Stderr, "identity capabilities:", err) + return 1 + } return 0 } - fs := flag.NewFlagSet("identity "+sub, flag.ExitOnError) + fs := flag.NewFlagSet("identity "+sub, flag.ContinueOnError) + fs.SetOutput(io.Discard) data := fs.String("data", "./data", "数据目录(SQLite 路径 /agent-system.db)") - dsn := fs.String("dsn", "", "PostgreSQL 档 DSN(空 = 嵌入式 SQLite)") - instanceID := fs.String("instance-id", "", "服务实例 ID(manifest.instance_id,形如 svc--…)") + dsnFlag := fs.String("dsn", "", "PostgreSQL DSN(会进入进程参数;优先用环境变量或 --dsn-file)") + dsnFile := fs.String("dsn-file", "", "权限恰好 0600 的 DSN 文件") + instanceID := fs.String("instance-id", "", "服务实例 ID(manifest.instance_id)") dbref := fs.String("dbref", "", "数据库锚点(空 = sqlite 或 pg)") - fs.Parse(args[1:]) + if err := fs.Parse(args[1:]); err != nil { + fmt.Fprintln(os.Stderr, "identity:", err) + fmt.Fprintln(os.Stderr, Usage) + return 2 + } if *instanceID == "" { fmt.Fprintln(os.Stderr, "identity: --instance-id 必填") return 2 } + dsn, err := ResolveDSN(*dsnFlag, *dsnFile) + if err != nil { + fmt.Fprintln(os.Stderr, "identity:", err) + return 2 + } ref := *dbref if ref == "" { - if *dsn != "" { + if dsn != "" { ref = "pg" } else { ref = "sqlite" @@ -53,18 +132,19 @@ func Run(args []string) int { } switch sub { case "ensure": - if err := app.EnsureSystemIdentity(*dsn, *data, *instanceID, ref); err != nil { + if err := app.EnsureSystemIdentity(dsn, *data, *instanceID, ref); err != nil { fmt.Fprintln(os.Stderr, "identity ensure:", err) return 1 } fmt.Printf("ensured instance_id=%s dbref=%s\n", *instanceID, ref) return 0 case "verify": - if err := app.VerifySystemIdentity(*dsn, *data, *instanceID, ref); err != nil { + ver, err := app.VerifySystemIdentity(dsn, *data, *instanceID, ref) + if err != nil { fmt.Fprintln(os.Stderr, "identity verify:", err) return 1 } - fmt.Printf("verified instance_id=%s dbref=%s\n", *instanceID, ref) + fmt.Printf("verified instance_id=%s dbref=%s schema_version=%d\n", *instanceID, ref, ver) return 0 default: fmt.Fprintln(os.Stderr, "identity: 未知子命令", sub) @@ -72,3 +152,36 @@ func Run(args []string) int { return 2 } } + +// ResolveDSN 按 --dsn-file、环境变量、--dsn 的顺序取值。--dsn 会告警。 +// --dsn 与 --dsn-file 同时出现则拒绝。文件权限必须恰好 0600,且不能是符号链接。 +func ResolveDSN(flagDSN, flagFile string) (string, error) { + if flagDSN != "" && flagFile != "" { + return "", fmt.Errorf("--dsn 与 --dsn-file 只能选一个") + } + if flagFile != "" { + st, err := os.Lstat(flagFile) + if err != nil { + return "", err + } + if st.Mode()&os.ModeSymlink != 0 { + return "", fmt.Errorf("--dsn-file 不能是符号链接") + } + if st.Mode().Perm() != 0o600 { + return "", fmt.Errorf("--dsn-file 权限必须为 0600(当前 %o)", st.Mode().Perm()) + } + raw, err := os.ReadFile(flagFile) + if err != nil { + return "", err + } + return strings.TrimSpace(string(raw)), nil + } + if env := strings.TrimSpace(os.Getenv("AGENT_SYSTEM_DSN")); env != "" && flagDSN == "" { + return env, nil + } + if flagDSN != "" { + fmt.Fprintln(os.Stderr, "identity: 警告:--dsn 会进入进程参数,请改用 AGENT_SYSTEM_DSN 或 --dsn-file") + return flagDSN, nil + } + return "", nil +} diff --git a/pkg/identity/identity_test.go b/pkg/identity/identity_test.go index 298e9f8..81a238f 100644 --- a/pkg/identity/identity_test.go +++ b/pkg/identity/identity_test.go @@ -1,11 +1,14 @@ package identity import ( + "encoding/json" "io" "os" "path/filepath" "strings" "testing" + + "agent-system-backend/internal/store" ) // capture 把 stdout/stderr 重定向到管道并在 fn 返回后给出捕获文本。 @@ -51,21 +54,60 @@ func TestUsageAndUnknownExitWithoutServe(t *testing.T) { func TestCapabilities(t *testing.T) { out, _ := capture(t, func() { Run([]string{"capabilities"}) }) - if !strings.HasPrefix(out, "identity-capabilities: v1") || - !strings.Contains(out, "ensure") || !strings.Contains(out, "verify") { - t.Fatalf("capabilities 输出异常:%q", out) + var doc Document + if err := json.Unmarshal([]byte(strings.TrimSpace(out)), &doc); err != nil { + t.Fatalf("capabilities 不是 JSON:%v %q", err, out) + } + if doc.Protocol != 1 || doc.Identity.Open != "existing-no-migrate" || doc.CLI.UnknownSubcommand != "reject" { + t.Fatalf("能力文档异常:%+v", doc) + } + if doc.Schema == nil || doc.Schema.Target != store.SchemaTarget() || doc.Schema.CompatFloor != store.SchemaCompatFloor() { + t.Fatalf("schema 能力异常:%+v", doc.Schema) } } -func TestEnsureVerifyRoundTripSQLite(t *testing.T) { +func migratedData(t *testing.T) (string, int) { + t.Helper() dir := t.TempDir() - args := []string{"--data", filepath.Join(dir, "d1")} + data := filepath.Join(dir, "data") + st, err := store.OpenSQLite(filepath.Join(data, "agent-system.db")) + if err != nil { + t.Fatal(err) + } + ver, err := st.SchemaVersion() + if err != nil { + t.Fatal(err) + } + st.Close() + return data, ver +} + +func TestEnsureVerifyRoundTripSQLite(t *testing.T) { + data, before := migratedData(t) + args := []string{"--data", data} id := "svc-t1-abcdef123456" if rc := Run(append([]string{"ensure", "--instance-id", id}, args...)); rc != 0 { t.Fatalf("ensure rc=%d", rc) } - if rc := Run(append([]string{"verify", "--instance-id", id}, args...)); rc != 0 { - t.Fatalf("verify rc=%d", rc) + out, _ := capture(t, func() { + if rc := Run(append([]string{"verify", "--instance-id", id}, args...)); rc != 0 { + t.Fatalf("verify rc=%d", rc) + } + }) + if !strings.Contains(out, "schema_version=") { + t.Fatalf("verify 未带 schema_version:%q", out) + } + st, err := store.OpenIdentity("", data) + if err != nil { + t.Fatal(err) + } + defer st.Close() + after, err := st.SchemaVersion() + if err != nil { + t.Fatal(err) + } + if after != before { + t.Fatalf("身份命令改变了 schema:%d → %d", before, after) } if rc := Run(append([]string{"verify", "--instance-id", "svc-t1-zzzzzz999999"}, args...)); rc != 1 { t.Fatalf("错 id 须 rc=1,得 %d", rc) @@ -74,3 +116,58 @@ func TestEnsureVerifyRoundTripSQLite(t *testing.T) { t.Fatalf("错 dbref 须 rc=1,得 %d", rc) } } + +func TestVerifyMissingDBCreatesNothing(t *testing.T) { + dir := t.TempDir() + missing := filepath.Join(dir, "absent") + if rc := Run([]string{"verify", "--instance-id", "svc-missing-aaaa", "--data", missing}); rc == 0 { + t.Fatal("缺库不应成功") + } + if _, err := os.Stat(missing); !os.IsNotExist(err) { + t.Fatalf("缺库路径被创建:%v", err) + } + if _, err := os.Stat(filepath.Join(missing, "agent-system.db")); !os.IsNotExist(err) { + t.Fatal("缺库时创建了数据库文件") + } +} + +func TestDSNFileMode(t *testing.T) { + dir := t.TempDir() + good := filepath.Join(dir, "dsn") + if err := os.WriteFile(good, []byte("postgres://example\n"), 0o600); err != nil { + t.Fatal(err) + } + got, err := ResolveDSN("", good) + if err != nil || got != "postgres://example" { + t.Fatalf("0600 文件:%q %v", got, err) + } + loose := filepath.Join(dir, "loose") + if err := os.WriteFile(loose, []byte("postgres://x"), 0o644); err != nil { + t.Fatal(err) + } + if _, err := ResolveDSN("", loose); err == nil { + t.Fatal("0644 的 dsn 文件必须拒绝") + } + _, errS := capture(t, func() { ResolveDSN("postgres://flag", "") }) + if !strings.Contains(errS, "警告") { + t.Fatalf("--dsn 应告警:%q", errS) + } +} + +// DSN 交付纪律:空的 AGENT_SYSTEM_DSN 不干扰已有 SQLite 库。 +func TestDSNEnvFallback(t *testing.T) { + t.Setenv("AGENT_SYSTEM_DSN", "") + data, _ := migratedData(t) + id := "svc-dsnenv-abcdef123456" + if rc := Run([]string{"ensure", "--instance-id", id, "--data", data}); rc != 0 { + t.Fatalf("ensure rc=%d", rc) + } + if rc := Run([]string{"verify", "--instance-id", id, "--data", data}); rc != 0 { + t.Fatalf("verify rc=%d", rc) + } + t.Setenv("AGENT_SYSTEM_DSN", "postgres://from-env") + got, err := ResolveDSN("", "") + if err != nil || got != "postgres://from-env" { + t.Fatalf("环境 DSN:%q %v", got, err) + } +}