Keep places and accesses at the terminal, and refuse a line break in any setting
mesh/merge-gate pass: builds build-agent, mesh-controller, route-proxy → ace, g14, novox, shanks; no bus step; every machine composes with the change as it…
mesh/repo-check pass: its merge-check.sh passed
mesh/delivery delivered

Through the settings verb, or a settings line run by the generic command
verb, any caller of the mesh's console could place a module's directory at
/etc with an owner of its own and have the node-engine, as root, hand it
over at the next push, or mount any of the machine's paths into a container
(hq issue 339). A change to either key is now refused in every process a
verb runs, the generic verb refuses settings writes outright, and neither key
may name the machine's own trees from anywhere, the terminal included. A
line break, carriage return or NUL in any setting, which a file it is
written into reads as a line of the caller's own, is refused where a layer
is kept and where it is composed; PEM blocks alone may hold lines.
This commit is contained in:
jochen
2026-10-08 23:58:08 +02:00
parent d059311c0f
commit f5824b31c6
8 changed files with 452 additions and 4 deletions
@@ -0,0 +1,152 @@
package main
import (
"encoding/json"
"os"
"strings"
"testing"
"github.com/novox/mesh-controller/internal/catalogue"
)
// Where root creates and owns a module's directories, and which of the machine's paths reach its container,
// are said at the controller's terminal alone (novox/hq issue 339): through a verb, a caller who set `places`
// to /etc with an owner of its own would have the next push hand it /etc, and one who set `accesses` to /
// would have the machine's root mounted into a container.
// throughVerb runs a verb's call the way the serving controller does: the command line argvFor composes, in
// a process that carries the verb in its environment (runVerb), through this binary's own dispatch.
func throughVerb(t *testing.T, verb string, args map[string]any) error {
t.Helper()
argv, err := argvFor(verb, args)
if err != nil {
return err
}
t.Setenv(verbVar, verb)
defer os.Unsetenv(verbVar)
return runLine(t, argv)
}
// atTheTerminal runs a command line the way the operator does at the controller's terminal: no verb.
func atTheTerminal(t *testing.T, argv ...string) error {
t.Helper()
t.Setenv(verbVar, "")
os.Unsetenv(verbVar)
return runLine(t, argv)
}
func runLine(t *testing.T, argv []string) error {
t.Helper()
before := os.Args
defer func() { os.Args = before }()
os.Args = append([]string{"mesh-controller"}, argv...)
return run()
}
func TestPlacesAndAccessesAreRefusedThroughEveryVerb(t *testing.T) {
open := aMesh(t)
ctx := t.Context()
register(t, open, catalogue.Manifest{Module: "notes", Version: "1",
Accesses: []catalogue.Access{{ID: "media", Path: "/storage/media", Mode: "read"}},
Resources: []map[string]any{{"id": "data", "type": "directory", "mode": "0755"},
{"id": "rc", "type": "file", "path": "/etc/notes.conf", "mode": "0644", "content": "x = ${setting:x}\n"}}})
if _, err := assign(ctx, open, "laptop", "notes"); err != nil {
t.Fatal(err)
}
layer := func() string {
t.Helper()
values, _, err := open.inventory.Layer(ctx, "laptop", "notes")
if err != nil {
t.Fatal(err)
}
raw, _ := json.Marshal(values)
return string(raw)
}
refused := func(what string, err error) {
t.Helper()
if err == nil || !strings.Contains(err.Error(), "controller's terminal") ||
!strings.Contains(err.Error(), "issue 339") {
t.Fatalf("%s: %v", what, err)
}
}
// The attack the issue reports, through each verb route: nothing is kept.
attacks := []map[string]any{
{"places": map[string]any{"data": map[string]any{"path": "/srv/notes", "owner": "1001:1001"}}, "x": 1},
{"accesses": map[string]any{"media": "/srv/elsewhere"}, "x": 1},
}
for _, values := range attacks {
raw, _ := json.Marshal(values)
refused("settings verb, one machine", throughVerb(t, "settings",
map[string]any{"module": "notes", "node": "laptop", "values": string(raw)}))
refused("settings verb, the whole mesh", throughVerb(t, "settings",
map[string]any{"module": "notes", "values": string(raw)}))
for _, line := range []string{
"settings set notes '" + string(raw) + "' --node laptop",
"settings set --node laptop notes '" + string(raw) + "'",
"settings set notes '" + string(raw) + "'",
} {
if err := throughVerb(t, "command", map[string]any{"command": line}); err == nil {
t.Fatalf("the command verb ran %q", line)
}
}
if got := layer(); got != "null" && got != "{}" {
t.Fatalf("a refused call kept a layer: %s", got)
}
}
// At the terminal the same placement is taken.
if err := atTheTerminal(t, "settings", "set", "notes",
`{"places":{"data":{"path":"/srv/notes","owner":"1001:1001"}},"x":0}`, "--node", "laptop"); err != nil {
t.Fatalf("places at the terminal: %v", err)
}
// A verb may change another key and keep the placement as it is.
if err := throughVerb(t, "settings", map[string]any{"module": "notes", "node": "laptop",
"values": `{"places":{"data":{"path":"/srv/notes","owner":"1001:1001"}},"x":1}`}); err != nil {
t.Fatalf("another key through the verb: %v", err)
}
kept := layer()
// But not move it, drop it, or clear the layer that holds it.
refused("moved through the verb", throughVerb(t, "settings", map[string]any{"module": "notes", "node": "laptop",
"values": `{"places":{"data":{"path":"/srv/other","owner":"1001:1001"}},"x":1}`}))
refused("dropped through the verb", throughVerb(t, "settings", map[string]any{"module": "notes", "node": "laptop",
"values": `{"x":1}`, "replace": "true"}))
refused("cleared through the verb", throughVerb(t, "settings",
map[string]any{"module": "notes", "node": "laptop", "clear": "true"}))
if err := throughVerb(t, "command", map[string]any{"command": "settings clear notes --node laptop"}); err == nil {
t.Fatal("the command verb cleared a layer")
}
if got := layer(); got != kept {
t.Fatalf("a refused call changed the layer: %s, was %s", got, kept)
}
// Reading through a verb still answers.
if err := throughVerb(t, "settings", map[string]any{"module": "notes", "node": "laptop"}); err != nil {
t.Fatalf("reading through the verb: %v", err)
}
// The machine's own trees are refused from anywhere, the terminal too.
for _, path := range []string{"/etc", "/etc/sudoers.d", "/", "/home", "/var/lib", "/var/lib/mesh-host/x", "/srv/../etc"} {
err := atTheTerminal(t, "settings", "set", "notes",
`{"places":{"data":{"path":"`+path+`","owner":"1001:1001"}},"x":1}`, "--node", "laptop")
if err == nil || !strings.Contains(err.Error(), "issue 339") {
t.Fatalf("a place at %s at the terminal: %v", path, err)
}
err = atTheTerminal(t, "settings", "set", "notes",
`{"places":{"data":{"path":"/srv/notes","owner":"1001:1001"}},"accesses":{"media":"`+path+`"},"x":1}`,
"--node", "laptop")
if err == nil || !strings.Contains(err.Error(), "issue 339") {
t.Fatalf("an access at %s at the terminal: %v", path, err)
}
}
// A line break in any setting is refused where it is kept, through a verb or at the terminal.
for _, x := range []string{`"a\nPATH=/tmp"`, `"a\rb"`, `"a\u0000b"`, `["ok","x\ny"]`, `{"k":"x\ny"}`} {
err := throughVerb(t, "settings", map[string]any{"module": "notes", "node": "laptop", "replace": "true",
"values": `{"places":{"data":{"path":"/srv/notes","owner":"1001:1001"}},"x":` + x + `}`})
if err == nil || !strings.Contains(err.Error(), "line break") {
t.Fatalf("a line break in %s: %v", x, err)
}
}
if got := layer(); got != kept {
t.Fatalf("a refused call changed the layer: %s, was %s", got, kept)
}
}