@synopackageland/cli 0.7.0 → 0.7.2

package/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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)
+		}
+	}
+}

package/dist/templates/_executor/tasks.go

@@ -6,10 +6,12 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"os"
 	"path/filepath"
 	"strconv"
 	"synopkgland/executor/internal/taskscript"
+	"time"
 )
 
 type approvedTask struct {
@@ -51,8 +53,7 @@ func taskReference(ctx context.Context, d *liveDSM, task approvedTask, expected
 	boot := task.Kind == "boot"
 	if !boot {
 		api = "SYNO.Core.TaskScheduler"
-		version = "4"
-		b, err := d.call(ctx, api, "list", "3", "", map[string]any{"start": 0, "limit": 500})
+		b, err := listControlTasks(ctx, d)
 		if err != nil {
 			return "", "", nil, err
 		}
@@ -83,7 +84,14 @@ func taskReference(ctx context.Context, d *liveDSM, task approvedTask, expected
 		}
 		ref = map[string]any{"id": id, "real_owner": "root"}
 	}
-	b, err := d.call(ctx, api, "get", version, "", ref)
+	var b json.RawMessage
+	var err error
+	if boot {
+		b, err = d.call(ctx, api, "get", version, "", ref)
+	} else {
+		b, err = onUnsupportedVersion(func() (json.RawMessage, error) { return d.call(ctx, api, "get", "4", "", ref) },
+			func() (json.RawMessage, error) { return d.call(ctx, api, "get", "3", "", ref) })
+	}
 	if err != nil {
 		return "", "", nil, err
 	}
@@ -225,20 +233,24 @@ func purgeTasks(ctx context.Context, d *liveDSM, pkg string, inv taskInventory,
 				expected = canonical.Script
 			}
 		}
+		started := time.Now()
 		api, version, ref, err := taskReference(ctx, d, task, expected)
 		if err != nil {
 			log("task cleanup skipped: " + task.Kind + " definition mismatch or unavailable")
 			continue
 		}
-		if _, err = d.call(ctx, api, "delete", version, "", ref); err != nil {
+		looked := time.Now()
+		if err = d.mutate(ctx, api, "delete", version, ref); err != nil {
 			log("task cleanup unconfirmed: " + task.Kind)
 		}
+		deleted := time.Now()
 		// The scheduler has no conditional delete. Accept the admin edit window,
 		// delete exactly once, and observe the name afterward without another delete.
 		if taskRemains(ctx, d, task) {
 			log("task cleanup: " + task.Kind + " same-named task remains after delete")
 		}
-
+		log(fmt.Sprintf("task cleanup timing: package=%s kind=%s lookup_ms=%d delete_ms=%d verify_ms=%d", pkg, task.Kind,
+			looked.Sub(started).Milliseconds(), deleted.Sub(looked).Milliseconds(), time.Since(deleted).Milliseconds()))
 	}
 }
 
@@ -246,8 +258,12 @@ func purgeWithInventory(ctx context.Context, d *liveDSM, pkg string, inv taskInv
 	if runtime != filepath.Join(state, "runtime") {
 		return errors.New("runtime outside package protected state")
 	}
+	started := time.Now()
 	purgeTasks(ctx, d, pkg, inv, log)
-	return finishControl(state, runtime, socket, true)
+	cleaned := time.Now()
+	err := finishControl(state, runtime, socket, true)
+	log(fmt.Sprintf("purge timing: package=%s tasks_ms=%d files_ms=%d", pkg, cleaned.Sub(started).Milliseconds(), time.Since(cleaned).Milliseconds()))
+	return err
 }
 
 func taskRemains(ctx context.Context, d *liveDSM, task approvedTask) bool {
@@ -261,7 +277,7 @@ func taskRemains(ctx context.Context, d *liveDSM, task approvedTask) bool {
 		}
 		return json.Unmarshal(b, &got) == nil && got.Name == task.Name
 	}
-	b, err := d.call(ctx, "SYNO.Core.TaskScheduler", "list", "3", "", map[string]any{"start": 0, "limit": 500})
+	b, err := listControlTasks(ctx, d)
 	if err != nil {
 		return false
 	}
@@ -280,3 +296,25 @@ func taskRemains(ctx context.Context, d *liveDSM, task approvedTask) bool {
 	}
 	return false
 }
