agent-exec transport 34e93ed2817e051b9b824abe27d8c08a/3eba67b6e84f

cmd/agent-system/account_io_test.go

@@ -43,15 +43,14 @@ func cliStore(t *testing.T) (string, *store.Store) {
 	}
 	return dir, s
 }
-func TestOutputFileAppliesToEveryCredentialCommand(t *testing.T) {
+func TestCreateAndInitializeAccountDoNotRequireCredentialOutput(t *testing.T) {
 	for _, sub := range []string{"create", "initialize-account"} {
 		t.Run(sub, func(t *testing.T) {
 			dir, s := cliStore(t)
 			if _, e := s.BootstrapFirstAdminWrite(store.AccountWrite{Owner: "root", Name: "Root", Actor: "test"}); e != nil {
 				t.Fatal(e)
 			}
-			out := filepath.Join(t.TempDir(), "secret")
-			args := []string{sub, "--data", dir, "--owner", "ada", "--out-file", out}
+			args := []string{sub, "--data", dir, "--owner", "ada"}
 			if sub == "initialize-account" {
 				a, e := s.CreatePendingAccount("root", "ada", store.AccountProfile{Name: "Ada"})
 				if e != nil {
@@ -61,14 +60,7 @@ func TestOutputFileAppliesToEveryCredentialCommand(t *testing.T) {
 			}
 			rc, _ := accountCLI(t, args...)
 			if rc != 0 {
-				t.Fatalf("credential command failed: %d", rc)
-			}
-			info, e := os.Stat(out)
-			if e != nil {
-				t.Fatal("credential output file missing")
-			}
-			if info.Mode().Perm() != 0600 {
-				t.Fatal("credential output permissions are not private")
+				t.Fatalf("command failed without credential output file: %d", rc)
 			}
 		})
 	}

cmd/agent-system/main.go

@@ -10,7 +10,6 @@ import (
 	"fmt"
 	"os"
 	"strings"
-	"time"
 
 	"agent-system-backend/internal/app"
 	"agent-system-backend/internal/config"
@@ -448,7 +447,7 @@ func runUser(args []string) int {
 	name := fs.String("name", "", "显示名")
 	password := fs.String("password", "", "密码（已弃用；请用 --password-stdin）")
 	passwordStdin := fs.Bool("password-stdin", false, "从 stdin 读取密码")
-	outFile := fs.String("out-file", "", "把明文凭据独占写入该文件（0600）")
+	outFile := fs.String("out-file", "", "凭据交付文件（仅历史兼容子命令可用）")
 	instanceID := fs.String("instance-id", "", "严格核验库内服务身份")
 	admin := fs.Bool("admin", false, "管理员（现已拒绝：仅超级管理员可在服务端任命管理员）")
 	role := fs.String("role", "user", "角色 user|admin（admin 现已拒绝）")
@@ -458,7 +457,7 @@ func runUser(args []string) int {
 	fs.Int("ttl-minutes", 30, "旧 issue-login-key 参数（现已拒绝）")
 	fs.Bool("revoke-all-credentials", false, "旧 issue-login-key 参数（现已拒绝）")
 	keyID := fs.String("id", "", "revoke-login-key 凭据编号")
-	out := fs.String("out", "", "凭据保护交付文件（0600 JSON）")
+	out := fs.String("out", "", "凭据交付文件（JSON；仅历史兼容子命令可用）")
 	fs.Parse(args[1:])
 	if sub == "reset-password" || sub == "issue-login-key" {
 		fmt.Fprintln(os.Stderr, "RECOVERY_CONTRACT_REPLACED: use POST /api/admin/users/{owner}/one-time-password")
@@ -493,24 +492,14 @@ func runUser(args []string) int {
 	}
 	*dsn = resolvedDSN
 	*password = resolvedPassword
-	credentialAction := sub == "create" || sub == "initialize-account"
-	if credentialAction && *outFile == "" && *out == "" {
-		fmt.Fprintln(os.Stderr, "user: --out or --out-file is required for protected credential delivery")
+	if (sub == "create" || sub == "initialize-account") && (*outFile != "" || *out != "") {
+		fmt.Fprintln(os.Stderr, "user:", "local activation redemption is removed; do not use --out/--out-file. Ask an administrator to issue POST /api/admin/users/{owner}/one-time-password")
 		return 2
 	}
-	if !credentialAction && (*outFile != "" || *out != "") {
+	if sub != "create" && sub != "initialize-account" && (*outFile != "" || *out != "") {
 		fmt.Fprintln(os.Stderr, "user: 此子命令不生成凭据")
 		return 2
 	}
-	var delivery *credentialOutput
-	if credentialAction {
-		delivery, err = reserveCredentialOutput(*outFile, *out)
-		if err != nil {
-			fmt.Fprintln(os.Stderr, "user:", err)
-			return 2
-		}
-		defer delivery.abort()
-	}
 	switch sub {
 	case "create":
 		if *owner == "" {
@@ -526,15 +515,12 @@ func runUser(args []string) int {
 			fmt.Fprintf(os.Stderr, "user create: 未知角色 %q\n", *role)
 			return 2
 		}
-		pw, opID, err := app.CreateUserAccount(*dsn, *data, *owner, *name, *password, isAdmin, *openExisting, *generatePassword)
+		_, opID, err := app.CreateUserAccount(*dsn, *data, *owner, *name, *password, isAdmin, *openExisting, *generatePassword)
 		if err != nil {
 			fmt.Fprintln(os.Stderr, "user create:", err)
 			return 1
 		}
-		if err := delivery.deliver("login-key", *owner, pw, nil); err != nil {
-			fmt.Fprintln(os.Stderr, "user create:", err)
-			return 1
-		}
+		fmt.Fprintf(os.Stderr, "owner=%s created as pending; ask an administrator to issue POST /api/admin/users/%s/one-time-password\n", *owner, *owner)
 		fmt.Fprintf(os.Stderr, "operation_id=%s\n", opID)
 		return 0
 	case "initialize-account":
@@ -542,15 +528,12 @@ func runUser(args []string) int {
 			fmt.Fprintln(os.Stderr, "user initialize-account: --user-id、--expected-state-version、--expected-generation 必填")
 			return 2
 		}
-		plain, targetOwner, err := app.InitializeAccount(*dsn, *data, *userID, *expectedStateVersion, *expectedGeneration)
+		_, targetOwner, err := app.InitializeAccount(*dsn, *data, *userID, *expectedStateVersion, *expectedGeneration)
 		if err != nil {
 			fmt.Fprintln(os.Stderr, "user initialize-account:", err)
 			return 1
 		}
-		if err := delivery.deliver("activation", targetOwner, plain, time.Now().Add(30*time.Minute).UTC()); err != nil {
-			fmt.Fprintln(os.Stderr, "user initialize-account:", err)
-			return 1
-		}
+		fmt.Fprintf(os.Stderr, "owner=%s remains pending; ask an administrator to issue POST /api/admin/users/%s/one-time-password\n", targetOwner, targetOwner)
 		return 0
 	case "reset-password":
 		fmt.Fprintln(os.Stderr, "RECOVERY_CONTRACT_REPLACED: use POST /api/admin/users/{owner}/one-time-password")

cmd/agent-system/user_contract_test.go

@@ -69,7 +69,7 @@ func TestUserCLIAdministratorAppointmentLeavesExistingStoreUnchanged(t *testing.
 	if _, err := s.GetUser("mallory"); err == nil {
 		t.Fatal("rejected CLI appointment created an account")
 	}
-	rc, _ := accountCLI(t, "create", "--data", dir, "--owner", "ada", "--out-file", filepath.Join(t.TempDir(), "ada"))
+	rc, _ := accountCLI(t, "create", "--data", dir, "--owner", "ada")
 	if rc != 0 {
 		t.Fatalf("ordinary local create failed: %d", rc)
 	}