8fd3087 fix: cancel extension installer subprocesses · zut

M Makefile +2 -1


@@ -50,7 +50,8 @@ vet:
50	50		$(GO) vet ./...
51	51
52	52		fmt-check:
53		-	@test -z "$$(gofmt -l . \| tee /dev/stderr)" \|\| (echo "gofmt issues"; exit 1)
	53	+	@files="$$(gofmt -l . 2>&1)" \|\| { printf '%s\n' "$$files" >&2; echo "gofmt failed" >&2; exit 1; }; \
	54	+	if [ -n "$$files" ]; then printf '%s\n' "$$files" >&2; echo "gofmt issues" >&2; exit 1; fi
54	55
55	56		lint: vet fmt-check
56	57


@@ -50,7 +50,8 @@ vet:
50		$(GO) vet ./...	50		$(GO) vet ./...
51			51
52		fmt-check:	52		fmt-check:
53	-	@test -z "$$(gofmt -l . \| tee /dev/stderr)" \|\| (echo "gofmt issues"; exit 1)	53	+	@files="$$(gofmt -l . 2>&1)" \|\| { printf '%s\n' "$$files" >&2; echo "gofmt failed" >&2; exit 1; }; \
			54	+	if [ -n "$$files" ]; then printf '%s\n' "$$files" >&2; echo "gofmt issues" >&2; exit 1; fi
54			55
55		lint: vet fmt-check	56		lint: vet fmt-check
56			57

M docs/extensions.md +5 -4


@@ -85,8 +85,9 @@ The `examples/extensions/` directory in the repo is reference code, not a defaul
85	85		zot ext install --build=go path/to/zot/examples/extensions/hello
86	86
87	87		# or build it in the source tree for a one-run development load
88		-	cd path/to/zot/examples/extensions/hello && go build -o hello .
89		-	zot --ext path/to/zot/examples/extensions/hello
	88	+	cd path/to/zot/examples/extensions/hello
	89	+	go build -o hello .
	90	+	zot --ext .
90	91		```
91	92
92	93		`zot ext install` never builds source code implicitly. For local installs it

@@ -605,8 +606,8 @@ Reply with `shutdown_ack` and then exit.
605	606		```
606	607		zot ext list list installed extensions and their state
607	608		zot ext doctor diagnose load, registration, and conflict issues
608		-	zot ext install [--build=go] <path\|git-url>
609		-	copy / clone into $ZOT_HOME/extensions/
	609	+	zot ext install <path\|git-url> copy / clone into $ZOT_HOME/extensions/
	610	+	zot ext install --build=go <local-path> build local Go source, then install
610	611		zot ext remove <name> delete an extension directory
611	612		zot ext enable <name> re-enable a disabled extension
612	613		zot ext disable <name> disable without removing

 zot ext install --build=go path/to/zot/examples/extensions/hello
 # or build it in the source tree for a one-run development load
-cd path/to/zot/examples/extensions/hello && go build -o hello .
+cd path/to/zot/examples/extensions/hello
-zot --ext path/to/zot/examples/extensions/hello
+go build -o hello .
+zot --ext .
 ```
 `zot ext install` never builds source code implicitly. For local installs it
 ```
 zot ext list                              list installed extensions and their state
 zot ext doctor                            diagnose load, registration, and conflict issues
-zot ext install [--build=go] <path|git-url>
+zot ext install <path|git-url>             copy / clone into $ZOT_HOME/extensions/
-                                          copy / clone into $ZOT_HOME/extensions/
+zot ext install --build=go <local-path>   build local Go source, then install
 zot ext remove <name>                     delete an extension directory
 zot ext enable <name>           re-enable a disabled extension
 zot ext disable <name>          disable without removing

M packages/agent/args.go +1 -1


