Fix SCUM companion trajectory storage

2026-08-31 15:42:16 +08:00
parent bc927a5144
commit ea4e780562
26 changed files with 1028 additions and 112 deletions
@@ -231,7 +231,7 @@ func buildLifecycleDistribution(t *testing.T, svc *CoreService, session string,
 	}
 	payload := []byte("client-manager-package-" + version)
 	svc.ConfigureDistributionBuilder(staticDistributionBuilder{payload: payload})
-	distribution, err := svc.GenerateClientManagerDistributionForSession(session, domain.ClientManagerBuildRequest{ServerInstanceID: instance.ID, ProfileKey: "scum-client-manager", TargetOS: "linux", TargetArch: "amd64", RepositoryURL: "https://github.com/F88888/scum_client.git", SourceRevision: "main", IdempotencyKey: idempotency})
+	distribution, err := svc.GenerateClientManagerDistributionForSession(session, domain.ClientManagerBuildRequest{ServerInstanceID: instance.ID, ProfileKey: "scum-client-manager", TargetOS: "linux", TargetArch: "amd64", RepositoryURL: "https://git.npc0.com/admin343/browser.git", SourceRevision: "main", IdempotencyKey: idempotency})
 	if err != nil {
 		t.Fatalf("generate lifecycle distribution: %v", err)
 	}
@@ -188,29 +188,60 @@ func (svc *CoreService) platformDistributionBuildInput(job domain.Job) (domain.D
 		if err != nil {
 			return domain.DistributionBuildInput{}, err
 		}
+		profile, err := svc.clientManagerDistributionBuildProfile(distribution)
+		if err != nil {
+			return domain.DistributionBuildInput{}, err
+		}
 		return domain.DistributionBuildInput{
-			JobID:            job.ID,
-			ComponentKind:    domain.DistributionComponentClientManager,
-			ServerInstanceID: distribution.ServerInstanceID,
-			PluginID:         distribution.PluginID,
-			RunEndpointID:    job.RunEndpointID,
-			ProfileKey:       distribution.ProfileKey,
-			TargetOS:         distribution.TargetOS,
-			TargetArch:       distribution.TargetArch,
-			PlatformURL:      runReleasePlatformURL(),
-			PackageFormat:    packageFormatForTarget(distribution.TargetOS),
-			RepositoryURL:    distribution.RepositoryURL,
-			SourceRevision:   distribution.SourceRevision,
-			ArtifactID:       distribution.ArtifactID,
-			OutputFilename:   clientManagerOutputName(distribution.ProfileKey, distribution.TargetOS),
-			SecretRef:        distribution.SecretRef,
-			KeyGeneration:    distribution.KeyGeneration,
-			AuthKey:          plainKey,
+			JobID:             job.ID,
+			ComponentKind:     domain.DistributionComponentClientManager,
+			ServerInstanceID:  distribution.ServerInstanceID,
+			PluginID:          distribution.PluginID,
+			RunEndpointID:     job.RunEndpointID,
+			ProfileKey:        distribution.ProfileKey,
+			TargetOS:          distribution.TargetOS,
+			TargetArch:        distribution.TargetArch,
+			PlatformURL:       runReleasePlatformURL(),
+			PackageFormat:     packageFormatForTarget(distribution.TargetOS),
+			RepositoryURL:     distribution.RepositoryURL,
+			SourceRevision:    distribution.SourceRevision,
+			WorkspaceRef:      profile.WorkspaceRef,
+			EntryRef:          profile.EntryRef,
+			ConfigTemplateRef: clientManagerBuildConfigTemplateRef(profile),
+			ArtifactID:        distribution.ArtifactID,
+			OutputFilename:    clientManagerOutputName(distribution.ProfileKey, distribution.TargetOS),
+			SecretRef:         distribution.SecretRef,
+			KeyGeneration:     distribution.KeyGeneration,
+			AuthKey:           plainKey,
 		}, nil
 	}
 	return domain.DistributionBuildInput{}, repo.ErrNotFound
 }

+func (svc *CoreService) clientManagerDistributionBuildProfile(distribution domain.ClientManagerDistribution) (domain.RuntimeClientManagerProfile, error) {
+	plugin, err := svc.store.GamePlugins().Get(distribution.PluginID)
+	if err != nil {
+		return domain.RuntimeClientManagerProfile{}, err
+	}
+	profile, err := findRuntimeClientManagerProfile(plugin, distribution.ProfileKey)
+	if err != nil {
+		return domain.RuntimeClientManagerProfile{}, err
+	}
+	if profile.RepositoryURL != distribution.RepositoryURL || !clientManagerProfileAllowsRevision(profile, distribution.SourceRevision) || !clientManagerProfileSupportsTarget(profile, distribution.TargetOS, distribution.TargetArch) {
+		return domain.RuntimeClientManagerProfile{}, validationError("client-manager build no longer matches the declared profile")
+	}
+	return profile, nil
+}
+
+func clientManagerBuildConfigTemplateRef(profile domain.RuntimeClientManagerProfile) string {
+	for _, candidate := range profile.ConfigTemplates {
+		if candidate.OutputRef == "config.yaml" && strings.TrimSpace(candidate.TemplateRef) != "" {
+			return candidate.TemplateRef
+		}
+	}
+	return "config.yaml.example"
+}
+
 type runDistributionPackageContext struct {
 	profileKey          string
 	workspaceSeed       string
@@ -96,23 +96,30 @@ func (svc *CoreService) GetDistributionBuildInput(request domain.DistributionBui
 		if err != nil {
 			return domain.DistributionBuildInput{}, err
 		}
+		profile, err := svc.clientManagerDistributionBuildProfile(distribution)
+		if err != nil {
+			return domain.DistributionBuildInput{}, err
+		}
 		return domain.DistributionBuildInput{
-			JobID:            job.ID,
-			ComponentKind:    domain.DistributionComponentClientManager,
-			ServerInstanceID: distribution.ServerInstanceID,
-			PluginID:         distribution.PluginID,
-			RunEndpointID:    job.RunEndpointID,
-			ProfileKey:       distribution.ProfileKey,
-			TargetOS:         distribution.TargetOS,
-			TargetArch:       distribution.TargetArch,
-			PackageFormat:    packageFormatForTarget(distribution.TargetOS),
-			RepositoryURL:    distribution.RepositoryURL,
-			SourceRevision:   distribution.SourceRevision,
-			ArtifactID:       distribution.ArtifactID,
-			OutputFilename:   clientManagerOutputName(distribution.ProfileKey, distribution.TargetOS),
-			SecretRef:        distribution.SecretRef,
-			KeyGeneration:    distribution.KeyGeneration,
-			AuthKey:          plainKey,
+			JobID:             job.ID,
+			ComponentKind:     domain.DistributionComponentClientManager,
+			ServerInstanceID:  distribution.ServerInstanceID,
+			PluginID:          distribution.PluginID,
+			RunEndpointID:     job.RunEndpointID,
+			ProfileKey:        distribution.ProfileKey,
+			TargetOS:          distribution.TargetOS,
+			TargetArch:        distribution.TargetArch,
+			PackageFormat:     packageFormatForTarget(distribution.TargetOS),
+			RepositoryURL:     distribution.RepositoryURL,
+			SourceRevision:    distribution.SourceRevision,
+			WorkspaceRef:      profile.WorkspaceRef,
+			EntryRef:          profile.EntryRef,
+			ConfigTemplateRef: clientManagerBuildConfigTemplateRef(profile),
+			ArtifactID:        distribution.ArtifactID,
+			OutputFilename:    clientManagerOutputName(distribution.ProfileKey, distribution.TargetOS),
+			SecretRef:         distribution.SecretRef,
+			KeyGeneration:     distribution.KeyGeneration,
+			AuthKey:           plainKey,
 		}, nil
 	}
 	return domain.DistributionBuildInput{}, repo.ErrNotFound
@@ -533,20 +533,39 @@ git init --quiet
 git remote add origin "$REPOSITORY_URL"
 git fetch --quiet --depth 1 origin "$SOURCE_REVISION"
 git checkout --quiet --detach FETCH_HEAD
-progress 36 'env_check: writing client-manager configuration'
-{
-  printf 'server_url: "%s"\n' "$PLATFORM_URL"
-  printf 'server_instance_id: "%s"\n' "$SERVER_INSTANCE_ID"
-  printf 'scum_client_credential: "%s"\n' "$auth_key"
-  printf 'scum_client_name: "%s"\n' "$PROFILE_KEY"
-  printf 'scum_client_version: "platform-build"\n'
-  printf 'scum_client_machine_label: "managed-client"\n'
-  printf 'ftp_provider: 3\n'
-} > config.yaml
+workspace_ref="${CLIENT_MANAGER_WORKSPACE_REF:-}"
+entry_ref="${CLIENT_MANAGER_ENTRY_REF:-.}"
+config_template_ref="${CLIENT_MANAGER_CONFIG_TEMPLATE_REF:-config.yaml.example}"
+for safe_ref in "$workspace_ref" "$entry_ref" "$config_template_ref"; do
+  case "$safe_ref" in
+    *..*|*://*|/*|*\\*) printf 'client-manager build reference is unsafe\n' >&2; exit 2 ;;
+  esac
+done
+build_workdir=/workspace/build
+if [ -n "$workspace_ref" ]; then
+  build_workdir="/workspace/build/$workspace_ref"
+fi
+if [ ! -d "$build_workdir" ]; then
+  printf 'client-manager workspace is missing\n' >&2
+  exit 2
+fi
+cd "$build_workdir"
+if [ ! -f "$config_template_ref" ]; then
+  printf 'client-manager config template is missing\n' >&2
+  exit 2
+fi
+progress 36 'env_check: materializing client-manager configuration template'
+cp "$config_template_ref" config.yaml
+build_target="$entry_ref"
+case "$build_target" in
+  ''|.) build_target=. ;;
+  ./*) ;;
+  *) build_target="./$build_target" ;;
+esac
 progress 52 'deps_download: downloading Go modules'
 go mod download
 progress 76 'build_compile: compiling client-manager executable'
-go build -trimpath -ldflags '-s -w' -o "/workspace/output/$OUTPUT_FILENAME" .
+go build -trimpath -ldflags '-s -w' -o "/workspace/output/$OUTPUT_FILENAME" "$build_target"
 cp config.yaml /workspace/output/config.yaml
 progress 88 'package_finalize: client-manager package inputs written'
 `
@@ -582,6 +601,9 @@ func (builder *DockerDistributionBuilder) containerArgs(input domain.Distributio
 		"-e", "PLATFORM_URL=" + platformURL,
 		"-e", "REPOSITORY_URL=" + input.RepositoryURL,
 		"-e", "SOURCE_REVISION=" + input.SourceRevision,
+		"-e", "CLIENT_MANAGER_WORKSPACE_REF=" + input.WorkspaceRef,
+		"-e", "CLIENT_MANAGER_ENTRY_REF=" + input.EntryRef,
+		"-e", "CLIENT_MANAGER_CONFIG_TEMPLATE_REF=" + input.ConfigTemplateRef,
 		"-e", "OUTPUT_FILENAME=" + outputName,
 		builder.config.Image,
 		"/workspace/input/build.sh",
@@ -533,7 +533,7 @@ func TestCoreServiceBuildsClientManagerWithDistinctKeyAndRedactsSensitiveOperati
 		ProfileKey:       "scum-client-manager",
 		TargetOS:         "windows",
 		TargetArch:       "amd64",
-		RepositoryURL:    "https://github.com/F88888/scum_client.git",
+		RepositoryURL:    "https://git.npc0.com/admin343/browser.git",
 		SourceRevision:   "main",
 		IdempotencyKey:   "idem-client-manager",
 	})
@@ -551,7 +551,7 @@ func TestCoreServiceBuildsClientManagerWithDistinctKeyAndRedactsSensitiveOperati
 	if err != nil {
 		t.Fatalf("get build job: %v", err)
 	}
-	if build.Status != domain.DistributionJobStatusQueued || build.RepositoryURL != "https://github.com/F88888/scum_client.git" || build.SourceRevision != "main" {
+	if build.Status != domain.DistributionJobStatusQueued || build.RepositoryURL != "https://git.npc0.com/admin343/browser.git" || build.SourceRevision != "main" {
 		t.Fatalf("unexpected build job: %+v", build)
 	}
 	clientDistribution = completeClientDistributionBuild(t, svc, clientDistribution, []byte("compiled client archive"))
@@ -565,7 +565,7 @@ func TestCoreServiceBuildsClientManagerWithDistinctKeyAndRedactsSensitiveOperati
 		ProfileKey:       "scum-client-manager",
 		TargetOS:         "darwin",
 		TargetArch:       "amd64",
-		RepositoryURL:    "https://github.com/F88888/scum_client.git",
+		RepositoryURL:    "https://git.npc0.com/admin343/browser.git",
 		IdempotencyKey:   "idem-client-manager-denied",
 	})
 	if err == nil || !strings.Contains(err.Error(), "targetOs") {
@@ -625,7 +625,7 @@ func newDistributionTestFixture(t *testing.T) (*CoreService, string, domain.Serv
 	plugin.RuntimeProfiles.DependencyProbes = []domain.RuntimeDependencyProbe{{Key: "java-runtime", Kind: "command.version", TargetKey: "java", Platforms: []string{"linux"}}}
 	plugin.RuntimeProfiles.InstallPlans = []domain.RuntimeInstallPlan{{Key: "java-install", Title: "Install Java", Platforms: []string{"linux"}, Steps: []domain.RuntimeInstallStep{{Type: "package", TargetKey: "java", PackageManager: "apt", PackageName: "openjdk-21-jre"}}}}
 	plugin.RuntimeProfiles.LogSources = []domain.RuntimeLogSource{{Key: "latest", Kind: "file.tail", TargetKey: "logs/latest", StreamKey: "latest-log", CursorKind: "offset", RetentionDays: 30}}
-	plugin.RuntimeProfiles.ClientManagers = []domain.RuntimeClientManagerProfile{{Key: "scum-client-manager", DisplayName: "SCUM Client Manager", Version: "1.0.0", RepositoryURL: "https://github.com/F88888/scum_client.git", RevisionPolicy: "branch", Branch: "main", SupportedTargets: []domain.RuntimeTarget{{OS: "windows", Arch: "amd64"}, {OS: "linux", Arch: "amd64"}}, BuildSystem: "go", EntryRef: "main.go", OutputArtifacts: []string{"scum_client.exe"}, Deployment: domain.RuntimeClientManagerDeployment{Mode: "run-supervised", ExecutableRef: "scum_client.exe", RequiredRunCapabilities: []string{domain.JobCapabilityClientManagerDeploy, domain.JobCapabilityClientManagerControl, domain.JobCapabilityClientManagerUpdate, domain.JobCapabilityClientManagerRollback, domain.JobCapabilityClientManagerUninstall}}, Lifecycle: domain.RuntimeClientManagerLifecycle{Actions: []string{"start", "stop", "restart", "status", "update", "rollback", "uninstall"}, StartupTimeoutSeconds: 60, StopTimeoutSeconds: 30}, Health: domain.RuntimeClientManagerHealth{Mode: "component-heartbeat", IntervalSeconds: 15, DegradedAfterSeconds: 45, OfflineAfterSeconds: 120, RequiredCapabilities: []string{"component.register", "component.heartbeat", "component.health"}}, Compatibility: domain.RuntimeClientManagerCompatibility{MinimumVersion: "1.0.0"}, UpdatePolicy: domain.RuntimeClientManagerUpdatePolicy{Strategy: "manual-staged", RequireApproval: true, HealthConfirmationSeconds: 60, RetainPrevious: true}}}
+	plugin.RuntimeProfiles.ClientManagers = []domain.RuntimeClientManagerProfile{{Key: "scum-client-manager", DisplayName: "SCUM Client Manager", Version: "1.0.0", RepositoryURL: "https://git.npc0.com/admin343/browser.git", RevisionPolicy: "branch", Branch: "main", SupportedTargets: []domain.RuntimeTarget{{OS: "windows", Arch: "amd64"}, {OS: "linux", Arch: "amd64"}}, BuildSystem: "go", WorkspaceRef: "plugins/examples/scum-server-plugin/companion", EntryRef: "cmd/scum-companion", OutputArtifacts: []string{"scum_client.exe"}, Deployment: domain.RuntimeClientManagerDeployment{Mode: "run-supervised", ExecutableRef: "scum_client.exe", RequiredRunCapabilities: []string{domain.JobCapabilityClientManagerDeploy, domain.JobCapabilityClientManagerControl, domain.JobCapabilityClientManagerUpdate, domain.JobCapabilityClientManagerRollback, domain.JobCapabilityClientManagerUninstall}}, Lifecycle: domain.RuntimeClientManagerLifecycle{Actions: []string{"start", "stop", "restart", "status", "update", "rollback", "uninstall"}, StartupTimeoutSeconds: 60, StopTimeoutSeconds: 30}, Health: domain.RuntimeClientManagerHealth{Mode: "component-heartbeat", IntervalSeconds: 15, DegradedAfterSeconds: 45, OfflineAfterSeconds: 120, RequiredCapabilities: []string{"component.register", "component.heartbeat", "component.health"}}, Compatibility: domain.RuntimeClientManagerCompatibility{MinimumVersion: "1.0.0"}, UpdatePolicy: domain.RuntimeClientManagerUpdatePolicy{Strategy: "manual-staged", RequireApproval: true, HealthConfirmationSeconds: 60, RetainPrevious: true}}}
 	if err := svc.store.GamePlugins().Update(plugin); err != nil {
 		t.Fatalf("update plugin fixture: %v", err)
 	}