+
+// DSM 7.1 has TaskScheduler list v2 (offset) and get v3 only. A read falls back
+// solely when DSM reports the method version unsupported; any other refusal stands.
+func onUnsupportedVersion(current, legacy func() (json.RawMessage, error)) (json.RawMessage, error) {
+	b, err := current()
+	var refused *dsmError
+	if errors.As(err, &refused) && versionUnsupported(refused.Code) {
+		return legacy()
+	}
+	return b, err
+}
+
+// DSM 7.1.1 returns 104 for a version above maxVersion (get v4) and 103 for a
+// method absent at an existing version (list v3).
+func versionUnsupported(code int) bool { return code == 103 || code == 104 }
+func listControlTasks(ctx context.Context, d *liveDSM) (json.RawMessage, error) {
+	return onUnsupportedVersion(func() (json.RawMessage, error) {
+		return d.call(ctx, "SYNO.Core.TaskScheduler", "list", "3", "", map[string]any{"start": 0, "limit": 500})
+	}, func() (json.RawMessage, error) {
+		return d.call(ctx, "SYNO.Core.TaskScheduler", "list", "2", "", map[string]any{"offset": 0, "limit": 500})
+	})
+}

package/dist/templates/_executor/tasks_dsm71_test.go

@@ -0,0 +1,114 @@
+package main
+
+import (
+	"context"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+)
+
+// dsm71Scheduler answers like DSM 7.1.1-42962 (vt-62): TaskScheduler stops at
+// list v2 (offset/limit) and get v3. t-0234 measured the refusals: a version
+// above maxVersion 3 returns 104; a method absent at an existing version, 103.
+type dsm71Scheduler struct {
+	recordingScheduler
+	refusal string
+}
+
+func (s *dsm71Scheduler) Exec(ctx context.Context, path string, args []string) ([]byte, error) {
+	api, method, version := schedulerCall(args)
+	s.calls = append(s.calls, api+" "+method+" v"+version)
+	if api == "SYNO.Core.TaskScheduler" {
+		if method == "list" && version == "3" && s.refusal != "" {
+			return []byte(`{"success":false,"error":{"code":` + s.refusal + `}}`), nil
+		}
+		supported := map[string]string{"list": "2", "get": "3", "delete": "2", "run": "2"}
+		if supported[method] != version {
+			if version > "3" {
+				return []byte(`{"success":false,"error":{"code":104}}`), nil
+			}
+			return []byte(`{"success":false,"error":{"code":103}}`), nil
+		}
+		if method == "list" && (!contains(args, "offset=0") || !contains(args, "limit=500")) {
+			return []byte(`{"success":false,"error":{"code":101}}`), nil
+		}
+	}
+	return s.schedulerFixture.Exec(ctx, path, args)
+}
+
+func purgeWith(t *testing.T, cmd Command) {
+	t.Helper()
+	inventory := taskInventory{Package: "TestApp", PolicyDigest: strings.Repeat("b", 64), Tasks: []approvedTask{{Kind: "boot", Name: "TestApp executor boot", ScriptDigest: canonicalTaskDigest(t, "boot")}, {Kind: "control", Name: "TestApp executor control", ScriptDigest: canonicalTaskDigest(t, "control")}}}
+	state := filepath.Join(t.TempDir(), "state")
+	socket := filepath.Join(t.TempDir(), "socket")
+	os.MkdirAll(filepath.Join(state, "runtime"), 0700)
+	os.MkdirAll(socket, 0700)
+	if err := purgeWithInventory(context.Background(), &liveDSM{Command: cmd}, "TestApp", inventory, state, filepath.Join(state, "runtime"), socket, func(string) {}); err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestPurgeFindsAndDeletesBothTasksOnDSM71(t *testing.T) {
+	cmd := &dsm71Scheduler{}
+	purgeWith(t, cmd)
+	if strings.Join(cmd.deleted, ",") != "SYNO.Core.EventScheduler,SYNO.Core.TaskScheduler" {
+		t.Fatal("DSM 7.1 tasks left behind", cmd.deleted, cmd.calls)
+	}
+}
+
+func TestSchedulerReadFallsBackOnlyOnUnsupportedVersion(t *testing.T) {
+	for _, code := range []string{"105", "119", "102", "3121"} {
+		t.Run(code, func(t *testing.T) {
+			cmd := &dsm71Scheduler{refusal: code}
+			purgeWith(t, cmd)
+			for _, call := range cmd.calls {
+				if call == "SYNO.Core.TaskScheduler list v2" || call == "SYNO.Core.TaskScheduler get v3" {
+					t.Fatal("fell back after code", code, cmd.calls)
+				}
+			}
+			if contains(cmd.deleted, "SYNO.Core.TaskScheduler") {
+				t.Fatal("deleted without exact readback", cmd.deleted)
+			}
+		})
+	}
+}
+
+func TestModernSchedulerNeverUsesLegacyVersions(t *testing.T) {
+	cmd := &recordingScheduler{}
+	purgeWith(t, cmd)
+	for _, call := range cmd.calls {
+		if call == "SYNO.Core.TaskScheduler list v2" || call == "SYNO.Core.TaskScheduler get v3" {
+			t.Fatal("modern DSM used a legacy version", cmd.calls)
+		}
+	}
+	if len(cmd.deleted) != 2 {
+		t.Fatal(cmd.deleted)
+	}
+}
+
+type recordingScheduler struct {
+	schedulerFixture
+	calls []string
+}
+
+func (s *recordingScheduler) Exec(ctx context.Context, path string, args []string) ([]byte, error) {
+	api, method, version := schedulerCall(args)
+	s.calls = append(s.calls, api+" "+method+" v"+version)
+	return s.schedulerFixture.Exec(ctx, path, args)
+}
+
+func schedulerCall(args []string) (api, method, version string) {
+	for _, a := range args {
+		k, v, _ := strings.Cut(a, "=")
+		switch k {
+		case "api":
+			api = v
+		case "method":
+			method = v
+		case "version":
+			version = v
+		}
+	}
+	return
+}

package/dist/templates/_executor/tasks_test.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"os"
 	"path/filepath"
+	"regexp"
 	"strings"
 	"synopkgland/executor/internal/taskscript"
 	"testing"
@@ -14,7 +15,9 @@ import (
 type schedulerFixture struct {
 	changed, foreignOwner, duplicate bool
 	script                           string
-	deleted                          []string
+	// deleteReply replaces the delete envelope, as DSM sends it.
+	deleteReply string
+	deleted     []string
 }
 
 func (s *schedulerFixture) Exec(_ context.Context, _ string, args []string) ([]byte, error) {
@@ -48,6 +51,9 @@ func (s *schedulerFixture) Exec(_ context.Context, _ string, args []string) ([]b
 		if api == "SYNO.Core.TaskScheduler" && !contains(args, `tasks=[{"id":7,"real_owner":"root"}]`) {
 			return nil, errors.New("wrong delete reference")
 		}
+		if s.deleteReply != "" {
+			return []byte(s.deleteReply), nil
+		}
 		data = map[string]any{}
 	} else if api == "SYNO.Core.EventScheduler" {
 		data = map[string]any{"task_name": "TestApp executor boot", "owner": map[string]string{"0": owner}, "operation": script, "operation_type": "script", "event": "bootup", "enable": true}
@@ -164,3 +170,54 @@ func canonicalTaskDigest(t *testing.T, kind string) string {
 	t.Fatal("task kind")
 	return ""
 }
+
+// t-0229: preuninst took 15-23 s; time each scheduler phase and the file
+// removal separately, naming the package, so a device log shows which waits.
+func TestPurgeLogsPhaseTimingWithPackageName(t *testing.T) {
+	cmd := &schedulerFixture{}
+	inventory := taskInventory{Package: "TestApp", PolicyDigest: strings.Repeat("b", 64), Tasks: []approvedTask{{Kind: "boot", Name: "TestApp executor boot", ScriptDigest: canonicalTaskDigest(t, "boot")}, {Kind: "control", Name: "TestApp executor control", ScriptDigest: canonicalTaskDigest(t, "control")}}}
+	state := filepath.Join(t.TempDir(), "state")
+	socket := filepath.Join(t.TempDir(), "socket")
+	os.MkdirAll(filepath.Join(state, "runtime"), 0700)
+	os.MkdirAll(socket, 0700)
+	logs := []string{}
+	if err := purgeWithInventory(context.Background(), &liveDSM{Command: cmd}, "TestApp", inventory, state, filepath.Join(state, "runtime"), socket, func(s string) { logs = append(logs, s) }); err != nil {
+		t.Fatal(err)
+	}
+	task := regexp.MustCompile(`^task cleanup timing: package=TestApp kind=(boot|control) lookup_ms=\d+ delete_ms=\d+ verify_ms=\d+$`)
+	total := regexp.MustCompile(`^purge timing: package=TestApp tasks_ms=\d+ files_ms=\d+$`)
+	kinds := []string{}
+	for _, line := range logs {
+		if m := task.FindStringSubmatch(line); m != nil {
+			kinds = append(kinds, m[1])
+		}
+	}
+	if strings.Join(kinds, ",") != "boot,control" || len(logs) == 0 || !total.MatchString(logs[len(logs)-1]) {
+		t.Fatal(logs)
+	}
+}
+
+// t-0237: EventScheduler delete v1 and TaskScheduler delete v2 answer a success
+// without data; that is a confirmed delete, while a refusal stays unconfirmed.
+func TestPurgeConfirmsDatalessDeleteSuccess(t *testing.T) {
+	for reply, unconfirmed := range map[string]bool{
+		`{"success":true}`:                        false,
+		`{"httpd_restart":false,"success":true}`:  false,
+		`{"success":false,"error":{"code":4800}}`: true,
+		`{"success":true,"error":{"code":4800}}`:  true,
+	} {
+		cmd := &schedulerFixture{deleteReply: reply}
+		inventory := taskInventory{Package: "TestApp", PolicyDigest: strings.Repeat("b", 64), Tasks: []approvedTask{{Kind: "boot", Name: "TestApp executor boot", ScriptDigest: canonicalTaskDigest(t, "boot")}, {Kind: "control", Name: "TestApp executor control", ScriptDigest: canonicalTaskDigest(t, "control")}}}
+		logs := []string{}
+		purgeTasks(context.Background(), &liveDSM{Command: cmd}, "TestApp", inventory, func(s string) { logs = append(logs, s) })
+		found := 0
+		for _, line := range logs {
+			if strings.HasPrefix(line, "task cleanup unconfirmed: ") {
+				found++
+			}
+		}
+		if (found == 2) != unconfirmed || (found != 0 && found != 2) || len(cmd.deleted) != 2 {
+			t.Fatal(reply, logs)
+		}
+	}
+}

package/dist/templates/_executor/upgrade_watch_test.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"errors"
 	"net"
 	"os"
 	"path/filepath"
@@ -70,13 +71,20 @@ func TestUpgradeGapPreservesRuntimeAndResumesOnlyApprovedPins(t *testing.T) {
 						}
 						opened.Add(1)
 						return func() { listener.Close(); closed.Add(1) }, nil
-					}, func(ctx context.Context) bool { return samePackagePins(ctx, target, ed, pd) }, func() error {
+					}, func(ctx context.Context) bool {
+						// The production decision: only differing pins ask for approval.
+						pins := packagePins(ctx, target, info, func(os.FileInfo) bool { return true }, ed, pd)
+						return approvedPins(pins, func() error { return errors.New("no anchored upgrade here") }, func() error { return nil }, func(message string) {
+							if strings.Contains(message, "administrator approval") {
+								select {
+								case approval <- struct{}{}:
+								default:
+								}
+							}
+						})
+					}, func() error {
 						purged.Add(1)
 						return finishControl(state, filepath.Join(state, "runtime"), sockDir, true)
-					}, func(message string) {
-						if strings.Contains(message, "administrator approval") {
-							approval <- struct{}{}
-						}
 					})
 				}()
 				t.Cleanup(func() {

package/dist/templates/_gateway/go.mod

@@ -1,3 +1,5 @@
 module synopkgland-gateway
 
 go 1.24
+
+toolchain go1.26.9

package/dist/templates/binary/dsm-package.yaml

@@ -5,6 +5,9 @@ version: 0.1.0
 build: 1
 displayname: __DISPLAY_NAME__
 description: A DSM package with a prebuilt binary CGI and DSM window UI.
+# Package Center and DSM window icon: a square PNG of at least 256x256, or a
+# folder of icon_<size>.png. Omit to use the SDK default icon.
+# icon: assets/icon.png
 maintainer: Your Name
 # Optional INFO/website metadata. Omit fields you do not need.
 # metadata: