@synopackageland/cli 0.7.0 → 0.7.2

package/dist/templates/native-go-vue/frontend/src/delegate/i18n/zh-CN.json

@@ -10,6 +10,7 @@
   "ready": "后台文件访问已就绪。",
   "needs": "需要管理员批准后台文件访问。",
   "blocked": "后台文件访问不可用，请管理员检查 App 设置。",
+  "details": "详情",
   "refresh": "刷新",
   "revoke": "撤销",
   "cancel": "取消任务",

package/dist/templates/native-go-vue/frontend/src/delegate/i18n/zh-TW.json

@@ -10,6 +10,7 @@
   "ready": "背景檔案存取已就緒。",
   "needs": "需要管理員核准背景檔案存取。",
   "blocked": "背景檔案存取無法使用，請管理員檢查 App 設定。",
+  "details": "詳情",
   "refresh": "重新整理",
   "revoke": "撤銷",
   "cancel": "取消工作",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@synopackageland/cli",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "Syno Package Land Developer Kit CLI",
   "type": "module",
   "bin": {
@@ -11,6 +11,7 @@
   },
   "files": [
     "dist",
+    "assets",
     "CHANGELOG.md",
     "templates",
     "schema",

package/schema/synology-app.schema.json

@@ -43,6 +43,28 @@
       "type": "string",
       "minLength": 1
     },
+    "icon": {
+      "type": "string",
+      "minLength": 1,
+      "description": "Package icon inside the project: a square PNG of at least 256x256, or a directory of icon_<size>.png (16, 24, 32, 48, 64, 72, 256; icon_256.png required). Omit to use the SDK default icon."
+    },
+    "i18n": {
+      "type": "object",
+      "description": "Translations; only info is allowed.",
+      "properties": {
+        "info": {
+          "type": "object",
+          "description": "Package Center INFO and DSM main menu and window title per locale (zh-TW, zh-CN, ja, ko, de, fr, es, it); English stays top level.",
+          "additionalProperties": {
+            "type": "object",
+            "properties": {
+              "displayname": { "type": "string", "minLength": 1 },
+              "description": { "type": "string", "minLength": 1 }
+            }
+          }
+        }
+      }
+    },
     "adminprotocol": {
       "type": "string"
     },

package/templates/_daemon/go.mod

@@ -2,4 +2,4 @@ module synopkgland-daemon
 
 go 1.24
 
-toolchain go1.26.8
+toolchain go1.26.9

package/templates/_daemon/main.go

@@ -28,6 +28,9 @@ type deadlines struct {
 	Start  int `json:"start"`
 	Stop   int `json:"stop"`
 	Status int `json:"status"`
+	// Uninstall bounds uninstall_args separately from Stop: a revoke on a
+	// loaded NAS can take longer than stopping the daemon.
+	Uninstall int `json:"uninstall"`
 }
 type config struct {
 	Package       string            `json:"package"`
@@ -88,7 +91,7 @@ func load(dest, data string) (*controller, error) {
 	if cfg.Exec == "" || filepath.IsAbs(cfg.Exec) || filepath.Clean(cfg.Exec) != cfg.Exec || strings.HasPrefix(cfg.Exec, "../") {
 		return nil, errors.New("invalid fixed executable")
 	}
-	if cfg.Timeouts.Start < 2 || cfg.Timeouts.Start > 120 || cfg.Timeouts.Stop < 2 || cfg.Timeouts.Stop > 120 || cfg.Timeouts.Status < 1 || cfg.Timeouts.Status > 10 {
+	if cfg.Timeouts.Start < 2 || cfg.Timeouts.Start > 120 || cfg.Timeouts.Stop < 2 || cfg.Timeouts.Stop > 120 || cfg.Timeouts.Status < 1 || cfg.Timeouts.Status > 10 || cfg.Timeouts.Uninstall < 2 || cfg.Timeouts.Uninstall > 120 {
 		return nil, errors.New("invalid daemon deadlines")
 	}
 	hash := sha256.Sum256(raw)
@@ -162,7 +165,7 @@ func (c *controller) run(action string) (int, error) {
 		budget += c.Timeouts.Start
 	}
 	if action == "uninstall" {
-		budget += c.Timeouts.Stop + 1
+		budget += c.Timeouts.Uninstall + 2
 	}
 	if action != "start" && action != "stop" && action != "status" && action != "restart" && action != "uninstall" {
 		return 1, errors.New("unsupported daemon action")
@@ -414,7 +417,7 @@ func (c *controller) uninstall() error {
 	select {
 	case err := <-done:
 		return err
-	case <-time.After(time.Duration(c.Timeouts.Stop-1) * time.Second):
+	case <-time.After(time.Duration(c.Timeouts.Uninstall) * time.Second):
 		cmd.Process.Signal(syscall.SIGTERM)
 	}
 	select {

package/templates/_daemon/main_test.go

@@ -50,7 +50,7 @@ func fixture(t *testing.T, mode string) (string, string, string) {
 	if raw, err := exec.Command(app, "cleanup").CombinedOutput(); err != nil {
 		t.Fatalf("payload warm-up: %v %s", err, raw)
 	}
-	cfg := config{Package: "DaemonFixture", Exec: "app", Args: []string{"${SYNOPKG_PKGVAR}/a space", "$(touch BAD)'", "${SYNOPKG_PKGDEST}"}, Env: map[string]string{"APP_MODE": mode}, Timeouts: deadlines{Start: 2, Stop: 2, Status: 1}}
+	cfg := config{Package: "DaemonFixture", Exec: "app", Args: []string{"${SYNOPKG_PKGVAR}/a space", "$(touch BAD)'", "${SYNOPKG_PKGDEST}"}, Env: map[string]string{"APP_MODE": mode}, Timeouts: deadlines{Start: 2, Stop: 2, Status: 1, Uninstall: 2}}
 	if os.Geteuid() == 0 {
 		cfg.Package = "nobody"
 	} else {
@@ -250,6 +250,26 @@ func TestUninstallCleanup(t *testing.T) {
 	}
 }
 
+// A revoke on uninstall can outlast the stop deadline on a loaded NAS; it has
+// its own budget instead of Stop-1.
+func TestUninstallCommandHasItsOwnBudget(t *testing.T) {
+	control, dest, data := fixture(t, "normal")
+	path := filepath.Join(dest, "daemon/config.json")
+	raw, _ := os.ReadFile(path)
+	var cfg config
+	json.Unmarshal(raw, &cfg)
+	cfg.UninstallArgs = []string{"cleanup-slow"}
+	cfg.Timeouts.Uninstall = 5
+	raw, _ = json.Marshal(cfg)
+	os.WriteFile(path, raw, 0644)
+	if rc, out := runControl(control, "start", dest, data); rc != 0 {
+		t.Fatalf("start: %d %s", rc, out)
+	}
+	if rc, out := runControl(control, "uninstall", dest, data); rc != 0 {
+		t.Fatalf("slow uninstall within its budget failed: %d %s", rc, out)
+	}
+}
+
 func TestPackageAccountIdentity(t *testing.T) {
 	control, dest, data := fixture(t, "normal")
 	path := filepath.Join(dest, "daemon/config.json")

package/templates/_daemon/testdata/child.go

@@ -14,6 +14,9 @@ func main() {
 		switch os.Args[1] {
 		case "cleanup":
 			os.Exit(0)
+		case "cleanup-slow":
+			time.Sleep(2500 * time.Millisecond)
+			os.Exit(0)
 		case "cleanup-fail":
 			os.Exit(2)
 		case "cleanup-hang":

package/templates/_executor/README.md

@@ -174,7 +174,10 @@ root-owned `/var/packages/<package>/INFO`, the root monitor copies it into
 `runtime/`, verifies the copy and runs root `control start`, which replaces the
 monitor without reapproval. Any other change stays paused for administrator
 approval. Only root's pinned boot/control path or this anchored install can
-replace a monitor or runtime.
+replace a monitor or runtime. To exercise this path on a NAS without a real
+executor change, the repository's `scripts/test/executor-bump.py` makes a
+build+1 SPK whose executor differs by one byte and rewrites the INFO anchor,
+`executor/setup.json` and the window script's embedded pins together.
 
 At start, scheduler readback must exactly match the canonical lifecycle scripts
 regenerated from the package identity and approved policy pin. Package

package/templates/_executor/anchor.go

@@ -84,6 +84,11 @@ func installAnchored(ctx context.Context, source, info string, trusted func(os.F
 	if err != nil {
 		return err
 	}
+	// DSM links the package target to the volume; openRegular refuses links.
+	source, err = filepath.EvalSymlinks(source)
+	if err != nil {
+		return err
+	}
 	src, err := openRegular(filepath.Join(source, "executor"))
 	if err != nil {
 		return err
@@ -129,7 +134,12 @@ func startInstalled(runtime, pkg string) error {
 	return cmd.Process.Release()
 }
 
+// An anchored upgrade is handed to root start, which replaces this monitor:
+// only differing pins are an approval request, and only they say so.
 func approvedPins(state pinState, install, start func() error, log func(string)) bool {
+	if state == pinsDiffer {
+		log("executor paused: package pins require administrator approval")
+	}
 	if state != pinsAnchored {
 		return state == pinsMatch
 	}

package/templates/_executor/anchor_test.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"os"
 	"path/filepath"
+	"reflect"
 	"strings"
 	"testing"
 )
@@ -101,6 +102,8 @@ func TestInstallAnchoredReplacesOnlyTheProtectedExecutorWithVerifiedBytes(t *tes
 	}
 }
 
+// The pause message names administrator approval only when the pins differ:
+// an anchored handover is a finished upgrade, not a request for approval.
 func TestApprovedPinsHandOverAnAnchoredUpgradeToRootStart(t *testing.T) {
 	for _, tc := range []struct {
 		name       string
@@ -109,18 +112,50 @@ func TestApprovedPinsHandOverAnAnchoredUpgradeToRootStart(t *testing.T) {
 		open       bool
 		installs   int
 		starts     int
+		logged     string
 	}{
-		{"match", pinsMatch, nil, true, 0, 0},
-		{"differ", pinsDiffer, nil, false, 0, 0},
-		{"anchored", pinsAnchored, nil, false, 1, 1},
-		{"install failed", pinsAnchored, errors.New("digest"), false, 1, 0},
+		{"match", pinsMatch, nil, true, 0, 0, ""},
+		{"differ", pinsDiffer, nil, false, 0, 0, "executor paused: package pins require administrator approval"},
+		{"anchored", pinsAnchored, nil, false, 1, 1, "executor upgrade: INFO-anchored executor installed under the approved policy"},
+		{"install failed", pinsAnchored, errors.New("digest"), false, 1, 0, "executor upgrade refused: INFO-anchored executor could not be installed"},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			installs, starts := 0, 0
-			open := approvedPins(tc.state, func() error { installs++; return tc.installErr }, func() error { starts++; return nil }, func(string) {})
+			var logged []string
+			open := approvedPins(tc.state, func() error { installs++; return tc.installErr }, func() error { starts++; return nil }, func(s string) { logged = append(logged, s) })
 			if open != tc.open || installs != tc.installs || starts != tc.starts {
 				t.Fatal("handover", open, installs, starts)
 			}
+			if want := []string{tc.logged}; tc.logged == "" {
+				if len(logged) != 0 {
+					t.Fatal("matching pins logged", logged)
+				}
+			} else if !reflect.DeepEqual(logged, want) {
+				t.Fatal("log", logged, want)
+			}
 		})
 	}
 }
+
+// DSM: /var/packages/<pkg>/target links to /volume1/@appstore/<pkg>.
+func TestInstallAnchoredFollowsTheDSMTargetLink(t *testing.T) {
+	ctx := context.Background()
+	anchor := hashBytes([]byte("new executor"))
+	appstore, info := anchoredPackage(t, "new executor", "approved policy", anchor)
+	link := filepath.Join(filepath.Dir(info), "linked-target")
+	if err := os.Symlink(filepath.Dir(appstore), link); err != nil {
+		t.Fatal(err)
+	}
+	runtime := realTestPath(t, t.TempDir())
+	os.WriteFile(filepath.Join(runtime, "executor"), []byte("approved executor"), 0700)
+	target := filepath.Join(link, "executor")
+	if state := packagePins(ctx, target, info, trustAll, hashBytes([]byte("approved executor")), hashBytes([]byte("approved policy"))); state != pinsAnchored {
+		t.Fatal("pin state", state)
+	}
+	if err := installAnchored(ctx, target, info, trustAll, runtime); err != nil {
+		t.Fatal("anchored executor behind the target link refused", err)
+	}
+	if b, _ := os.ReadFile(filepath.Join(runtime, "executor")); string(b) != "new executor" {
+		t.Fatal("installed", string(b))
+	}
+}

package/templates/_executor/digest_review_test.go

@@ -32,7 +32,7 @@ func TestReviewLargePackageHashDoesNotBlockShutdown(t *testing.T) {
 		done <- manageService(ctx, make(chan string), func() (func(), error) { return func() {}, nil }, func(ctx context.Context) bool {
 			close(entered)
 			return samePackagePins(ctx, dir, strings.Repeat("a", 64), strings.Repeat("b", 64))
-		}, func() error { return nil }, func(string) {})
+		}, func() error { return nil })
 	}()
 	<-entered
 	time.Sleep(20 * time.Millisecond)
@@ -93,7 +93,7 @@ func TestLifecycleCancelsPendingPinCheck(t *testing.T) {
 			actions := make(chan string)
 			done := make(chan error, 1)
 			go func() {
-				done <- manageService(ctx, actions, func() (func(), error) { t.Error("opened during canceled check"); return func() {}, nil }, func(ctx context.Context) bool { close(entered); <-ctx.Done(); close(canceled); return false }, func() error { return nil }, func(string) {})
+				done <- manageService(ctx, actions, func() (func(), error) { t.Error("opened during canceled check"); return func() {}, nil }, func(ctx context.Context) bool { close(entered); <-ctx.Done(); close(canceled); return false }, func() error { return nil })
 			}()
 			<-entered
 			if action == "shutdown" {

package/templates/_executor/dsm.go

@@ -78,11 +78,32 @@ type envelope struct {
 	Data    json.RawMessage `json:"data"`
 }
 
+// dsmError keeps the DSM error code of a refused call; the message stays generic.
+type dsmError struct{ Code int }
+
+func (*dsmError) Error() string { return "DSM refused" }
+
 func decodeEnvelope(b []byte) (json.RawMessage, error) {
+	data, err := decodeSuccess(b)
+	if err == nil && (len(data) == 0 || string(data) == "null") {
+		return nil, &dsmError{}
+	}
+	return data, err
+}
+
+// decodeSuccess accepts a success without data: scheduler deletes answer
+// {"success":true}, sometimes with httpd_restart, and that confirms the delete.
+func decodeSuccess(b []byte) (json.RawMessage, error) {
 	var r envelope
 	d := json.NewDecoder(bytes.NewReader(b))
-	if uniqueValue(d, false) != nil || hasDSMError(b) || json.Unmarshal(b, &r) != nil || !r.Success || len(r.Data) == 0 || string(r.Data) == "null" {
-		return nil, errors.New("DSM refused")
+	if uniqueValue(d, false) != nil || hasDSMError(b) || json.Unmarshal(b, &r) != nil || !r.Success {
+		var refused struct {
+			Error struct {
+				Code int `json:"code"`
+			} `json:"error"`
+		}
+		json.Unmarshal(b, &refused)
+		return nil, &dsmError{Code: refused.Error.Code}
 	}
 	return r.Data, nil
 }
@@ -117,6 +138,22 @@ func (d *liveDSM) Verify(ctx context.Context, cookie, token string) (string, err
 	return out.Username, nil
 }
 func (d *liveDSM) call(ctx context.Context, api, method, version, runner string, params map[string]any) (json.RawMessage, error) {
+	b, err := d.exec(ctx, api, method, version, runner, params)
+	if err != nil {
+		return nil, err
+	}
+	return decodeEnvelope(b)
+}
+
+// mutate runs a call whose success carries no data, such as a scheduler delete.
+func (d *liveDSM) mutate(ctx context.Context, api, method, version string, params map[string]any) error {
+	b, err := d.exec(ctx, api, method, version, "", params)
+	if err == nil {
+		_, err = decodeSuccess(b)
+	}
+	return err
+}
+func (d *liveDSM) exec(ctx context.Context, api, method, version, runner string, params map[string]any) ([]byte, error) {
 	args := []string{"--exec", "api=" + api, "method=" + method, "version=" + version}
 	if runner != "" {
 		args = append(args, "runner="+runner)
@@ -140,7 +177,7 @@ func (d *liveDSM) call(ctx context.Context, api, method, version, runner string,
 		}
 		return nil, errors.New("DSM command")
 	}
-	return decodeEnvelope(b)
+	return b, nil
 }
 func (d *liveDSM) Account(ctx context.Context, name string) (Subject, error) {
 	s, err := d.Accounts.Lookup(name)

package/templates/_executor/go.mod

@@ -1,3 +1,5 @@
 module synopkgland/executor
 
 go 1.23
+
+toolchain go1.26.9

package/templates/_executor/main.go

@@ -360,7 +360,7 @@ func serve(e *Executor, uid, gid int, revived bool) error {
 	purge := func() error {
 		return purgeProtected(ctx, d, e.Policy.Package, filepath.Join(stateBase, e.Policy.Package), runtime, sockDir)
 	}
-	return manageService(ctx, actions, open, samePins, purge, func(s string) { log.Print(s) })
+	return manageService(ctx, actions, open, samePins, purge)
 }
 
 func openService(parent context.Context, e *Executor, uid, gid int, sock string) (func(), error) {
@@ -438,11 +438,12 @@ func openService(parent context.Context, e *Executor, uid, gid int, sock string)
 	}, nil
 }
 func purgeProtected(ctx context.Context, d *liveDSM, pkg, state, runtime, socket string) error {
+	logf := purgeLogger()
 	inv, err := readTaskInventory(runtime)
 	if err != nil {
-		log.Print("task cleanup skipped: protected inventory unavailable")
+		logf("task cleanup skipped: protected inventory unavailable: package=" + pkg)
 	} else {
-		return purgeWithInventory(ctx, d, pkg, inv, state, runtime, socket, func(s string) { log.Print(s) })
+		return purgeWithInventory(ctx, d, pkg, inv, state, runtime, socket, logf)
 	}
 	return finishControl(state, runtime, socket, true)
 }
@@ -515,8 +516,13 @@ func verifiedPID(f *os.File, runtime string) (int, error) {
 	if err != nil || pid <= 1 {
 		return 0, errors.New("pid")
 	}
-	actual, err := os.Readlink(fmt.Sprintf("/proc/%d/exe", pid))
-	if err != nil || strings.TrimSuffix(actual, " (deleted)") != filepath.Join(runtime, "executor") {
+	exe := fmt.Sprintf("/proc/%d/exe", pid)
+	link, err := os.Readlink(exe)
+	if err != nil {
+		return 0, errors.New("pid executable mismatch")
+	}
+	running, err := os.Stat(exe)
+	if err != nil || !approvedExecutable(link, running, runtime, rootOwnedReadOnly) {
 		return 0, errors.New("pid executable mismatch")
 	}
 	return pid, nil

package/templates/_executor/managed.go

@@ -22,8 +22,9 @@ func samePackagePins(ctx context.Context, dir, executorDigest, policyDigest stri
 }
 
 // The process and monitor outlive its listener. A package start can only expose
-// the already-approved runtime when the shipped bytes still match both pins.
-func manageService(ctx context.Context, actions <-chan string, open func() (func(), error), samePins func(context.Context) bool, purge func() error, log func(string)) error {
+// the already-approved runtime when the shipped bytes still match both pins;
+// samePins reports why it refused.
+func manageService(ctx context.Context, actions <-chan string, open func() (func(), error), samePins func(context.Context) bool, purge func() error) error {
 	var closeService func()
 	var checking <-chan bool
 	var cancelCheck context.CancelFunc
@@ -62,7 +63,6 @@ func manageService(ctx context.Context, actions <-chan string, open func() (func
 				return nil
 			}
 			if !matches {
-				log("executor paused: package pins require administrator approval")
 				continue
 			}
 			var err error

package/templates/_executor/managed_test.go

@@ -15,7 +15,7 @@ import (
 func TestPauseResumeOnlyApprovedPinsAndPurgeWhilePaused(t *testing.T) {
 	for _, changed := range []bool{false, true} {
 		t.Run(map[bool]string{false: "same pins", true: "different policy"}[changed], func(t *testing.T) {
-			dir := t.TempDir()
+			dir := realTestPath(t, t.TempDir())
 			os.WriteFile(filepath.Join(dir, "executor"), []byte("approved executable"), 0600)
 			os.WriteFile(filepath.Join(dir, "policy.json"), []byte("approved policy"), 0600)
 			ed, _ := digestFile(context.Background(), filepath.Join(dir, "executor"), maxExecutorBytes)
@@ -34,7 +34,7 @@ func TestPauseResumeOnlyApprovedPinsAndPurgeWhilePaused(t *testing.T) {
 					}
 					opened.Add(1)
 					return func() { listener.Close(); closed.Add(1) }, nil
-				}, func(ctx context.Context) bool { return samePackagePins(ctx, dir, ed, pd) }, func() error { purged.Add(1); return nil }, func(string) {})
+				}, func(ctx context.Context) bool { return samePackagePins(ctx, dir, ed, pd) }, func() error { purged.Add(1); return nil })
 			}()
 			await := func(v *atomic.Int32, want int32) {
 				t.Helper()
@@ -105,7 +105,7 @@ func TestRootControlSignalsPauseThenPurgeWithoutMailbox(t *testing.T) {
 	var opened, closed, purged atomic.Int32
 	done := make(chan error, 1)
 	go func() {
-		done <- manageService(ctx, actions, func() (func(), error) { opened.Add(1); return func() { closed.Add(1) }, nil }, func(context.Context) bool { return true }, func() error { purged.Add(1); return nil }, func(string) {})
+		done <- manageService(ctx, actions, func() (func(), error) { opened.Add(1); return func() { closed.Add(1) }, nil }, func(context.Context) bool { return true }, func() error { purged.Add(1); return nil })
 	}()
 	wait := func(value *atomic.Int32) {
 		t.Helper()

package/templates/_executor/path_test.go

@@ -15,3 +15,21 @@ func realTestPath(t *testing.T, p string) string {
 	return p
 }
 func makeTestDir(p string) error { return os.Mkdir(p, 0700) }
+
+// DSM links /var/packages/<pkg>/target to the volume. Every platform must
+// refuse a symlinked ancestor so tests catch callers that skip EvalSymlinks.
+func TestOpenRegularRefusesASymlinkedAncestor(t *testing.T) {
+	dir := realTestPath(t, t.TempDir())
+	os.MkdirAll(filepath.Join(dir, "appstore"), 0755)
+	os.WriteFile(filepath.Join(dir, "appstore", "executor"), []byte("x"), 0755)
+	os.Symlink(filepath.Join(dir, "appstore"), filepath.Join(dir, "target"))
+	if f, err := openRegular(filepath.Join(dir, "target", "executor")); err == nil {
+		f.Close()
+		t.Fatal("symlinked ancestor accepted")
+	}
+	f, err := openRegular(filepath.Join(dir, "appstore", "executor"))
+	if err != nil {
+		t.Fatal(err)
+	}
+	f.Close()
+}

package/templates/_executor/pid.go

@@ -0,0 +1,37 @@
+package main
+
+import (
+	"os"
+	"path/filepath"
+	"strings"
+	"syscall"
+)
+
+// approvedExecutable reports whether a /proc/<pid>/exe link and the inode it
+// runs (stat of that link) belong to an executor root installed in runtime.
+// The inode decides, not the name: kernel 3.10 (DSM 7.1) names a
+// rename-replaced inode after the rename source, so a monitor whose executor
+// was replaced reads as .executor (control.sh) or .executor-* (installAnchored)
+// "(deleted)". Only root writes runtime (root:root 0700), and a replaced inode
+// must be unlinked on the runtime's device.
+func approvedExecutable(link string, running os.FileInfo, runtime string, trusted func(os.FileInfo) bool) bool {
+	name, deleted := strings.CutSuffix(link, " (deleted)")
+	base := filepath.Base(name)
+	if filepath.Dir(name) != runtime || (base != "executor" && !strings.HasPrefix(base, ".executor")) {
+		return false
+	}
+	if !running.Mode().IsRegular() || !trusted(running) {
+		return false
+	}
+	if !deleted {
+		current, err := os.Lstat(filepath.Join(runtime, "executor"))
+		return err == nil && os.SameFile(running, current)
+	}
+	dir, err := os.Stat(runtime)
+	if err != nil {
+		return false
+	}
+	st, ok := running.Sys().(*syscall.Stat_t)
+	dt, dirOK := dir.Sys().(*syscall.Stat_t)
+	return ok && dirOK && st.Nlink == 0 && st.Dev == dt.Dev
+}

package/templates/_executor/pid_test.go

@@ -0,0 +1,113 @@
+package main
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+)
+
+// runningExecutor installs runtime/executor and keeps it open, as a live monitor.
+func runningExecutor(t *testing.T) (string, *os.File) {
+	t.Helper()
+	runtime := t.TempDir()
+	path := filepath.Join(runtime, "executor")
+	if err := os.WriteFile(path, []byte("old"), 0700); err != nil {
+		t.Fatal(err)
+	}
+	f, err := os.Open(path)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Cleanup(func() { f.Close() })
+	return runtime, f
+}
+
+// replaceExecutor renames a new copy over runtime/executor, as control.sh and
+// installAnchored do; the running inode is unlinked.
+func replaceExecutor(t *testing.T, runtime, staged string) {
+	t.Helper()
+	if err := os.WriteFile(filepath.Join(runtime, staged), []byte("new"), 0700); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.Rename(filepath.Join(runtime, staged), filepath.Join(runtime, "executor")); err != nil {
+		t.Fatal(err)
+	}
+}
+
+func stat(t *testing.T, f *os.File) os.FileInfo {
+	t.Helper()
+	info, err := f.Stat()
+	if err != nil {
+		t.Fatal(err)
+	}
+	return info
+}
+
+func TestApprovedExecutableAcceptsTheLiveRuntimeExecutor(t *testing.T) {
+	runtime, f := runningExecutor(t)
+	if !approvedExecutable(filepath.Join(runtime, "executor"), stat(t, f), runtime, trustAll) {
+		t.Fatal("live runtime executor refused")
+	}
+}
+
+// Kernel 3.10 (DSM 7.1 armv7) names a rename-replaced inode after the rename
+// source: control.sh stages .executor, installAnchored stages .executor-*.
+func TestApprovedExecutableAcceptsAReplacedExecutorUnderItsSwappedName(t *testing.T) {
+	for _, staged := range []string{".executor", ".executor-123456"} {
+		runtime, f := runningExecutor(t)
+		replaceExecutor(t, runtime, staged)
+		for _, name := range []string{staged, "executor"} {
+			link := filepath.Join(runtime, name) + " (deleted)"
+			if !approvedExecutable(link, stat(t, f), runtime, trustAll) {
+				t.Fatalf("replaced executor refused: %s", link)
+			}
+		}
+	}
+}
+
+func TestApprovedExecutableRefusesAnotherInode(t *testing.T) {
+	runtime, _ := runningExecutor(t)
+	other := filepath.Join(runtime, ".executor")
+	if err := os.WriteFile(other, []byte("other"), 0700); err != nil {
+		t.Fatal(err)
+	}
+	f, err := os.Open(other)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer f.Close()
+	running := stat(t, f)
+	// Still linked: not the installed executor, whatever the link claims.
+	for _, link := range []string{other, other + " (deleted)", filepath.Join(runtime, "executor"), filepath.Join(runtime, "executor") + " (deleted)"} {
+		if approvedExecutable(link, running, runtime, trustAll) {
+			t.Fatalf("linked non-executor accepted as %s", link)
+		}
+	}
+}
+
+func TestApprovedExecutableRefusesAnUnlinkedInodeOutsideTheRuntime(t *testing.T) {
+	runtime, f := runningExecutor(t)
+	replaceExecutor(t, runtime, ".executor")
+	running := stat(t, f)
+	for _, link := range []string{
+		filepath.Join(t.TempDir(), "executor") + " (deleted)",
+		filepath.Join(runtime, "sh") + " (deleted)",
+		filepath.Join(runtime, ".executor"), // unlinked yet not reported deleted
+	} {
+		if approvedExecutable(link, running, runtime, trustAll) {
+			t.Fatalf("unlinked inode accepted as %s", link)
+		}
+	}
+}
+
+func TestApprovedExecutableRefusesAnUntrustedInode(t *testing.T) {
+	runtime, f := runningExecutor(t)
+	refuse := func(os.FileInfo) bool { return false }
+	if approvedExecutable(filepath.Join(runtime, "executor"), stat(t, f), runtime, refuse) {
+		t.Fatal("untrusted live executor accepted")
+	}
+	replaceExecutor(t, runtime, ".executor")
+	if approvedExecutable(filepath.Join(runtime, ".executor")+" (deleted)", stat(t, f), runtime, refuse) {
+		t.Fatal("untrusted replaced executor accepted")
+	}
+}

package/templates/_executor/platform_other.go

@@ -8,6 +8,7 @@ import (
 	"net"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"strings"
 	"syscall"
 )
@@ -19,7 +20,14 @@ var errLinux = errors.New("executor requires Linux")
 func ownedByRoot(os.FileInfo) bool  { return false }
 func configureProcess(*exec.Cmd)    {}
 func peerUID(net.Conn) (int, error) { return -1, errLinux }
+
+// Like Linux openBeneath, refuse a symlink in any component, not only the last.
 func openRegular(path string) (*os.File, error) {
+	for dir := filepath.Dir(path); dir != filepath.Dir(dir); dir = filepath.Dir(dir) {
+		if info, err := os.Lstat(dir); err != nil || info.Mode()&os.ModeSymlink != 0 {
+			return nil, errors.New("path")
+		}
+	}
 	info, err := os.Lstat(path)
 	if err != nil {
 		return nil, err

package/templates/_executor/purge_log.go

@@ -0,0 +1,18 @@
+package main
+
+import (
+	"log"
+	"log/syslog"
+)
+
+// Purge removes executor.log with the protected state, so its diagnostics
+// also go to the system log, where they survive the uninstall.
+func purgeLogger() func(string) {
+	system, err := syslog.New(syslog.LOG_NOTICE|syslog.LOG_DAEMON, "synopkgland-executor")
+	return func(s string) {
+		log.Print(s)
+		if err == nil {
+			_ = system.Notice(s)
+		}
+	}
+}