@@ -423,7 +423,7 @@ func PrintHelp(version string) {
423	423		)
424	424		section("extensions",
425	425		row{"zot ext list", "list installed extensions"},
426		-	row{"zot ext install <path\|url>", "install from a local path or URL"},
	426	+	row{"zot ext install <path\|git-url>", "install from a local path or Git URL"},
427	427		row{"zot ext install --build=go <path>", "build local Go source, then install"},
428	428		row{"zot --ext ./path/to/ext", "load an extension for this run only"},
429	429		row{"zot ext help", "show all extension subcommands"},


@@ -423,7 +423,7 @@ func PrintHelp(version string) {
423		)	423		)
424		section("extensions",	424		section("extensions",
425		row{"zot ext list", "list installed extensions"},	425		row{"zot ext list", "list installed extensions"},
426	-	row{"zot ext install <path\|url>", "install from a local path or URL"},	426	+	row{"zot ext install <path\|git-url>", "install from a local path or Git URL"},
427		row{"zot ext install --build=go <path>", "build local Go source, then install"},	427		row{"zot ext install --build=go <path>", "build local Go source, then install"},
428		row{"zot --ext ./path/to/ext", "load an extension for this run only"},	428		row{"zot --ext ./path/to/ext", "load an extension for this run only"},
429		row{"zot ext help", "show all extension subcommands"},	429		row{"zot ext help", "show all extension subcommands"},

M packages/agent/cli.go +11 -1


@@ -620,12 +620,22 @@ func fanoutAgentEvent(mgr *extensions.Manager, ev core.AgentEvent) {
620	620
621	621		// Run is the top-level entrypoint for the zot binary.
622	622		func Run(rawArgs []string, version string) error {
	623	+	// Extension installs can invoke external build and clone processes.
	624	+	// Give those processes a cancellation context without changing signal
	625	+	// handling for the interactive modes below.
	626	+	extCtx := context.Background()
	627	+	stopExtContext := func() {}
	628	+	if len(rawArgs) > 0 && rawArgs[0] == "ext" {
	629	+	extCtx, stopExtContext = signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
	630	+	}
	631	+	defer stopExtContext()
	632	+
623	633		// Subcommand router: `zot bot ...` is handled separately so the
624	634		// generic flag parser doesn't reject "bot" as a positional arg.
625	635		if handled, err := runBotCommand(rawArgs, version); handled {
626	636		return err
627	637		}
628		-	if handled, err := runExtCommand(rawArgs, version); handled {
	638	+	if handled, err := runExtCommand(extCtx, rawArgs, version); handled {
629	639		return err
630	640		}
631	641		if handled, err := runUpdateCommand(rawArgs, version); handled {

 // Run is the top-level entrypoint for the zot binary.
 func Run(rawArgs []string, version string) error {
+	// Extension installs can invoke external build and clone processes.
+	// Give those processes a cancellation context without changing signal
+	// handling for the interactive modes below.
+	extCtx := context.Background()
+	stopExtContext := func() {}
+	if len(rawArgs) > 0 && rawArgs[0] == "ext" {
+		extCtx, stopExtContext = signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
+	}
+	defer stopExtContext()
 	// Subcommand router: `zot bot ...` is handled separately so the
 	// generic flag parser doesn't reject "bot" as a positional arg.
 	if handled, err := runBotCommand(rawArgs, version); handled {
 		return err
 	}
-	if handled, err := runExtCommand(rawArgs, version); handled {
+	if handled, err := runExtCommand(extCtx, rawArgs, version); handled {
 		return err
 	}
 	if handled, err := runUpdateCommand(rawArgs, version); handled {

M packages/agent/extcmd.go +14 -9


@@ -23,7 +23,7 @@ import (
23	23		// (handled=true, err) if rawArgs starts with "ext"; otherwise
24	24		// (handled=false, nil) so the main router falls through to the
25	25		// regular flag parser.
26		-	func runExtCommand(rawArgs []string, version string) (handled bool, err error) {
	26	+	func runExtCommand(ctx context.Context, rawArgs []string, version string) (handled bool, err error) {
27	27		if len(rawArgs) == 0 \|\| rawArgs[0] != "ext" {
28	28		return false, nil
29	29		}

@@ -45,7 +45,7 @@ func runExtCommand(rawArgs []string, version string) (handled bool, err error) {
45	45		case "remove", "rm":
46	46		return true, extRemove(rawArgs[2:])
47	47		case "install":
48		-	return true, extInstall(rawArgs[2:])
	48	+	return true, extInstallContext(ctx, rawArgs[2:])
49	49		case "help", "-h", "--help":
50	50		printExtHelp()
51	51		return true, nil

@@ -473,6 +473,10 @@ func extRemove(args []string) error {
473	473		// Builds are never inferred or run implicitly; --build=go is an explicit
474	474		// opt-in for local Go extensions.
475	475		func extInstall(args []string) error {
	476	+	return extInstallContext(context.Background(), args)
	477	+	}
	478	+
	479	+	func extInstallContext(ctx context.Context, args []string) error {
476	480		opts, err := parseExtInstallArgs(args)
477	481		if err != nil {
478	482		return err

@@ -487,7 +491,7 @@ func extInstall(args []string) error {
487	491		if opts.builder != "" {
488	492		return errors.New("--build=go is currently supported only for local extension paths; clone the extension locally and build it there")
489	493		}
490		-	return installGitExtension(src, dest)
	494	+	return installGitExtension(ctx, src, dest)
491	495		}
492	496
493	497		// Local path: must be a directory containing extension.json.

@@ -523,7 +527,7 @@ func extInstall(args []string) error {
523	527		return fmt.Errorf("copy extension: %w", err)
524	528		}
525	529		if opts.builder != "" {
526		-	if err := buildLocalExtension(absSrc, staged, manifest); err != nil {
	530	+	if err := buildLocalExtension(ctx, absSrc, staged, manifest); err != nil {
527	531		return err
528	532		}
529	533		}

@@ -591,7 +595,7 @@ func parseExtInstallArgs(args []string) (extInstallOptions, error) {
591	595		return opts, nil
592	596		}
593	597
594		-	func buildLocalExtension(sourceDir, stagedDir string, manifest extensions.Manifest) error {
	598	+	func buildLocalExtension(ctx context.Context, sourceDir, stagedDir string, manifest extensions.Manifest) error {
595	599		if manifest.Exec == "" {
596	600		return errors.New("cannot build a theme-only extension; it does not declare an executable")
597	601		}

@@ -605,7 +609,7 @@ func buildLocalExtension(sourceDir, stagedDir string, manifest extensions.Manife
605	609		}
606	610
607	611		fmt.Fprintf(os.Stderr, "building %s with go\n", manifest.Name)
608		-	cmd := exec.Command("go", "build", "-trimpath", "-o", stagedExec, ".")
	612	+	cmd := exec.CommandContext(ctx, "go", "build", "-trimpath", "-o", stagedExec, ".")
609	613		cmd.Dir = sourceDir
610	614		cmd.Stdout = os.Stderr
611	615		cmd.Stderr = os.Stderr

@@ -634,7 +638,7 @@ func extensionRelativeExecPath(dir, execName string) (string, error) {
634	638		return rel, nil
635	639		}
636	640
637		-	func installGitExtension(src, dest string) error {
	641	+	func installGitExtension(ctx context.Context, src, dest string) error {
638	642		stageRoot, err := os.MkdirTemp(dest, ".zot-extension-clone-")
639	643		if err != nil {
640	644		return fmt.Errorf("create install staging directory: %w", err)

@@ -642,7 +646,8 @@ func installGitExtension(src, dest string) error {
642	646		defer os.RemoveAll(stageRoot)
643	647
644	648		cloneDir := filepath.Join(stageRoot, "extension")
645		-	cmd := exec.Command("git", "clone", "--depth", "1", src, cloneDir)
	649	+	cmd := exec.CommandContext(ctx, "git", "clone", "--depth", "1", src, cloneDir)
	650	+	cmd.Env = append(os.Environ(), "GIT_TERMINAL_PROMPT=0")
646	651		cmd.Stdout = os.Stderr
647	652		cmd.Stderr = os.Stderr
648	653		if err := cmd.Run(); err != nil {

@@ -684,7 +689,7 @@ func readExtensionManifest(dir string) (extensions.Manifest, error) {
684	689		if manifest.Name != strings.TrimSpace(manifest.Name) {
685	690		return extensions.Manifest{}, fmt.Errorf("manifest: extension name %q has leading or trailing whitespace", manifest.Name)
686	691		}
687		-	if manifest.Name == "." \|\| manifest.Name == ".." \|\| strings.ContainsAny(manifest.Name, `/\\`) {
	692	+	if strings.HasPrefix(manifest.Name, ".") \|\| strings.ContainsAny(manifest.Name, `/\\`) {
688	693		return extensions.Manifest{}, fmt.Errorf("manifest: invalid extension name %q", manifest.Name)
689	694		}
690	695		if manifest.Exec == "" && !extensions.HasExtensionTheme(dir) {

 // (handled=true, err) if rawArgs starts with "ext"; otherwise
 // (handled=false, nil) so the main router falls through to the
 // regular flag parser.
-func runExtCommand(rawArgs []string, version string) (handled bool, err error) {
+func runExtCommand(ctx context.Context, rawArgs []string, version string) (handled bool, err error) {
 	if len(rawArgs) == 0 || rawArgs[0] != "ext" {
 		return false, nil
 	}
 	case "remove", "rm":
 		return true, extRemove(rawArgs[2:])
 	case "install":
-		return true, extInstall(rawArgs[2:])
+		return true, extInstallContext(ctx, rawArgs[2:])
 	case "help", "-h", "--help":
 		printExtHelp()
 		return true, nil
 // Builds are never inferred or run implicitly; --build=go is an explicit
 // opt-in for local Go extensions.
 func extInstall(args []string) error {
+	return extInstallContext(context.Background(), args)
+}
+func extInstallContext(ctx context.Context, args []string) error {
 	opts, err := parseExtInstallArgs(args)
 	if err != nil {
 		return err
 		if opts.builder != "" {
 			return errors.New("--build=go is currently supported only for local extension paths; clone the extension locally and build it there")
 		}
-		return installGitExtension(src, dest)
+		return installGitExtension(ctx, src, dest)
 	}
 	// Local path: must be a directory containing extension.json.
 		return fmt.Errorf("copy extension: %w", err)
 	}
 	if opts.builder != "" {
-		if err := buildLocalExtension(absSrc, staged, manifest); err != nil {
+		if err := buildLocalExtension(ctx, absSrc, staged, manifest); err != nil {
 			return err
 		}
 	}
 	return opts, nil
 }
-func buildLocalExtension(sourceDir, stagedDir string, manifest extensions.Manifest) error {
+func buildLocalExtension(ctx context.Context, sourceDir, stagedDir string, manifest extensions.Manifest) error {
 	if manifest.Exec == "" {
 		return errors.New("cannot build a theme-only extension; it does not declare an executable")
 	}
 	}
 	fmt.Fprintf(os.Stderr, "building %s with go\n", manifest.Name)
-	cmd := exec.Command("go", "build", "-trimpath", "-o", stagedExec, ".")
+	cmd := exec.CommandContext(ctx, "go", "build", "-trimpath", "-o", stagedExec, ".")
 	cmd.Dir = sourceDir
 	cmd.Stdout = os.Stderr
 	cmd.Stderr = os.Stderr
 	return rel, nil
 }
-func installGitExtension(src, dest string) error {
+func installGitExtension(ctx context.Context, src, dest string) error {
 	stageRoot, err := os.MkdirTemp(dest, ".zot-extension-clone-")
 	if err != nil {
 		return fmt.Errorf("create install staging directory: %w", err)
 	defer os.RemoveAll(stageRoot)
 	cloneDir := filepath.Join(stageRoot, "extension")
-	cmd := exec.Command("git", "clone", "--depth", "1", src, cloneDir)
+	cmd := exec.CommandContext(ctx, "git", "clone", "--depth", "1", src, cloneDir)
+	cmd.Env = append(os.Environ(), "GIT_TERMINAL_PROMPT=0")
 	cmd.Stdout = os.Stderr
 	cmd.Stderr = os.Stderr
 	if err := cmd.Run(); err != nil {
 	if manifest.Name != strings.TrimSpace(manifest.Name) {
 		return extensions.Manifest{}, fmt.Errorf("manifest: extension name %q has leading or trailing whitespace", manifest.Name)
 	}
-	if manifest.Name == "." || manifest.Name == ".." || strings.ContainsAny(manifest.Name, `/\\`) {
+	if strings.HasPrefix(manifest.Name, ".") || strings.ContainsAny(manifest.Name, `/\\`) {
 		return extensions.Manifest{}, fmt.Errorf("manifest: invalid extension name %q", manifest.Name)
 	}
 	if manifest.Exec == "" && !extensions.HasExtensionTheme(dir) {

M packages/agent/extcmd_test.go +17 -0


@@ -278,6 +278,23 @@ func TestExtInstallRejectsWhitespaceManifestName(t *testing.T) {
278	278		}
279	279		}
280	280
	281	+	func TestExtInstallRejectsDotManifestName(t *testing.T) {
	282	+	home := t.TempDir()
	283	+	t.Setenv("ZOT_HOME", home)
	284	+	src := filepath.Join(t.TempDir(), "dot-name")
	285	+	if err := os.MkdirAll(src, 0o755); err != nil {
	286	+	t.Fatal(err)
	287	+	}
	288	+	if err := os.WriteFile(filepath.Join(src, "extension.json"), []byte(`{"name":".example","exec":"go"}`), 0o644); err != nil {
	289	+	t.Fatal(err)
	290	+	}
	291	+
	292	+	err := extInstall([]string{src})
	293	+	if err == nil \|\| !strings.Contains(err.Error(), "invalid extension name") {
	294	+	t.Fatalf("error = %v, want invalid-name validation error", err)
	295	+	}
	296	+	}
	297	+
281	298		func TestExtInstallRejectsBuildForPATHExecutable(t *testing.T) {
282	299		home := t.TempDir()
283	300		t.Setenv("ZOT_HOME", home)


@@ -278,6 +278,23 @@ func TestExtInstallRejectsWhitespaceManifestName(t *testing.T) {
278	}	278		}
279	}	279		}
280		280
		281	+	func TestExtInstallRejectsDotManifestName(t *testing.T) {
		282	+	home := t.TempDir()
		283	+	t.Setenv("ZOT_HOME", home)
		284	+	src := filepath.Join(t.TempDir(), "dot-name")
		285	+	if err := os.MkdirAll(src, 0o755); err != nil {
		286	+	t.Fatal(err)
		287	+	}
		288	+	if err := os.WriteFile(filepath.Join(src, "extension.json"), []byte(`{"name":".example","exec":"go"}`), 0o644); err != nil {
		289	+	t.Fatal(err)
		290	+	}
		291	+
		292	+	err := extInstall([]string{src})
		293	+	if err == nil \|\| !strings.Contains(err.Error(), "invalid extension name") {
		294	+	t.Fatalf("error = %v, want invalid-name validation error", err)
		295	+	}
		296	+	}
		297	+
281	func TestExtInstallRejectsBuildForPATHExecutable(t *testing.T) {	298		func TestExtInstallRejectsBuildForPATHExecutable(t *testing.T) {
282	home := t.TempDir()	299		home := t.TempDir()
283	t.Setenv("ZOT_HOME", home)	300		t.Setenv("ZOT_HOME", home)