@synopackageland/cli 0.7.0 → 0.7.2

package/templates/native-go/backend/internal/identity/identity_test.go

@@ -27,6 +27,11 @@ type fixture struct {
 	logout  int
 	calls   []string
 	dir     string
+	// synoToken makes the fake DSM session a SynoToken session: NormalUser.get
+	// then needs the cookie and this X-SYNO-TOKEN header, as DSM web logins do.
+	synoToken string
+	// token is the X-SYNO-TOKEN the browser sends with each App request.
+	token string
 }
 
 func setup(t *testing.T) *fixture {
@@ -40,7 +45,10 @@ func setup(t *testing.T) *fixture {
 		switch name {
 		case "SYNO.Core.NormalUser.get":
 			c, err := r.Cookie("id")
-			if f.valid && err == nil && c.Value == "valid-dsm-cookie" {
+			if r.Form.Has("SynoToken") {
+				t.Error("SynoToken must travel only in the header")
+			}
+			if f.valid && err == nil && c.Value == "valid-dsm-cookie" && (f.synoToken == "" || r.Header.Get("X-SYNO-TOKEN") == f.synoToken) {
 				fmt.Fprint(w, `{"success":true,"data":{"username":"alice"}}`)
 			} else {
 				fmt.Fprint(w, `{"success":false,"error":{"code":119}}`)
@@ -93,6 +101,9 @@ func (f *fixture) call(method, params string, appCookie *http.Cookie, dsmCookie
 	if dsmCookie {
 		req.AddCookie(&http.Cookie{Name: "id", Value: "valid-dsm-cookie"})
 	}
+	if f.token != "" {
+		req.Header.Set("X-SYNO-TOKEN", f.token)
+	}
 	out := httptest.NewRecorder()
 	f.service.Wrap(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		id, err := f.service.Authenticate(r)
@@ -148,6 +159,42 @@ func TestCookieExchangeAndNoInitdataShortcut(t *testing.T) {
 		}
 	}
 }
+func TestSynoTokenSessionBootstrapsAndRevalidates(t *testing.T) {
+	f := setup(t)
+	f.synoToken = "secret-syno-token"
+	if _, out := f.call("identity.session", `{"bootstrap":true}`, nil, true); errorCode(out) != "session_required" {
+		t.Fatalf("cookie alone must not pass a SynoToken session: %v", out)
+	}
+	f.token = "secret-syno-token"
+	rec, out := f.call("identity.session", `{"bootstrap":true}`, nil, true)
+	if errorCode(out) != "" {
+		t.Fatalf("bootstrap with SynoToken: %v", out)
+	}
+	c := sessionCookie(t, rec)
+	if _, out = f.call("greeting.set", `{"text":"x"}`, c, true); errorCode(out) != "" {
+		t.Fatalf("live revalidation with SynoToken: %v", out)
+	}
+	filepath.WalkDir(f.dir, func(path string, d os.DirEntry, err error) error {
+		if err != nil {
+			t.Fatal(err)
+		}
+		if raw, _ := os.ReadFile(path); !d.IsDir() && strings.Contains(string(raw), "secret-syno-token") {
+			t.Fatalf("SynoToken written to %s", path)
+		}
+		return nil
+	})
+	f.token = ""
+	if _, out = f.call("greeting.set", `{"text":"x"}`, c, true); errorCode(out) != "session_required" {
+		t.Fatalf("revalidation without SynoToken: %v", out)
+	}
+}
+func TestTokenlessSessionStillVerifiesWhenBrowserSendsToken(t *testing.T) {
+	f := setup(t)
+	f.token = "unused-token"
+	if _, out := f.call("identity.session", `{"bootstrap":true}`, nil, true); errorCode(out) != "" {
+		t.Fatal(out)
+	}
+}
 func TestLoginOTPLogoutAndNoCredentialsOnDisk(t *testing.T) {
 	f := setup(t)
 	f.otp = true

package/templates/native-go/backend/internal/identity/service.go

@@ -145,7 +145,7 @@ func (s *Service) current(st *state, r *http.Request, revalidate bool) (string,
 		if err != nil || dc.Value == "" {
 			return "", record{}, errRevalidation
 		}
-		live, err := s.verify(r.Context(), dc.Value)
+		live, err := s.verify(r, dc.Value)
 		if err != nil || live != sub {
 			delete(st.Sessions, key)
 			return "", record{}, api.ErrNoSession

package/templates/native-go/dsm-package.yaml

@@ -10,6 +10,9 @@ version: 0.1.0
 build: 1
 displayname: __DISPLAY_NAME__
 description: A native DSM package with a Go backend and a 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:

package/templates/native-go-delegate/frontend/test/delegate.test.ts

@@ -128,3 +128,18 @@ test('startup waiting catalog covers exactly nine distinct language messages',()
  expect(Object.keys(waitingMessages).sort()).toEqual(['en','zh-TW','zh-CN','de','es','fr','it','ja','ko'].sort())
  expect(new Set(Object.values(waitingMessages)).size).toBe(9)
 })
+test('a blocked approval shows the DSM reason, not only the generic unavailable text',async()=>{
+ const setup:ExecutorSetup={control:vi.fn(async()=>({state:'ready'})),status:vi.fn(async()=>({state:'needs-admin-approval'})),authorize:vi.fn(async()=>({state:'blocked',reason:'dsm_104: scheduler readback or operation failed.'}))}
+ const root=mount(ExecutorSettings,{admin:true},setup);await settle();const password=root.querySelector('input[type="password"]') as HTMLInputElement;password.value='once';password.dispatchEvent(new Event('input',{bubbles:true}));await settle();root.querySelector('form')!.dispatchEvent(new Event('submit',{bubbles:true,cancelable:true}));await settle()
+ expect(root.textContent).toContain('Background file access is unavailable.');expect(root.textContent).toContain('Details: dsm_104: scheduler readback or operation failed.')
+})
+test('a task that is only missing shows no extra details',async()=>{
+ const setup:ExecutorSetup={control:vi.fn(async()=>({state:'ready'})),status:vi.fn(async()=>({state:'needs-admin-approval',reason:'Task is missing.'})),authorize:vi.fn(async()=>({state:'ready'}))}
+ const root=mount(ExecutorSettings,{admin:true},setup);await settle();expect(root.textContent).not.toContain('Task is missing.')
+})
+test('settings follow an approval made from the window panel',async()=>{
+ let notify:((r:{state:'ready'})=>void)|undefined
+ const setup={control:vi.fn(async()=>({state:'ready'})),status:vi.fn(async()=>({state:'needs-admin-approval'})),authorize:vi.fn(async()=>({state:'ready'})),subscribe:(listener:any)=>{notify=listener}} as ExecutorSetup
+ const root=mount(ExecutorSettings,{admin:true},setup);await settle();expect(root.textContent).toContain('An administrator must approve')
+ notify!({state:'ready'});await settle();expect(root.textContent).toContain('Background file access is ready.')
+})

package/templates/native-go-root-ops/backend/internal/app/executor.go

@@ -9,6 +9,8 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
+	"strings"
+	"syscall"
 	"time"
 
 	"dsmapp/internal/api"
@@ -51,8 +53,31 @@ func (cfg Config) executorControl(_ context.Context, caller api.Caller, raw json
 	return map[string]bool{"written": true}, nil
 }
 
+// The executor closes its socket while paused: the package is stopped, or an
+// upgrade changed the pins and awaits administrator approval.
 func (cfg Config) executorStatus(ctx context.Context, _ api.Caller, _ json.RawMessage) (any, error) {
-	return cfg.executorRequest(ctx, "status", nil, nil)
+	status, err := cfg.executorRequest(ctx, "status", nil, nil)
+	if errors.Is(err, syscall.ENOENT) || errors.Is(err, syscall.ECONNREFUSED) {
+		next := "Start the package."
+		if cfg.startRequested() {
+			next = "The package is running: an administrator approves background access again in Administrator setup; the executor log names the cause."
+		}
+		return map[string]any{"ready": false, "state": "paused", "reason": "executor_not_listening", "next": next}, nil
+	}
+	return status, err
+}
+
+// Package start and stop write the lifecycle mailbox; its last request tells a
+// stopped package from a running one whose executor stays paused.
+func (cfg Config) startRequested() bool {
+	f, err := os.Open(filepath.Join(cfg.DataDir, "executor", "control"))
+	if err != nil {
+		return false
+	}
+	defer f.Close()
+	b := make([]byte, 16)
+	n, _ := f.Read(b)
+	return strings.TrimSpace(string(b[:n])) == "start"
 }
 
 func (cfg Config) executorRootRun(ctx context.Context, caller api.Caller, req *http.Request, raw json.RawMessage) (any, error) {
@@ -73,8 +98,11 @@ func (cfg Config) executorRootRun(ctx context.Context, caller api.Caller, req *h
 	return cfg.executorRequest(ctx, "root.run", auth, map[string]string{"name": in.Name})
 }
 
+// executorSocketBase is a variable so tests can use a temporary directory.
+var executorSocketBase = "/run/synopkgland"
+
 func (cfg Config) executorRequest(ctx context.Context, op string, auth, params any) (any, error) {
-	conn, err := (&net.Dialer{Timeout: 5 * time.Second}).DialContext(ctx, "unix", "/run/synopkgland/"+cfg.PackageID+"/executor.sock")
+	conn, err := (&net.Dialer{Timeout: 5 * time.Second}).DialContext(ctx, "unix", filepath.Join(executorSocketBase, cfg.PackageID, "executor.sock"))
 	if err != nil {
 		return nil, err
 	}

package/templates/native-go-root-ops/backend/internal/app/executor_test.go

@@ -1,8 +1,10 @@
 package app
 
 import (
+	"net"
 	"os"
 	"path/filepath"
+	"strings"
 	"testing"
 )
 
@@ -51,3 +53,65 @@ func TestExecutorRootRunRequiresCurrentDSMCookie(t *testing.T) {
 		t.Fatal("root.run accepted absent DSM cookie")
 	}
 }
+
+// The executor closes its listener while paused (package stopped, or pins
+// awaiting administrator approval). Status then answers, not "internal".
+func TestExecutorStatusReportsAPausedExecutor(t *testing.T) {
+	cfg := testConfig(t)
+	previous := executorSocketBase
+	// A short base: unix socket paths are limited to about 100 bytes.
+	base, err := os.MkdirTemp("/tmp", "exec")
+	if err != nil {
+		t.Fatal(err)
+	}
+	executorSocketBase = base
+	defer func() { executorSocketBase = previous; os.RemoveAll(base) }()
+	check := func(name string) {
+		t.Helper()
+		code, envelope := call(t, cfg, alice, "executor.status", `{}`)
+		out, _ := envelope["data"].(map[string]any)
+		if code != "" || out["ready"] != false || out["state"] != "paused" || out["reason"] != "executor_not_listening" || out["next"] == "" || out["next"] == nil {
+			t.Fatalf("%s: %s %v", name, code, out)
+		}
+	}
+	check("no socket")
+	if code, _ := call(t, cfg, bob, "executor.status", `{}`); code != "" {
+		t.Fatal("authenticated user cannot read a paused status", code)
+	}
+	dir := filepath.Join(executorSocketBase, cfg.PackageID)
+	os.MkdirAll(dir, 0700)
+	ln, err := net.ListenUnix("unix", &net.UnixAddr{Name: filepath.Join(dir, "executor.sock"), Net: "unix"})
+	if err != nil {
+		t.Fatal(err)
+	}
+	ln.SetUnlinkOnClose(false)
+	ln.Close()
+	check("closed listener")
+}
+
+// next follows the last lifecycle request: a running package needs approval
+// again, not a start.
+func TestExecutorStatusNextFollowsTheLifecycleRequest(t *testing.T) {
+	cfg := testConfig(t)
+	previous := executorSocketBase
+	executorSocketBase = t.TempDir()
+	defer func() { executorSocketBase = previous }()
+	next := func() string {
+		t.Helper()
+		_, envelope := call(t, cfg, alice, "executor.status", `{}`)
+		out, _ := envelope["data"].(map[string]any)
+		s, _ := out["next"].(string)
+		return s
+	}
+	if !strings.HasPrefix(next(), "Start the package.") {
+		t.Fatal("no request:", next())
+	}
+	mailbox := filepath.Join(cfg.DataDir, "executor")
+	os.MkdirAll(mailbox, 0700)
+	for request, start := range map[string]bool{"stop\n": true, "start\n": false, "start": false} {
+		os.WriteFile(filepath.Join(mailbox, "control"), []byte(request), 0600)
+		if got := next(); strings.HasPrefix(got, "Start the package") != start || got == "" {
+			t.Fatalf("%q: %s", request, got)
+		}
+	}
+}

package/templates/native-go-vue/frontend/src/delegate/ExecutorSettings.vue

@@ -47,16 +47,17 @@ async function authorize(){
  catch{if(!disposed)error.value=true}
  finally{if(!disposed)busy.value=false}
 }
-onMounted(()=>void refresh());onBeforeUnmount(()=>{disposed=true;password.value=''})
+onMounted(()=>{setup.subscribe?.(next=>{if(!disposed)status.value=next});void refresh()});onBeforeUnmount(()=>{disposed=true;password.value=''})
 </script>
 <template>
  <SettingsSection v-if="admin" :title="copy.setupTitle" :collapsible="false" :aria-busy="busy">
   <p>{{ copy.setupHelp }}</p>
   <Callout v-if="error" tone="danger" role="alert">{{ copy.setupError }}</Callout>
   <p role="status">{{ status?.state==='ready'?(needsScope?copy.scopeNeeds:copy.ready):status?.state==='needs-admin-approval'?copy.needs:copy.blocked }}</p>
+  <p v-if="status?.reason&&(status.state==='blocked'||status.state==='unsupported')">{{ copy.details }}: {{ status.reason }}</p>
   <p v-if="scope?.selection">{{ copy.protectedScope }}: {{ scope.selection.root }}</p>
   <Callout v-if="scope?.mismatch" tone="warning">{{ copy.scopeMismatch }} {{ copy.preselection }}: {{ scope.preselection }} · {{ copy.protectedScope }}: {{ scope.selection?.root }}</Callout>
-  <Form v-if="status?.state==='needs-admin-approval'||dynamic&&status?.state==='ready'" @submit.prevent="authorize">
+  <Form v-if="status?.state==='needs-admin-approval'||status?.retry||dynamic&&status?.state==='ready'" @submit.prevent="authorize">
    <template v-if="dynamic">
     <p>{{ scope?.selection?copy.scopeChangeHelp:copy.preselectionHelp }}</p>
     <FormItem :label="copy.scopeLabel" label-for="delegate-scope"><Select id="delegate-scope" v-model="chosen" :options="options" :disabled="busy||error" /></FormItem>

package/templates/native-go-vue/frontend/src/delegate/executor-settings.test.ts

@@ -0,0 +1,23 @@
+// @vitest-environment jsdom
+import {expect,test} from 'vitest'
+import {createApp,h,nextTick} from 'vue'
+import {AppRoot} from '@synopackageland/ui'
+import ExecutorSettings from './ExecutorSettings.vue'
+import {ExecutorSetupKey,type CapabilityStatus} from './executor-setup'
+const settle=async()=>{for(let i=0;i<10;i++){await nextTick();await new Promise(r=>setTimeout(r))}}
+// t-0237: a wrong password left only "Check status"; a retryable result keeps the form.
+test('a retryable blocked approval keeps the password form for another try',async()=>{
+ const blocked:CapabilityStatus&{retry:boolean}={state:'blocked',reason:'dsm_3121: DSM rejected the administrator password. Nothing was created.',retry:true}
+ const setup={async status():Promise<CapabilityStatus>{return {state:'needs-admin-approval'}},async authorize(){return blocked},async control(){return blocked}}
+ const root=document.createElement('div');document.body.append(root)
+ const app=createApp({render:()=>h(AppRoot,{},()=>h(ExecutorSettings,{admin:true,locale:'en'}))})
+ app.provide(ExecutorSetupKey,setup)
+ try{
+  app.mount(root);await settle()
+  const input=root.querySelector<HTMLInputElement>('#delegate-password')!
+  input.value='wrong';input.dispatchEvent(new Event('input'));await settle()
+  root.querySelector('form')!.dispatchEvent(new Event('submit'));await settle()
+  expect(root.textContent).toContain('dsm_3121')
+  expect(root.querySelector('#delegate-password')).not.toBeNull()
+ }finally{app.unmount();root.remove()}
+})

package/templates/native-go-vue/frontend/src/delegate/executor-setup.ts

@@ -2,13 +2,17 @@ import {inject,type InjectionKey} from 'vue'
 export type CapabilityState='unsupported'|'needs-admin-approval'|'ready'|'blocked'|'incompatible'
 // requested: a scope change whose root task may still land; it applied once
 // status() reports that scope with a generation above this one.
-export interface CapabilityStatus {state:CapabilityState;reason?:string;requested?:{scope:string;generation:number}}
+// retry: approving again may succeed: nothing of this approval is left behind, or
+// the approved tasks remain and approving again restarts the executor.
+export interface CapabilityStatus {state:CapabilityState;reason?:string;requested?:{scope:string;generation:number};retry?:boolean}
 // p2-setup supplies the implementation through app.provide(ExecutorSetupKey, setup).
 // Passwords belong only to this call and must never be persisted or logged.
 export interface ExecutorSetup {
  status():Promise<CapabilityStatus>
  authorize(password:string,selectedScope?:string):Promise<CapabilityStatus>
  control(action:'start'|'stop'|'purge'):Promise<CapabilityStatus>
+ // Results of calls made elsewhere (the DSM window panel) on the same access.
+ subscribe?(listener:(status:CapabilityStatus)=>void):void
 }
 export const ExecutorSetupKey:InjectionKey<ExecutorSetup>=Symbol('executor-setup')
 export function useExecutorSetup():ExecutorSetup {

package/templates/native-go-vue/frontend/src/delegate/i18n/de.json

@@ -10,6 +10,7 @@
   "ready": "Der Dateizugriff im Hintergrund ist bereit.",
   "needs": "Ein Administrator muss den Dateizugriff im Hintergrund genehmigen.",
   "blocked": "Der Dateizugriff im Hintergrund ist nicht verfügbar. Bitten Sie einen Administrator, die App-Einrichtung zu prüfen.",
+  "details": "Details",
   "refresh": "Aktualisieren",
   "revoke": "Widerrufen",
   "cancel": "Auftrag abbrechen",

package/templates/native-go-vue/frontend/src/delegate/i18n/en.json

@@ -10,6 +10,7 @@
   "ready": "Background file access is ready.",
   "needs": "An administrator must approve background file access.",
   "blocked": "Background file access is unavailable. Ask an administrator to check the app setup.",
+  "details": "Details",
   "refresh": "Refresh",
   "revoke": "Revoke",
   "cancel": "Cancel job",

package/templates/native-go-vue/frontend/src/delegate/i18n/es.json

@@ -10,6 +10,7 @@
   "ready": "El acceso a archivos en segundo plano está listo.",
   "needs": "Un administrador debe aprobar el acceso a archivos en segundo plano.",
   "blocked": "El acceso a archivos en segundo plano no está disponible. Pida a un administrador que revise la configuración de la aplicación.",
+  "details": "Detalles",
   "refresh": "Actualizar",
   "revoke": "Revocar",
   "cancel": "Cancelar tarea",

package/templates/native-go-vue/frontend/src/delegate/i18n/fr.json

@@ -10,6 +10,7 @@
   "ready": "L’accès aux fichiers en arrière-plan est prêt.",
   "needs": "Un administrateur doit approuver l’accès aux fichiers en arrière-plan.",
   "blocked": "L’accès aux fichiers en arrière-plan n’est pas disponible. Demandez à un administrateur de vérifier la configuration de l’application.",
+  "details": "Détails",
   "refresh": "Actualiser",
   "revoke": "Révoquer",
   "cancel": "Annuler la tâche",

package/templates/native-go-vue/frontend/src/delegate/i18n/it.json

@@ -10,6 +10,7 @@
   "ready": "L’accesso ai file in background è pronto.",
   "needs": "Un amministratore deve approvare l’accesso ai file in background.",
   "blocked": "L’accesso ai file in background non è disponibile. Chiedere a un amministratore di controllare la configurazione dell’app.",
+  "details": "Dettagli",
   "refresh": "Aggiorna",
   "revoke": "Revoca",
   "cancel": "Annulla processo",

package/templates/native-go-vue/frontend/src/delegate/i18n/ja.json

@@ -10,6 +10,7 @@
   "ready": "バックグラウンドのファイルアクセスを利用できます。",
   "needs": "バックグラウンドのファイルアクセスには管理者の承認が必要です。",
   "blocked": "バックグラウンドのファイルアクセスを利用できません。アプリの設定を確認するよう管理者に依頼してください。",
+  "details": "詳細",
   "refresh": "最新の情報に更新",
   "revoke": "取り消す",
   "cancel": "ジョブをキャンセル",

package/templates/native-go-vue/frontend/src/delegate/i18n/ko.json

@@ -10,6 +10,7 @@
   "ready": "백그라운드 파일 액세스를 사용할 수 있습니다.",
   "needs": "백그라운드 파일 액세스는 관리자의 승인이 필요합니다.",
   "blocked": "백그라운드 파일 액세스를 사용할 수 없습니다. 관리자에게 앱 설정을 확인하도록 요청하십시오.",
+  "details": "세부 사항",
   "refresh": "새로 고침",
   "revoke": "취소",
   "cancel": "작업 취소",

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

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

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

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