Add fixes

Signed-off-by: Anmol Virdi <anmol.virdi@chainguard.dev>

Author: AnmolVirdi

docs/BUILD-PROCESS.md

@@ -33,7 +33,7 @@ needs:
       - CAP_SYS_ADMIN
 ```
 
-Capabilities declared by build pipelines are added to the build runner. Capabilities declared by test pipelines are scoped to that test's runner under `melange test`, so a capability one subpackage's test needs is not granted to sibling tests or to the build runner. Names are checked while the pipeline is compiled, so a misspelled `CAP_*` fails the build rather than the container.
+Capabilities declared by build pipelines are added to the build runner. Capabilities declared by test pipelines are scoped to that test's runner under `melange test`, so a capability one subpackage's test needs is not granted to sibling tests or to the build runner. Compilation records them under the test's `capabilities`, so they survive into a compiled configuration and are still applied when testing it. Names are checked while the pipeline is compiled, so a misspelled `CAP_*` fails the build rather than the container.
 
 ## Where does Melange build?
 

pkg/build/compile.go

@@ -195,10 +195,14 @@ func (b *Build) Compile(ctx context.Context, opts ...CompileOption) error {
 		// Sort and remove duplicates.
 		te.Packages = slices.Compact(slices.Sorted(slices.Values(te.Packages)))
 
-		// Capabilities from test pipelines are intentionally not applied here:
-		// `melange build` never runs the test pipelines, so granting them to the
-		// build runner would only over-privilege it. Test.Compile scopes them to
-		// each test's runner under `melange test`.
+		// Capabilities gathered from the test pipelines are recorded on the test
+		// rather than on b.Configuration.Capabilities: `melange build` never runs
+		// the test pipelines, so granting them to the build runner would only
+		// over-privilege it. Recording them here keeps the requirement in the
+		// compiled configuration, so `melange test` on a compiled manifest (or on
+		// the .melange.yaml embedded in the APK) still gets them, mirroring how
+		// needs.packages is folded into test.environment.
+		addCapabilities(&cfg.Subpackages[i].Test.Capabilities, tc.Capabilities)
 	}
 
 	ic := &b.Configuration.Environment.Contents
@@ -223,6 +227,10 @@ func (b *Build) Compile(ctx context.Context, opts ...CompileOption) error {
 
 		// Sort and remove duplicates.
 		te.Packages = slices.Compact(slices.Sorted(slices.Values(te.Packages)))
+
+		// As above: scoped to the test's runner, not the build runner, but kept in
+		// the compiled configuration so it survives a compile/test round trip.
+		addCapabilities(&b.Configuration.Test.Capabilities, tc.Capabilities)
 	}
 
 	return nil

pkg/build/compile_test.go

@@ -259,6 +259,87 @@ func TestCompileCapabilities(t *testing.T) {
 		}
 	})
 
+	// The same manifest a user writes, taken through ParseConfiguration rather
+	// than built as a Go literal: inline capabilities have to survive parsing to
+	// reach the runners and to be validated.
+	t.Run("inline capabilities from a parsed manifest", func(t *testing.T) {
+		write := func(t *testing.T, cap string) string {
+			t.Helper()
+			fp := filepath.Join(t.TempDir(), "melange.yaml")
+			if err := os.WriteFile(fp, []byte(`
+package:
+  name: caps
+  version: 0.0.1
+  epoch: 0
+  description: inline capabilities
+
+pipeline:
+  - needs:
+      capabilities:
+        add:
+          - `+cap+`
+    runs: "true"
+
+test:
+  pipeline:
+    - needs:
+        capabilities:
+          add:
+            - `+cap+`
+      runs: "true"
+`), 0o644); err != nil {
+				t.Fatal(err)
+			}
+			return fp
+		}
+
+		ctx := context.Background()
+
+		cfg, err := config.ParseConfiguration(ctx, write(t, "CAP_SYS_ADMIN"))
+		if err != nil {
+			t.Fatalf("failed to parse configuration: %v", err)
+		}
+
+		build := &Build{Configuration: cfg}
+		if err := build.Compile(ctx); err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+		if got, want := build.Configuration.Capabilities.Add, []string{"CAP_SYS_ADMIN"}; !slices.Equal(got, want) {
+			t.Errorf("build capabilities: want %v, got %v", want, got)
+		}
+		// Recorded on the test so a compiled configuration still declares what
+		// `melange test` needs, without widening the build runner.
+		if got, want := build.Configuration.Test.Capabilities.Add, []string{"CAP_SYS_ADMIN"}; !slices.Equal(got, want) {
+			t.Errorf("compiled test capabilities: want %v, got %v", want, got)
+		}
+
+		testCfg, err := config.ParseConfiguration(ctx, write(t, "CAP_SYS_ADMIN"))
+		if err != nil {
+			t.Fatalf("failed to parse configuration: %v", err)
+		}
+
+		test := &Test{Package: "caps", Configuration: *testCfg}
+		if err := test.Compile(ctx); err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+		if got, want := test.Configuration.Test.Capabilities.Add, []string{"CAP_SYS_ADMIN"}; !slices.Equal(got, want) {
+			t.Errorf("test capabilities: want %v, got %v", want, got)
+		}
+
+		// A misspelled name in the inline form fails the build, as documented.
+		badCfg, err := config.ParseConfiguration(ctx, write(t, "CAP_SYS_ADMN"))
+		if err != nil {
+			t.Fatalf("failed to parse configuration: %v", err)
+		}
+		err = (&Build{Configuration: badCfg}).Compile(ctx)
+		if err == nil {
+			t.Fatal("expected an error for an unknown capability, got none")
+		}
+		if !strings.Contains(err.Error(), "CAP_SYS_ADMN") {
+			t.Errorf("error should name the offending capability, got: %v", err)
+		}
+	})
+
 	// A misspelled capability is rejected while compiling, rather than by the
 	// runner once the container is created.
 	t.Run("unknown capability fails compile", func(t *testing.T) {

pkg/config/config.go

@@ -1405,13 +1405,16 @@ func replaceAll(r *strings.Replacer, in []string) []string {
 	return out
 }
 
+// replaceNeeds copies the input and overrides only the fields substitution
+// applies to, so a field added to Needs later is carried through rather than
+// silently dropped.
 func replaceNeeds(r *strings.Replacer, in *Needs) *Needs {
 	if in == nil {
 		return nil
 	}
-	return &Needs{
-		Packages: replaceAll(r, in.Packages),
-	}
+	out := *in
+	out.Packages = replaceAll(r, in.Packages)
+	return &out
 }
 
 func replaceMap(r *strings.Replacer, in map[string]string) map[string]string {
@@ -1463,21 +1466,20 @@ func replaceImageConfig(r *strings.Replacer, in apko_types.ImageConfiguration) a
 	}
 }
 
+// replacePipeline copies the input and overrides only the fields substitution
+// applies to, so a field added to Pipeline later is carried through rather than
+// silently dropped.
 func replacePipeline(r *strings.Replacer, in Pipeline) Pipeline {
-	return Pipeline{
-		Name:        r.Replace(in.Name),
-		Uses:        in.Uses,
-		With:        replaceMap(r, in.With),
-		Runs:        r.Replace(in.Runs),
-		Pipeline:    replacePipelines(r, in.Pipeline),
-		Inputs:      in.Inputs,
-		Needs:       replaceNeeds(r, in.Needs),
-		Label:       in.Label,
-		If:          r.Replace(in.If),
-		Assertions:  in.Assertions,
-		WorkDir:     r.Replace(in.WorkDir),
-		Environment: replaceMap(r, in.Environment),
-	}
+	out := in
+	out.Name = r.Replace(in.Name)
+	out.With = replaceMap(r, in.With)
+	out.Runs = r.Replace(in.Runs)
+	out.Pipeline = replacePipelines(r, in.Pipeline)
+	out.Needs = replaceNeeds(r, in.Needs)
+	out.If = r.Replace(in.If)
+	out.WorkDir = r.Replace(in.WorkDir)
+	out.Environment = replaceMap(r, in.Environment)
+	return out
 }
 
 func replacePipelines(r *strings.Replacer, in []Pipeline) []Pipeline {
@@ -1492,14 +1494,17 @@ func replacePipelines(r *strings.Replacer, in []Pipeline) []Pipeline {
 	return out
 }
 
+// replaceTest copies the input and overrides only the fields substitution
+// applies to, so a field added to Test later is carried through rather than
+// silently dropped.
 func replaceTest(r *strings.Replacer, in *Test) *Test {
 	if in == nil {
 		return nil
 	}
-	return &Test{
-		Environment: replaceImageConfig(r, in.Environment),
-		Pipeline:    replacePipelines(r, in.Pipeline),
-	}
+	out := *in
+	out.Environment = replaceImageConfig(r, in.Environment)
+	out.Pipeline = replacePipelines(r, in.Pipeline)
+	return &out
 }
 
 func replaceUpdate(r *strings.Replacer, in Update) Update {

pkg/config/config_test.go

@@ -185,6 +185,84 @@ test:
 	require.Equal(t, "/usr/local/FOO", cfg.Test.Environment.Environment["LD_LIBRARY_PATH"])
 }
 
+// ParseConfiguration rebuilds pipelines, tests and subpackages field by field,
+// so capabilities written inline in a manifest have to survive that rebuild the
+// same way needs.packages does.
+func Test_capabilitiesSurviveParsing(t *testing.T) {
+	ctx := slogtest.Context(t)
+
+	fp := filepath.Join(t.TempDir(), "melange.yaml")
+	if err := os.WriteFile(fp, []byte(`
+package:
+  name: caps-parsing
+  version: 0.0.1
+  epoch: 0
+  description: capabilities survive parsing
+
+capabilities:
+  add:
+    - CAP_NET_ADMIN
+
+pipeline:
+  - needs:
+      packages:
+        - wget
+      capabilities:
+        add:
+          - CAP_SYS_ADMIN
+    runs: echo hi
+
+test:
+  capabilities:
+    add:
+      - CAP_SYS_PTRACE
+  pipeline:
+    - needs:
+        capabilities:
+          add:
+            - CAP_SYS_CHROOT
+      runs: echo test
+
+subpackages:
+  - name: caps-parsing-sub
+    pipeline:
+      - needs:
+          capabilities:
+            add:
+              - CAP_MKNOD
+        runs: echo sub
+    test:
+      capabilities:
+        add:
+          - CAP_SYS_NICE
+      pipeline:
+        - needs:
+            capabilities:
+              add:
+                - CAP_SYS_TIME
+          runs: echo sub test
+`), 0o644); err != nil {
+		t.Fatal(err)
+	}
+
+	cfg, err := ParseConfiguration(ctx, fp)
+	if err != nil {
+		t.Fatalf("failed to parse configuration: %s", err)
+	}
+
+	require.Equal(t, []string{"CAP_NET_ADMIN"}, cfg.Capabilities.Add)
+	require.Equal(t, []string{"wget"}, cfg.Pipeline[0].Needs.Packages)
+	require.Equal(t, []string{"CAP_SYS_ADMIN"}, cfg.Pipeline[0].Needs.Capabilities.Add)
+
+	require.Equal(t, []string{"CAP_SYS_PTRACE"}, cfg.Test.Capabilities.Add)
+	require.Equal(t, []string{"CAP_SYS_CHROOT"}, cfg.Test.Pipeline[0].Needs.Capabilities.Add)
+
+	sp := cfg.Subpackages[0]
+	require.Equal(t, []string{"CAP_MKNOD"}, sp.Pipeline[0].Needs.Capabilities.Add)
+	require.Equal(t, []string{"CAP_SYS_NICE"}, sp.Test.Capabilities.Add)
+	require.Equal(t, []string{"CAP_SYS_TIME"}, sp.Test.Pipeline[0].Needs.Capabilities.Add)
+}
+
 func Test_updateBlockVarSubstitution(t *testing.T) {
 	ctx := slogtest.Context(t)