@synopackageland/cli 0.6.0 → 0.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +613 -0
- package/README.md +81 -78
- package/dist/add.js +39 -16
- package/dist/authorization-sdk.d.ts +7 -0
- package/dist/authorization-sdk.js +7 -0
- package/dist/build-spk/delegate-scope.d.ts +6 -0
- package/dist/build-spk/delegate-scope.js +34 -0
- package/dist/build-spk/dsm-arch.d.ts +7 -1
- package/dist/build-spk/dsm-arch.js +24 -28
- package/dist/build-spk/dsm-platforms.json +39 -0
- package/dist/build-spk/dsm-version.d.ts +11 -0
- package/dist/build-spk/dsm-version.js +17 -0
- package/dist/build-spk/gateway.d.ts +1 -1
- package/dist/build-spk/gateway.js +2 -2
- package/dist/build-spk/generator.js +30 -5
- package/dist/build-spk/notices.js +4 -1
- package/dist/build-spk/resource-worker.js +3 -0
- package/dist/build-spk/wizard-messages.d.ts +66 -0
- package/dist/build-spk/wizard-messages.js +75 -9
- package/dist/cli.js +30 -18
- package/dist/contract/schema-validate.js +8 -0
- package/dist/contract/validate.js +30 -0
- package/dist/deploy/deploy.d.ts +1 -1
- package/dist/deploy/deploy.js +8 -0
- package/dist/deploy/plan.js +1 -1
- package/dist/deploy/spk-version.js +1 -1
- package/dist/error-registry.js +46 -13
- package/dist/host/dsm-client.d.ts +8 -4
- package/dist/host/dsm-client.js +10 -4
- package/dist/host/types.d.ts +2 -1
- package/dist/info.js +18 -2
- package/dist/init.d.ts +3 -0
- package/dist/init.js +49 -18
- package/dist/package-metadata.d.ts +21 -0
- package/dist/package-metadata.js +101 -0
- package/dist/portal/alias.d.ts +25 -0
- package/dist/portal/alias.js +48 -0
- package/dist/portal/package.d.ts +33 -0
- package/dist/portal/package.js +116 -0
- package/dist/runtime/delegate-contract.d.ts +79 -0
- package/dist/runtime/delegate-contract.js +27 -0
- package/dist/runtime/executor-build.d.ts +1 -1
- package/dist/runtime/executor-build.js +5 -4
- package/dist/runtime/executor-inspect.d.ts +3 -0
- package/dist/runtime/executor-inspect.js +11 -5
- package/dist/runtime/executor-policy.d.ts +12 -0
- package/dist/runtime/executor-policy.js +43 -3
- package/dist/runtime/executor-scope-task.d.ts +4 -0
- package/dist/runtime/executor-scope-task.js +21 -0
- package/dist/runtime/executor-tasks.d.ts +2 -1
- package/dist/runtime/executor-tasks.js +4 -4
- package/dist/skill.js +1 -0
- package/dist/standalone/api-permissions.d.ts +10 -0
- package/dist/standalone/api-permissions.js +19 -2
- package/dist/standalone/background.d.ts +16 -0
- package/dist/standalone/background.js +69 -2
- package/dist/standalone/binary.d.ts +1 -1
- package/dist/standalone/binary.js +22 -8
- package/dist/standalone/build.d.ts +1 -1
- package/dist/standalone/build.js +38 -8
- package/dist/standalone/daemon.d.ts +1 -1
- package/dist/standalone/daemon.js +2 -1
- package/dist/standalone/dsm-window.d.ts +3 -1
- package/dist/standalone/dsm-window.js +72 -15
- package/dist/standalone/inspect-spk.d.ts +9 -1
- package/dist/standalone/inspect-spk.js +119 -26
- package/dist/standalone/lifecycle.js +86 -8
- package/dist/standalone/manifest.d.ts +13 -0
- package/dist/standalone/manifest.js +57 -8
- package/dist/standalone/native-authorization-window.d.ts +2 -0
- package/dist/standalone/native-authorization-window.js +30 -0
- package/dist/standalone/native-layout.d.ts +82 -0
- package/dist/standalone/native-layout.js +377 -0
- package/dist/standalone/native-root-window.d.ts +26 -0
- package/dist/standalone/native-root-window.js +282 -0
- package/dist/standalone/portal-window.d.ts +21 -0
- package/dist/standalone/portal-window.js +155 -0
- package/dist/standalone/portal.d.ts +4 -0
- package/dist/standalone/portal.js +4 -0
- package/dist/standalone/resource.d.ts +5 -3
- package/dist/standalone/resource.js +6 -3
- package/dist/standalone/root-window.js +62 -15
- package/dist/standalone/spk.d.ts +1 -1
- package/dist/standalone/spk.js +25 -7
- package/dist/templates/_daemon/main_test.go +61 -8
- package/dist/templates/_executor/README.md +127 -16
- package/dist/templates/_executor/anchor.go +146 -0
- package/dist/templates/_executor/anchor_test.go +126 -0
- package/dist/templates/_executor/apppriv_review_test.go +1 -1
- package/dist/templates/_executor/cancel_contract_test.go +236 -0
- package/dist/templates/_executor/copy.go +64 -0
- package/dist/templates/_executor/copy_test.go +88 -0
- package/dist/templates/_executor/dsm.go +23 -10
- package/dist/templates/_executor/dsm_test.go +95 -1
- package/dist/templates/_executor/executor.go +260 -49
- package/dist/templates/_executor/executor_test.go +36 -6
- package/dist/templates/_executor/identity.go +27 -1
- package/dist/templates/_executor/identity_kernel_linux_test.go +60 -0
- package/dist/templates/_executor/identity_linux.go +82 -0
- package/dist/templates/_executor/identity_security_test.go +43 -0
- package/dist/templates/_executor/internal/lifecycle/lifecycle.go +5 -0
- package/dist/templates/_executor/internal/lifecycle/lifecycle_test.go +61 -3
- package/dist/templates/_executor/internal/taskscript/boot.sh +9 -9
- package/dist/templates/_executor/internal/taskscript/cmd/main.go +2 -2
- package/dist/templates/_executor/internal/taskscript/control.sh +15 -10
- package/dist/templates/_executor/internal/taskscript/tasks.go +5 -3
- package/dist/templates/_executor/lifecycle_test.go +11 -0
- package/dist/templates/_executor/link_linux.go +28 -0
- package/dist/templates/_executor/long_running_test.go +530 -0
- package/dist/templates/_executor/main.go +72 -20
- package/dist/templates/_executor/move_linux.go +490 -0
- package/dist/templates/_executor/move_linux_test.go +460 -0
- package/dist/templates/_executor/move_validation.go +46 -0
- package/dist/templates/_executor/move_validation_test.go +187 -0
- package/dist/templates/_executor/operations.go +926 -0
- package/dist/templates/_executor/platform_linux.go +24 -173
- package/dist/templates/_executor/platform_linux_test.go +9 -65
- package/dist/templates/_executor/platform_other.go +30 -4
- package/dist/templates/_executor/process.go +3 -0
- package/dist/templates/_executor/records.go +242 -0
- package/dist/templates/_executor/scope_cancel_contract_test.go +91 -0
- package/dist/templates/_executor/scope_client.go +37 -0
- package/dist/templates/_executor/scope_contract.go +12 -0
- package/dist/templates/_executor/selected_scope.go +146 -0
- package/dist/templates/_executor/selected_scope_test.go +186 -0
- package/dist/templates/_executor/status_disabled_test.go +33 -0
- package/dist/templates/_executor/store.go +4 -3
- package/dist/templates/_executor/supervise.go +109 -0
- package/dist/templates/_executor/supervise_test.go +130 -0
- package/dist/templates/_executor/task_race_review_test.go +1 -1
- package/dist/templates/_executor/tasks.go +7 -8
- package/dist/templates/_executor/tasks_review_test.go +1 -1
- package/dist/templates/_executor/tasks_test.go +4 -4
- package/dist/templates/_executor/watch.go +8 -0
- package/dist/templates/_executor/watch_test.go +23 -2
- package/dist/templates/_executor/write_review_linux_test.go +4 -12
- package/dist/templates/_shared/AGENTS.md +129 -0
- package/dist/templates/binary/dsm-package.yaml +24 -0
- package/dist/templates/binary/i18n/messages/de.json +4 -0
- package/dist/templates/binary/i18n/messages/en.json +4 -0
- package/dist/templates/binary/i18n/messages/es.json +4 -0
- package/dist/templates/binary/i18n/messages/fr.json +4 -0
- package/dist/templates/binary/i18n/messages/it.json +4 -0
- package/dist/templates/binary/i18n/messages/ja.json +4 -0
- package/dist/templates/binary/i18n/messages/ko.json +4 -0
- package/dist/templates/binary/i18n/messages/zh-CN.json +4 -0
- package/dist/templates/binary/i18n/messages/zh-TW.json +4 -0
- package/dist/templates/binary/ui/app.js +19 -4
- package/dist/templates/native-authorization/AuthorizationGate.vue +91 -0
- package/dist/templates/native-authorization/i18n/de.json +37 -0
- package/dist/templates/native-authorization/i18n/en.json +37 -0
- package/dist/templates/native-authorization/i18n/es.json +37 -0
- package/dist/templates/native-authorization/i18n/fr.json +37 -0
- package/dist/templates/native-authorization/i18n/index.ts +15 -0
- package/dist/templates/native-authorization/i18n/it.json +37 -0
- package/dist/templates/native-authorization/i18n/ja.json +37 -0
- package/dist/templates/native-authorization/i18n/ko.json +37 -0
- package/dist/templates/native-authorization/i18n/zh-CN.json +37 -0
- package/dist/templates/native-authorization/i18n/zh-TW.json +37 -0
- package/dist/templates/native-go/README.md +43 -10
- package/dist/templates/native-go/backend/cmd/app/main.go +27 -7
- package/dist/templates/native-go/backend/internal/api/entry_test.go +47 -0
- package/dist/templates/native-go/backend/internal/api/permissions_test.go +3 -3
- package/dist/templates/native-go/backend/internal/api/registry.go +11 -0
- package/dist/templates/native-go/backend/internal/api/sdk-permissions.json +14 -1
- package/dist/templates/native-go/backend/internal/api/server.go +18 -5
- package/dist/templates/native-go/backend/internal/app/delegate_config.go +57 -0
- package/dist/templates/native-go/backend/internal/app/delegate_config_test.go +28 -0
- package/dist/templates/native-go/backend/internal/app/portal.go +30 -0
- package/dist/templates/native-go/backend/internal/app/portal_test.go +55 -0
- package/dist/templates/native-go/backend/internal/app/routes.go +8 -2
- package/dist/templates/native-go/backend/internal/background/runner.go +1 -1
- package/dist/templates/native-go/backend/internal/background/store.go +16 -14
- package/dist/templates/native-go/backend/internal/dsm/admin.go +8 -2
- package/dist/templates/native-go/backend/internal/dsm/admin_linux.go +43 -13
- package/dist/templates/native-go/backend/internal/dsm/admin_linux_test.go +56 -0
- package/dist/templates/native-go/backend/internal/dsm/admin_other.go +4 -1
- package/dist/templates/native-go/backend/internal/dsm/apppriv.go +30 -0
- package/dist/templates/native-go/backend/internal/dsm/bridge_file.go +75 -0
- package/dist/templates/native-go/backend/internal/dsm/bridge_file_test.go +57 -0
- package/dist/templates/native-go/backend/internal/dsm/entry.go +177 -0
- package/dist/templates/native-go/backend/internal/dsm/entry_test.go +315 -0
- package/dist/templates/native-go/backend/internal/dsm/native/admin-armv7.elf +0 -0
- package/dist/templates/native-go/backend/internal/dsm/native/apppriv-aarch64.elf +0 -0
- package/dist/templates/native-go/backend/internal/dsm/native/apppriv-armv7.elf +0 -0
- package/dist/templates/native-go/backend/internal/dsm/native/apppriv-x86_64.elf +0 -0
- package/dist/templates/native-go/backend/internal/dsm/native/apppriv_check.c +33 -0
- package/dist/templates/native-go/backend/internal/dsm/native/build.sh +13 -4
- package/dist/templates/native-go/backend/internal/dsm/native/provenance.json +9 -3
- package/dist/templates/native-go/backend/internal/filestation/check_permission.go +71 -0
- package/dist/templates/native-go/backend/internal/filestation/check_permission_test.go +77 -0
- package/dist/templates/native-go/backend/internal/filestation/sdk_policy_test.go +39 -0
- package/dist/templates/native-go/backend/internal/filestation/service.go +1 -1
- package/dist/templates/native-go/backend/internal/portal/portal.go +138 -0
- package/dist/templates/native-go/backend/internal/portal/portal_test.go +89 -0
- package/dist/templates/native-go/dsm-package.yaml +20 -1
- package/dist/templates/native-go/i18n/glossary.json +2 -1
- package/dist/templates/native-go/i18n/messages/de.json +1 -0
- package/dist/templates/native-go/i18n/messages/en.json +1 -0
- package/dist/templates/native-go/i18n/messages/es.json +1 -0
- package/dist/templates/native-go/i18n/messages/fr.json +1 -0
- package/dist/templates/native-go/i18n/messages/it.json +1 -0
- package/dist/templates/native-go/i18n/messages/ja.json +1 -0
- package/dist/templates/native-go/i18n/messages/ko.json +1 -0
- package/dist/templates/native-go/i18n/messages/zh-CN.json +1 -0
- package/dist/templates/native-go/i18n/messages/zh-TW.json +1 -0
- package/dist/templates/native-go/ui/app.css +10 -0
- package/dist/templates/native-go/ui/app.js +11 -1
- package/dist/templates/native-go-delegate/DELEGATE.md +126 -5
- package/dist/templates/native-go-delegate/backend/cmd/background-worker/main.go +7 -0
- package/dist/templates/native-go-delegate/backend/internal/app/delegate.go +11 -1
- package/dist/templates/native-go-delegate/backend/internal/app/delegate_routes_test.go +14 -0
- package/dist/templates/native-go-delegate/backend/internal/background/delegated_moves.go +270 -0
- package/dist/templates/native-go-delegate/backend/internal/delegate/admission_recovery_test.go +410 -0
- package/dist/templates/native-go-delegate/backend/internal/delegate/cancel_contract_test.go +95 -0
- package/dist/templates/native-go-delegate/backend/internal/delegate/client.go +8 -0
- package/dist/templates/native-go-delegate/backend/internal/delegate/destination.go +110 -0
- package/dist/templates/native-go-delegate/backend/internal/delegate/destination_state.go +117 -0
- package/dist/templates/native-go-delegate/backend/internal/delegate/destination_state_test.go +60 -0
- package/dist/templates/native-go-delegate/backend/internal/delegate/destination_test.go +116 -0
- package/dist/templates/native-go-delegate/backend/internal/delegate/example.go +81 -0
- package/dist/templates/native-go-delegate/backend/internal/delegate/example_test.go +91 -0
- package/dist/templates/native-go-delegate/backend/internal/delegate/executor_contract_test.go +511 -0
- package/dist/templates/native-go-delegate/backend/internal/delegate/files.go +1 -1
- package/dist/templates/native-go-delegate/backend/internal/delegate/long_running_routes.go +92 -0
- package/dist/templates/native-go-delegate/backend/internal/delegate/long_running_routes_test.go +99 -0
- package/dist/templates/native-go-delegate/backend/internal/delegate/move.go +348 -0
- package/dist/templates/native-go-delegate/backend/internal/delegate/move_test.go +351 -0
- package/dist/templates/native-go-delegate/backend/internal/delegate/operations_list.go +65 -0
- package/dist/templates/native-go-delegate/backend/internal/delegate/operations_list_test.go +114 -0
- package/dist/templates/native-go-delegate/backend/internal/delegate/retry_test.go +1 -1
- package/dist/templates/native-go-delegate/backend/internal/delegate/service.go +58 -17
- package/dist/templates/native-go-delegate/backend/internal/delegate/staging.go +121 -0
- package/dist/templates/native-go-delegate/backend/internal/delegate/status_disabled_test.go +51 -0
- package/dist/templates/native-go-delegate/backend/internal/delegate/testdata/executor_contract.txt +112 -0
- package/dist/templates/native-go-delegate/backend/internal/delegate/transient_contract_test.go +137 -0
- package/dist/templates/native-go-delegate/backend/internal/filestation/files.go +1 -31
- package/dist/templates/native-go-delegate/frontend/src/CapabilityPanels.vue +30 -3
- package/dist/templates/native-go-delegate/frontend/src/delegate/BackgroundSavePanel.vue +113 -0
- package/dist/templates/native-go-delegate/frontend/src/delegate/copy.ts +5 -6
- package/dist/templates/native-go-delegate/frontend/test/background-save.test.ts +121 -0
- package/dist/templates/native-go-delegate/frontend/test/scope-settings.test.ts +49 -0
- package/dist/templates/native-go-delegate/test.sh +1 -0
- package/dist/templates/native-go-jobs/frontend/src/background/i18n/de.json +2 -2
- package/dist/templates/native-go-jobs/frontend/src/background/i18n/en.json +2 -2
- package/dist/templates/native-go-jobs/frontend/src/background/i18n/es.json +12 -12
- package/dist/templates/native-go-jobs/frontend/src/background/i18n/fr.json +4 -4
- package/dist/templates/native-go-jobs/frontend/src/background/i18n/it.json +17 -17
- package/dist/templates/native-go-jobs/frontend/src/background/i18n/ja.json +7 -7
- package/dist/templates/native-go-jobs/frontend/src/background/i18n/ko.json +15 -15
- package/dist/templates/native-go-jobs/frontend/src/background/i18n/zh-CN.json +3 -3
- package/dist/templates/native-go-jobs/frontend/src/background/i18n/zh-TW.json +2 -2
- package/dist/templates/native-go-jobs/frontend/test/background.test.ts +25 -28
- package/dist/templates/native-go-vue/README.md +4 -0
- package/dist/templates/native-go-vue/frontend/package-lock.json +4 -4
- package/dist/templates/native-go-vue/frontend/package.json +1 -1
- package/dist/templates/native-go-vue/frontend/src/App.vue +18 -13
- package/dist/templates/native-go-vue/frontend/src/context.ts +31 -0
- package/dist/templates/native-go-vue/frontend/src/delegate/ExecutorSettings.vue +52 -8
- package/dist/templates/native-go-vue/frontend/src/delegate/catalogs.ts +11 -0
- package/dist/templates/native-go-vue/frontend/src/delegate/copy.test.ts +12 -0
- package/dist/templates/native-go-vue/frontend/src/delegate/copy.ts +4 -4
- package/dist/templates/native-go-vue/frontend/src/delegate/executor-setup.ts +4 -2
- package/dist/templates/native-go-vue/frontend/src/delegate/facade.test.ts +100 -0
- package/dist/templates/native-go-vue/frontend/src/delegate/facade.ts +85 -0
- package/dist/templates/native-go-vue/frontend/src/delegate/i18n/de.json +46 -0
- package/dist/templates/native-go-vue/frontend/src/delegate/i18n/en.json +12 -2
- package/dist/templates/native-go-vue/frontend/src/delegate/i18n/es.json +46 -0
- package/dist/templates/native-go-vue/frontend/src/delegate/i18n/fr.json +46 -0
- package/dist/templates/native-go-vue/frontend/src/delegate/i18n/it.json +46 -0
- package/dist/templates/native-go-vue/frontend/src/delegate/i18n/ja.json +46 -0
- package/dist/templates/native-go-vue/frontend/src/delegate/i18n/ko.json +46 -0
- package/dist/templates/native-go-vue/frontend/src/delegate/i18n/save/de.json +42 -0
- package/dist/templates/native-go-vue/frontend/src/delegate/i18n/save/en.json +42 -0
- package/dist/templates/native-go-vue/frontend/src/delegate/i18n/save/es.json +42 -0
- package/dist/templates/native-go-vue/frontend/src/delegate/i18n/save/fr.json +42 -0
- package/dist/templates/native-go-vue/frontend/src/delegate/i18n/save/it.json +42 -0
- package/dist/templates/native-go-vue/frontend/src/delegate/i18n/save/ja.json +42 -0
- package/dist/templates/native-go-vue/frontend/src/delegate/i18n/save/ko.json +42 -0
- package/dist/templates/native-go-vue/frontend/src/delegate/i18n/save/zh-CN.json +42 -0
- package/dist/templates/native-go-vue/frontend/src/delegate/i18n/save/zh-TW.json +42 -0
- package/dist/templates/native-go-vue/frontend/src/delegate/i18n/zh-CN.json +46 -0
- package/dist/templates/native-go-vue/frontend/src/delegate/i18n/zh-TW.json +15 -5
- package/dist/templates/native-go-vue/frontend/src/delegate/long-running.ts +57 -0
- package/dist/templates/native-go-vue/frontend/src/delegate/save-copy.test.ts +12 -0
- package/dist/templates/native-go-vue/frontend/src/delegate/save-copy.ts +24 -0
- package/dist/templates/native-go-vue/frontend/src/delegate/scoped-picker.test.ts +12 -0
- package/dist/templates/native-go-vue/frontend/src/delegate/scoped-picker.ts +21 -0
- package/dist/templates/native-go-vue/frontend/src/files/files.test.ts +7 -0
- package/dist/templates/native-go-vue/frontend/src/i18n/de.json +20 -0
- package/dist/templates/native-go-vue/frontend/src/i18n/en.json +20 -0
- package/dist/templates/native-go-vue/frontend/src/i18n/es.json +20 -0
- package/dist/templates/native-go-vue/frontend/src/i18n/fr.json +20 -0
- package/dist/templates/native-go-vue/frontend/src/i18n/it.json +20 -0
- package/dist/templates/native-go-vue/frontend/src/i18n/ja.json +20 -0
- package/dist/templates/native-go-vue/frontend/src/i18n/ko.json +20 -0
- package/dist/templates/native-go-vue/frontend/src/i18n/zh-CN.json +20 -0
- package/dist/templates/native-go-vue/frontend/src/i18n/zh-TW.json +20 -0
- package/dist/templates/native-go-vue/frontend/src/i18n.ts +13 -0
- package/dist/templates/native-go-vue/frontend/src/identity/LoginPage.vue +16 -14
- package/dist/templates/native-go-vue/frontend/src/identity/i18n/de.json +27 -0
- package/dist/templates/native-go-vue/frontend/src/identity/i18n/en.json +27 -0
- package/dist/templates/native-go-vue/frontend/src/identity/i18n/es.json +27 -0
- package/dist/templates/native-go-vue/frontend/src/identity/i18n/fr.json +27 -0
- package/dist/templates/native-go-vue/frontend/src/identity/i18n/it.json +27 -0
- package/dist/templates/native-go-vue/frontend/src/identity/i18n/ja.json +27 -0
- package/dist/templates/native-go-vue/frontend/src/identity/i18n/ko.json +27 -0
- package/dist/templates/native-go-vue/frontend/src/identity/i18n/zh-CN.json +27 -0
- package/dist/templates/native-go-vue/frontend/src/identity/i18n/zh-TW.json +27 -0
- package/dist/templates/native-go-vue/frontend/src/identity/i18n.ts +14 -0
- package/dist/templates/native-go-vue/frontend/src/identity/session.test.ts +4 -0
- package/dist/templates/native-go-vue/frontend/src/identity/session.ts +9 -8
- package/dist/templates/native-go-vue/frontend/src/nas/NasPicker.vue +31 -12
- package/dist/templates/native-go-vue/frontend/src/nas/destination.test.ts +48 -0
- package/dist/templates/native-go-vue/frontend/src/nas/i18n/files/de.json +1 -1
- package/dist/templates/native-go-vue/frontend/src/nas/i18n/files/en.json +1 -1
- package/dist/templates/native-go-vue/frontend/src/nas/i18n/files/es.json +10 -10
- package/dist/templates/native-go-vue/frontend/src/nas/i18n/files/fr.json +1 -1
- package/dist/templates/native-go-vue/frontend/src/nas/i18n/files/it.json +12 -12
- package/dist/templates/native-go-vue/frontend/src/nas/i18n/files/ja.json +15 -15
- package/dist/templates/native-go-vue/frontend/src/nas/i18n/files/ko.json +12 -12
- package/dist/templates/native-go-vue/frontend/src/nas/i18n/files/zh-CN.json +1 -1
- package/dist/templates/native-go-vue/frontend/src/nas/i18n/files/zh-TW.json +1 -1
- package/dist/templates/native-go-vue/frontend/src/portal/PortalSettings.vue +39 -0
- package/dist/templates/native-go-vue/frontend/src/shell/i18n/fr.json +1 -1
- package/dist/templates/native-go-vue/frontend/src/shell/i18n/ja.json +1 -1
- package/dist/templates/native-go-vue/frontend/test/apps.test.ts +14 -0
- package/dist/templates/native-go-vue/frontend/test/portal-settings.test.ts +71 -0
- package/dist/templates/native-go-vue/frontend/test/shell-i18n.test.ts +50 -0
- package/dist/validate.js +2 -1
- package/package.json +12 -2
- package/schema/package-metadata.schema.json +101 -0
- package/schema/synology-app.schema.json +112 -0
- package/skills/SKILL.md +109 -3
- package/skills/reference/create.md +101 -2
- package/skills/reference/deploy.md +2 -2
- package/skills/reference/files.md +113 -2
- package/skills/reference/identity.md +70 -1
- package/skills/reference/portal.md +17 -0
- package/skills/reference/ui-vue.md +12 -0
- package/templates/_daemon/main_test.go +61 -8
- package/templates/_executor/README.md +127 -16
- package/templates/_executor/anchor.go +146 -0
- package/templates/_executor/anchor_test.go +126 -0
- package/templates/_executor/apppriv_review_test.go +1 -1
- package/templates/_executor/cancel_contract_test.go +236 -0
- package/templates/_executor/copy.go +64 -0
- package/templates/_executor/copy_test.go +88 -0
- package/templates/_executor/dsm.go +23 -10
- package/templates/_executor/dsm_test.go +95 -1
- package/templates/_executor/executor.go +260 -49
- package/templates/_executor/executor_test.go +36 -6
- package/templates/_executor/identity.go +27 -1
- package/templates/_executor/identity_kernel_linux_test.go +60 -0
- package/templates/_executor/identity_linux.go +82 -0
- package/templates/_executor/identity_security_test.go +43 -0
- package/templates/_executor/internal/lifecycle/lifecycle.go +5 -0
- package/templates/_executor/internal/lifecycle/lifecycle_test.go +61 -3
- package/templates/_executor/internal/taskscript/boot.sh +9 -9
- package/templates/_executor/internal/taskscript/cmd/main.go +2 -2
- package/templates/_executor/internal/taskscript/control.sh +15 -10
- package/templates/_executor/internal/taskscript/tasks.go +5 -3
- package/templates/_executor/lifecycle_test.go +11 -0
- package/templates/_executor/link_linux.go +28 -0
- package/templates/_executor/long_running_test.go +530 -0
- package/templates/_executor/main.go +72 -20
- package/templates/_executor/move_linux.go +490 -0
- package/templates/_executor/move_linux_test.go +460 -0
- package/templates/_executor/move_validation.go +46 -0
- package/templates/_executor/move_validation_test.go +187 -0
- package/templates/_executor/operations.go +926 -0
- package/templates/_executor/platform_linux.go +24 -173
- package/templates/_executor/platform_linux_test.go +9 -65
- package/templates/_executor/platform_other.go +30 -4
- package/templates/_executor/process.go +3 -0
- package/templates/_executor/records.go +242 -0
- package/templates/_executor/scope_cancel_contract_test.go +91 -0
- package/templates/_executor/scope_client.go +37 -0
- package/templates/_executor/scope_contract.go +12 -0
- package/templates/_executor/selected_scope.go +146 -0
- package/templates/_executor/selected_scope_test.go +186 -0
- package/templates/_executor/status_disabled_test.go +33 -0
- package/templates/_executor/store.go +4 -3
- package/templates/_executor/supervise.go +109 -0
- package/templates/_executor/supervise_test.go +130 -0
- package/templates/_executor/task_race_review_test.go +1 -1
- package/templates/_executor/tasks.go +7 -8
- package/templates/_executor/tasks_review_test.go +1 -1
- package/templates/_executor/tasks_test.go +4 -4
- package/templates/_executor/watch.go +8 -0
- package/templates/_executor/watch_test.go +23 -2
- package/templates/_executor/write_review_linux_test.go +4 -12
- package/templates/_shared/AGENTS.md +129 -0
- package/templates/binary/dsm-package.yaml +24 -0
- package/templates/binary/i18n/messages/de.json +4 -0
- package/templates/binary/i18n/messages/en.json +4 -0
- package/templates/binary/i18n/messages/es.json +4 -0
- package/templates/binary/i18n/messages/fr.json +4 -0
- package/templates/binary/i18n/messages/it.json +4 -0
- package/templates/binary/i18n/messages/ja.json +4 -0
- package/templates/binary/i18n/messages/ko.json +4 -0
- package/templates/binary/i18n/messages/zh-CN.json +4 -0
- package/templates/binary/i18n/messages/zh-TW.json +4 -0
- package/templates/binary/ui/app.js +19 -4
- package/templates/native-authorization/AuthorizationGate.vue +91 -0
- package/templates/native-authorization/i18n/de.json +37 -0
- package/templates/native-authorization/i18n/en.json +37 -0
- package/templates/native-authorization/i18n/es.json +37 -0
- package/templates/native-authorization/i18n/fr.json +37 -0
- package/templates/native-authorization/i18n/index.ts +15 -0
- package/templates/native-authorization/i18n/it.json +37 -0
- package/templates/native-authorization/i18n/ja.json +37 -0
- package/templates/native-authorization/i18n/ko.json +37 -0
- package/templates/native-authorization/i18n/zh-CN.json +37 -0
- package/templates/native-authorization/i18n/zh-TW.json +37 -0
- package/templates/native-go/README.md +43 -10
- package/templates/native-go/backend/cmd/app/main.go +27 -7
- package/templates/native-go/backend/internal/api/entry_test.go +47 -0
- package/templates/native-go/backend/internal/api/permissions_test.go +3 -3
- package/templates/native-go/backend/internal/api/registry.go +11 -0
- package/templates/native-go/backend/internal/api/sdk-permissions.json +14 -1
- package/templates/native-go/backend/internal/api/server.go +18 -5
- package/templates/native-go/backend/internal/app/delegate_config.go +57 -0
- package/templates/native-go/backend/internal/app/delegate_config_test.go +28 -0
- package/templates/native-go/backend/internal/app/portal.go +30 -0
- package/templates/native-go/backend/internal/app/portal_test.go +55 -0
- package/templates/native-go/backend/internal/app/routes.go +8 -2
- package/templates/native-go/backend/internal/background/runner.go +1 -1
- package/templates/native-go/backend/internal/background/store.go +16 -14
- package/templates/native-go/backend/internal/dsm/admin.go +8 -2
- package/templates/native-go/backend/internal/dsm/admin_linux.go +43 -13
- package/templates/native-go/backend/internal/dsm/admin_linux_test.go +56 -0
- package/templates/native-go/backend/internal/dsm/admin_other.go +4 -1
- package/templates/native-go/backend/internal/dsm/apppriv.go +30 -0
- package/templates/native-go/backend/internal/dsm/bridge_file.go +75 -0
- package/templates/native-go/backend/internal/dsm/bridge_file_test.go +57 -0
- package/templates/native-go/backend/internal/dsm/entry.go +177 -0
- package/templates/native-go/backend/internal/dsm/entry_test.go +315 -0
- package/templates/native-go/backend/internal/dsm/native/admin-armv7.elf +0 -0
- package/templates/native-go/backend/internal/dsm/native/apppriv-aarch64.elf +0 -0
- package/templates/native-go/backend/internal/dsm/native/apppriv-armv7.elf +0 -0
- package/templates/native-go/backend/internal/dsm/native/apppriv-x86_64.elf +0 -0
- package/templates/native-go/backend/internal/dsm/native/apppriv_check.c +33 -0
- package/templates/native-go/backend/internal/dsm/native/build.sh +13 -4
- package/templates/native-go/backend/internal/dsm/native/provenance.json +9 -3
- package/templates/native-go/backend/internal/filestation/check_permission.go +71 -0
- package/templates/native-go/backend/internal/filestation/check_permission_test.go +77 -0
- package/templates/native-go/backend/internal/filestation/sdk_policy_test.go +39 -0
- package/templates/native-go/backend/internal/filestation/service.go +1 -1
- package/templates/native-go/backend/internal/portal/portal.go +138 -0
- package/templates/native-go/backend/internal/portal/portal_test.go +89 -0
- package/templates/native-go/dsm-package.yaml +20 -1
- package/templates/native-go/i18n/glossary.json +2 -1
- package/templates/native-go/i18n/messages/de.json +1 -0
- package/templates/native-go/i18n/messages/en.json +1 -0
- package/templates/native-go/i18n/messages/es.json +1 -0
- package/templates/native-go/i18n/messages/fr.json +1 -0
- package/templates/native-go/i18n/messages/it.json +1 -0
- package/templates/native-go/i18n/messages/ja.json +1 -0
- package/templates/native-go/i18n/messages/ko.json +1 -0
- package/templates/native-go/i18n/messages/zh-CN.json +1 -0
- package/templates/native-go/i18n/messages/zh-TW.json +1 -0
- package/templates/native-go/ui/app.css +10 -0
- package/templates/native-go/ui/app.js +11 -1
- package/templates/native-go-delegate/DELEGATE.md +126 -5
- package/templates/native-go-delegate/backend/cmd/background-worker/main.go +7 -0
- package/templates/native-go-delegate/backend/internal/app/delegate.go +11 -1
- package/templates/native-go-delegate/backend/internal/app/delegate_routes_test.go +14 -0
- package/templates/native-go-delegate/backend/internal/background/delegated_moves.go +270 -0
- package/templates/native-go-delegate/backend/internal/delegate/admission_recovery_test.go +410 -0
- package/templates/native-go-delegate/backend/internal/delegate/cancel_contract_test.go +95 -0
- package/templates/native-go-delegate/backend/internal/delegate/client.go +8 -0
- package/templates/native-go-delegate/backend/internal/delegate/destination.go +110 -0
- package/templates/native-go-delegate/backend/internal/delegate/destination_state.go +117 -0
- package/templates/native-go-delegate/backend/internal/delegate/destination_state_test.go +60 -0
- package/templates/native-go-delegate/backend/internal/delegate/destination_test.go +116 -0
- package/templates/native-go-delegate/backend/internal/delegate/example.go +81 -0
- package/templates/native-go-delegate/backend/internal/delegate/example_test.go +91 -0
- package/templates/native-go-delegate/backend/internal/delegate/executor_contract_test.go +511 -0
- package/templates/native-go-delegate/backend/internal/delegate/files.go +1 -1
- package/templates/native-go-delegate/backend/internal/delegate/long_running_routes.go +92 -0
- package/templates/native-go-delegate/backend/internal/delegate/long_running_routes_test.go +99 -0
- package/templates/native-go-delegate/backend/internal/delegate/move.go +348 -0
- package/templates/native-go-delegate/backend/internal/delegate/move_test.go +351 -0
- package/templates/native-go-delegate/backend/internal/delegate/operations_list.go +65 -0
- package/templates/native-go-delegate/backend/internal/delegate/operations_list_test.go +114 -0
- package/templates/native-go-delegate/backend/internal/delegate/retry_test.go +1 -1
- package/templates/native-go-delegate/backend/internal/delegate/service.go +58 -17
- package/templates/native-go-delegate/backend/internal/delegate/staging.go +121 -0
- package/templates/native-go-delegate/backend/internal/delegate/status_disabled_test.go +51 -0
- package/templates/native-go-delegate/backend/internal/delegate/testdata/executor_contract.txt +112 -0
- package/templates/native-go-delegate/backend/internal/delegate/transient_contract_test.go +137 -0
- package/templates/native-go-delegate/backend/internal/filestation/files.go +1 -31
- package/templates/native-go-delegate/frontend/src/CapabilityPanels.vue +30 -3
- package/templates/native-go-delegate/frontend/src/delegate/BackgroundSavePanel.vue +113 -0
- package/templates/native-go-delegate/frontend/src/delegate/copy.ts +5 -6
- package/templates/native-go-delegate/frontend/test/background-save.test.ts +121 -0
- package/templates/native-go-delegate/frontend/test/scope-settings.test.ts +49 -0
- package/templates/native-go-delegate/test.sh +1 -0
- package/templates/native-go-jobs/frontend/src/background/i18n/de.json +2 -2
- package/templates/native-go-jobs/frontend/src/background/i18n/en.json +2 -2
- package/templates/native-go-jobs/frontend/src/background/i18n/es.json +12 -12
- package/templates/native-go-jobs/frontend/src/background/i18n/fr.json +4 -4
- package/templates/native-go-jobs/frontend/src/background/i18n/it.json +17 -17
- package/templates/native-go-jobs/frontend/src/background/i18n/ja.json +7 -7
- package/templates/native-go-jobs/frontend/src/background/i18n/ko.json +15 -15
- package/templates/native-go-jobs/frontend/src/background/i18n/zh-CN.json +3 -3
- package/templates/native-go-jobs/frontend/src/background/i18n/zh-TW.json +2 -2
- package/templates/native-go-jobs/frontend/test/background.test.ts +25 -28
- package/templates/native-go-vue/README.md +4 -0
- package/templates/native-go-vue/frontend/package-lock.json +4 -4
- package/templates/native-go-vue/frontend/package.json +1 -1
- package/templates/native-go-vue/frontend/src/App.vue +18 -13
- package/templates/native-go-vue/frontend/src/context.ts +31 -0
- package/templates/native-go-vue/frontend/src/delegate/ExecutorSettings.vue +52 -8
- package/templates/native-go-vue/frontend/src/delegate/catalogs.ts +11 -0
- package/templates/native-go-vue/frontend/src/delegate/copy.test.ts +12 -0
- package/templates/native-go-vue/frontend/src/delegate/copy.ts +4 -4
- package/templates/native-go-vue/frontend/src/delegate/executor-setup.ts +4 -2
- package/templates/native-go-vue/frontend/src/delegate/facade.test.ts +100 -0
- package/templates/native-go-vue/frontend/src/delegate/facade.ts +85 -0
- package/templates/native-go-vue/frontend/src/delegate/i18n/de.json +46 -0
- package/templates/native-go-vue/frontend/src/delegate/i18n/en.json +12 -2
- package/templates/native-go-vue/frontend/src/delegate/i18n/es.json +46 -0
- package/templates/native-go-vue/frontend/src/delegate/i18n/fr.json +46 -0
- package/templates/native-go-vue/frontend/src/delegate/i18n/it.json +46 -0
- package/templates/native-go-vue/frontend/src/delegate/i18n/ja.json +46 -0
- package/templates/native-go-vue/frontend/src/delegate/i18n/ko.json +46 -0
- package/templates/native-go-vue/frontend/src/delegate/i18n/save/de.json +42 -0
- package/templates/native-go-vue/frontend/src/delegate/i18n/save/en.json +42 -0
- package/templates/native-go-vue/frontend/src/delegate/i18n/save/es.json +42 -0
- package/templates/native-go-vue/frontend/src/delegate/i18n/save/fr.json +42 -0
- package/templates/native-go-vue/frontend/src/delegate/i18n/save/it.json +42 -0
- package/templates/native-go-vue/frontend/src/delegate/i18n/save/ja.json +42 -0
- package/templates/native-go-vue/frontend/src/delegate/i18n/save/ko.json +42 -0
- package/templates/native-go-vue/frontend/src/delegate/i18n/save/zh-CN.json +42 -0
- package/templates/native-go-vue/frontend/src/delegate/i18n/save/zh-TW.json +42 -0
- package/templates/native-go-vue/frontend/src/delegate/i18n/zh-CN.json +46 -0
- package/templates/native-go-vue/frontend/src/delegate/i18n/zh-TW.json +15 -5
- package/templates/native-go-vue/frontend/src/delegate/long-running.ts +57 -0
- package/templates/native-go-vue/frontend/src/delegate/save-copy.test.ts +12 -0
- package/templates/native-go-vue/frontend/src/delegate/save-copy.ts +24 -0
- package/templates/native-go-vue/frontend/src/delegate/scoped-picker.test.ts +12 -0
- package/templates/native-go-vue/frontend/src/delegate/scoped-picker.ts +21 -0
- package/templates/native-go-vue/frontend/src/files/files.test.ts +7 -0
- package/templates/native-go-vue/frontend/src/i18n/de.json +20 -0
- package/templates/native-go-vue/frontend/src/i18n/en.json +20 -0
- package/templates/native-go-vue/frontend/src/i18n/es.json +20 -0
- package/templates/native-go-vue/frontend/src/i18n/fr.json +20 -0
- package/templates/native-go-vue/frontend/src/i18n/it.json +20 -0
- package/templates/native-go-vue/frontend/src/i18n/ja.json +20 -0
- package/templates/native-go-vue/frontend/src/i18n/ko.json +20 -0
- package/templates/native-go-vue/frontend/src/i18n/zh-CN.json +20 -0
- package/templates/native-go-vue/frontend/src/i18n/zh-TW.json +20 -0
- package/templates/native-go-vue/frontend/src/i18n.ts +13 -0
- package/templates/native-go-vue/frontend/src/identity/LoginPage.vue +16 -14
- package/templates/native-go-vue/frontend/src/identity/i18n/de.json +27 -0
- package/templates/native-go-vue/frontend/src/identity/i18n/en.json +27 -0
- package/templates/native-go-vue/frontend/src/identity/i18n/es.json +27 -0
- package/templates/native-go-vue/frontend/src/identity/i18n/fr.json +27 -0
- package/templates/native-go-vue/frontend/src/identity/i18n/it.json +27 -0
- package/templates/native-go-vue/frontend/src/identity/i18n/ja.json +27 -0
- package/templates/native-go-vue/frontend/src/identity/i18n/ko.json +27 -0
- package/templates/native-go-vue/frontend/src/identity/i18n/zh-CN.json +27 -0
- package/templates/native-go-vue/frontend/src/identity/i18n/zh-TW.json +27 -0
- package/templates/native-go-vue/frontend/src/identity/i18n.ts +14 -0
- package/templates/native-go-vue/frontend/src/identity/session.test.ts +4 -0
- package/templates/native-go-vue/frontend/src/identity/session.ts +9 -8
- package/templates/native-go-vue/frontend/src/nas/NasPicker.vue +31 -12
- package/templates/native-go-vue/frontend/src/nas/destination.test.ts +48 -0
- package/templates/native-go-vue/frontend/src/nas/i18n/files/de.json +1 -1
- package/templates/native-go-vue/frontend/src/nas/i18n/files/en.json +1 -1
- package/templates/native-go-vue/frontend/src/nas/i18n/files/es.json +10 -10
- package/templates/native-go-vue/frontend/src/nas/i18n/files/fr.json +1 -1
- package/templates/native-go-vue/frontend/src/nas/i18n/files/it.json +12 -12
- package/templates/native-go-vue/frontend/src/nas/i18n/files/ja.json +15 -15
- package/templates/native-go-vue/frontend/src/nas/i18n/files/ko.json +12 -12
- package/templates/native-go-vue/frontend/src/nas/i18n/files/zh-CN.json +1 -1
- package/templates/native-go-vue/frontend/src/nas/i18n/files/zh-TW.json +1 -1
- package/templates/native-go-vue/frontend/src/portal/PortalSettings.vue +39 -0
- package/templates/native-go-vue/frontend/src/shell/i18n/fr.json +1 -1
- package/templates/native-go-vue/frontend/src/shell/i18n/ja.json +1 -1
- package/templates/native-go-vue/frontend/test/apps.test.ts +14 -0
- package/templates/native-go-vue/frontend/test/portal-settings.test.ts +71 -0
- package/templates/native-go-vue/frontend/test/shell-i18n.test.ts +50 -0
|
@@ -20,15 +20,22 @@ import (
|
|
|
20
20
|
|
|
21
21
|
// Set by `synopkgland build-spk` through -ldflags -X; never read from a request.
|
|
22
22
|
var (
|
|
23
|
-
delegateScope
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
23
|
+
delegateScope = ""
|
|
24
|
+
delegateOperationsJSON = ""
|
|
25
|
+
delegateDestinationsJSON = ""
|
|
26
|
+
delegateLifetime = ""
|
|
27
|
+
executorDigest = ""
|
|
28
|
+
policyDigest = ""
|
|
29
|
+
packageID = "dev"
|
|
30
|
+
version = "0.0.0"
|
|
28
31
|
// "session" when the project opted into the interactive File Station adapter.
|
|
29
32
|
fileStation = ""
|
|
30
33
|
// "standalone" enables the SDK identity adapter; the runtime owns authentication.
|
|
31
34
|
identity = ""
|
|
35
|
+
// dsm-package.yaml entry: "admin-only" or "app-privilege"; empty keeps the route policy alone.
|
|
36
|
+
entry = ""
|
|
37
|
+
// "on" when dsm-package.yaml declares portal: serves portal.status.
|
|
38
|
+
portal = ""
|
|
32
39
|
)
|
|
33
40
|
|
|
34
41
|
func main() {
|
|
@@ -39,15 +46,24 @@ func main() {
|
|
|
39
46
|
os.Exit(2)
|
|
40
47
|
}
|
|
41
48
|
cfg := app.Config{
|
|
42
|
-
DelegateScope:
|
|
43
|
-
|
|
49
|
+
DelegateScope: delegateScope,
|
|
50
|
+
DelegateOperationsJSON: delegateOperationsJSON,
|
|
51
|
+
DelegateDestinationsJSON: delegateDestinationsJSON,
|
|
52
|
+
DelegateLifetime: delegateLifetime,
|
|
53
|
+
ExecutorDigest: executorDigest, PolicyDigest: policyDigest,
|
|
44
54
|
PackageID: packageID,
|
|
45
55
|
Version: version,
|
|
46
56
|
DataDir: "/var/packages/" + packageID + "/var",
|
|
57
|
+
Portal: portal == "on",
|
|
58
|
+
}
|
|
59
|
+
if _, err := app.ParseDelegateConfig(cfg); err != nil {
|
|
60
|
+
log.Fatal(err)
|
|
47
61
|
}
|
|
48
62
|
if app.SessionFilesEnabled(fileStation) {
|
|
49
63
|
cfg.SessionFiles = filestation.Local(cfg.DataDir)
|
|
50
64
|
}
|
|
65
|
+
// Kernels without memfd_create stage DSM's bridges in the package's own temp.
|
|
66
|
+
dsm.SetBridgeFallbackDir("/var/packages/" + packageID + "/tmp")
|
|
51
67
|
var auth api.Authenticator = dsm.NewAuthenticator()
|
|
52
68
|
var standalone *standaloneidentity.Service
|
|
53
69
|
if identity == "standalone" {
|
|
@@ -58,6 +74,10 @@ func main() {
|
|
|
58
74
|
}
|
|
59
75
|
auth = standalone
|
|
60
76
|
}
|
|
77
|
+
auth, err := dsm.NewEntryGate(auth, entry, packageID, cfg.DataDir)
|
|
78
|
+
if err != nil {
|
|
79
|
+
log.Fatal(err)
|
|
80
|
+
}
|
|
61
81
|
srv, err := api.NewServer(auth, app.Routes(cfg)...)
|
|
62
82
|
if err != nil {
|
|
63
83
|
log.Fatal(err)
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
package api
|
|
2
|
+
|
|
3
|
+
import (
|
|
4
|
+
"context"
|
|
5
|
+
"encoding/json"
|
|
6
|
+
"errors"
|
|
7
|
+
"testing"
|
|
8
|
+
)
|
|
9
|
+
|
|
10
|
+
func TestEntryRefusalsReachTheBrowserAsStableCodes(t *testing.T) {
|
|
11
|
+
raw := []byte(`{"schema":1,"default":"administrators","methods":{"demo.user":"authenticated"}}`)
|
|
12
|
+
for _, tc := range []struct {
|
|
13
|
+
err error
|
|
14
|
+
code string
|
|
15
|
+
}{
|
|
16
|
+
{ErrAdminRequired, "admin_required"},
|
|
17
|
+
{ErrAppPrivilegeDenied, "app_privilege_denied"},
|
|
18
|
+
{errors.New("bridge exited 2"), "auth_unavailable"},
|
|
19
|
+
} {
|
|
20
|
+
executed := 0
|
|
21
|
+
srv, err := NewServerWithPermissions(&fakeAuth{err: tc.err}, raw, Handle("demo.user", func(context.Context, Caller, json.RawMessage) (any, error) {
|
|
22
|
+
executed++
|
|
23
|
+
return nil, nil
|
|
24
|
+
}))
|
|
25
|
+
if err != nil {
|
|
26
|
+
t.Fatal(err)
|
|
27
|
+
}
|
|
28
|
+
for _, method := range []string{"demo.user", "future.unknown"} {
|
|
29
|
+
_, env := post(t, srv, `{"method":"`+method+`"}`)
|
|
30
|
+
if env.Error == nil || env.Error.Code != tc.code || executed != 0 {
|
|
31
|
+
t.Fatalf("%v %s: %+v executed=%d", tc.err, method, env.Error, executed)
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
func TestRequireAdminLetsHandlersReserveGlobalSettings(t *testing.T) {
|
|
38
|
+
if err := RequireAdmin(Caller{identity: Identity{User: "alice", Admin: true}, authenticated: true}); err != nil {
|
|
39
|
+
t.Fatal(err)
|
|
40
|
+
}
|
|
41
|
+
for _, c := range []Caller{{identity: Identity{User: "bob"}, authenticated: true}, {identity: Identity{User: "alice", Admin: true}}, {}} {
|
|
42
|
+
var apiErr *Error
|
|
43
|
+
if err := RequireAdmin(c); !errors.As(err, &apiErr) || apiErr.Code != "admin_required" {
|
|
44
|
+
t.Fatalf("%+v: %v", c, err)
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
}
|
|
@@ -9,7 +9,7 @@ import (
|
|
|
9
9
|
|
|
10
10
|
func TestDefaultPermissionsRequireAdministratorGroup(t *testing.T) {
|
|
11
11
|
for _, makeRoute := range []func(string, Handler) Route{User, Public, Admin} {
|
|
12
|
-
for
|
|
12
|
+
for method, code := range map[string]string{"future.read": "admin_required", "future.unknown": "unknown_method"} {
|
|
13
13
|
executed := 0
|
|
14
14
|
auth := &fakeAuth{user: "admin"} // Name alone confers no group membership.
|
|
15
15
|
srv, err := NewServer(auth, makeRoute("future.read", func(context.Context, Caller, json.RawMessage) (any, error) {
|
|
@@ -20,7 +20,7 @@ func TestDefaultPermissionsRequireAdministratorGroup(t *testing.T) {
|
|
|
20
20
|
t.Fatal(err)
|
|
21
21
|
}
|
|
22
22
|
_, env := post(t, srv, `{"method":"`+method+`","params":{"admin":true,"groups":["administrators"]}}`)
|
|
23
|
-
if env.Error == nil || env.Error.Code !=
|
|
23
|
+
if env.Error == nil || env.Error.Code != code || executed != 0 || auth.calls != 1 {
|
|
24
24
|
t.Fatalf("method=%s error=%+v executed=%d auth=%d", method, env.Error, executed, auth.calls)
|
|
25
25
|
}
|
|
26
26
|
}
|
|
@@ -39,7 +39,7 @@ func TestCentralPermissionsAreTheOnlyAccessDecision(t *testing.T) {
|
|
|
39
39
|
t.Fatal(err)
|
|
40
40
|
}
|
|
41
41
|
for _, tc := range []struct{ method, code string }{
|
|
42
|
-
{"demo.user", ""}, {"demo.ping", ""}, {"demo.private", "admin_required"}, {"future.unknown", "
|
|
42
|
+
{"demo.user", ""}, {"demo.ping", ""}, {"demo.private", "admin_required"}, {"future.unknown", "unknown_method"},
|
|
43
43
|
} {
|
|
44
44
|
_, env := post(t, srv, `{"method":"`+tc.method+`"}`)
|
|
45
45
|
if tc.code == "" {
|
|
@@ -102,6 +102,17 @@ func (c Caller) Authenticated() bool { return c.authenticated }
|
|
|
102
102
|
func (c Caller) User() string { return c.identity.User }
|
|
103
103
|
func (c Caller) Admin() bool { return c.authenticated && c.identity.Admin }
|
|
104
104
|
|
|
105
|
+
var adminRequired = &Error{"admin_required", "this action needs the DSM administrators group"}
|
|
106
|
+
|
|
107
|
+
// RequireAdmin reserves part of a shared route, such as global settings, for
|
|
108
|
+
// DSM administrators. Whole routes are reserved in permissions.json instead.
|
|
109
|
+
func RequireAdmin(c Caller) error {
|
|
110
|
+
if !c.Admin() {
|
|
111
|
+
return adminRequired
|
|
112
|
+
}
|
|
113
|
+
return nil
|
|
114
|
+
}
|
|
115
|
+
|
|
105
116
|
var methodName = regexp.MustCompile(`^[a-z][a-z0-9_]*(\.[a-z][a-z0-9_]*)+$`)
|
|
106
117
|
|
|
107
118
|
func buildRegistry(routes []Route) (map[string]Route, error) {
|
|
@@ -23,6 +23,9 @@
|
|
|
23
23
|
"bg.jobs.purge": "administrators",
|
|
24
24
|
"bg.schedules.enable": "administrators"
|
|
25
25
|
},
|
|
26
|
+
"portal": {
|
|
27
|
+
"portal.status": "authenticated"
|
|
28
|
+
},
|
|
26
29
|
"identity": {
|
|
27
30
|
"identity.status": "public",
|
|
28
31
|
"identity.login": "public",
|
|
@@ -35,12 +38,22 @@
|
|
|
35
38
|
"root.run": "administrators"
|
|
36
39
|
},
|
|
37
40
|
"delegate": {
|
|
41
|
+
"delegate.destination": "authenticated",
|
|
38
42
|
"delegate.status": "authenticated",
|
|
39
43
|
"delegate.create": "authenticated",
|
|
40
44
|
"delegate.list": "authenticated",
|
|
41
45
|
"delegate.revoke": "authenticated",
|
|
42
46
|
"delegate.jobs.submit": "authenticated",
|
|
43
47
|
"delegate.jobs.list": "authenticated",
|
|
44
|
-
"delegate.jobs.cancel": "authenticated"
|
|
48
|
+
"delegate.jobs.cancel": "authenticated",
|
|
49
|
+
"delegate.select_destination": "authenticated",
|
|
50
|
+
"delegate.move_from_staging": "authenticated",
|
|
51
|
+
"delegate.operations.get": "authenticated",
|
|
52
|
+
"delegate.operations.list": "authenticated",
|
|
53
|
+
"delegate.operations.cancel": "authenticated",
|
|
54
|
+
"delegate.disable": "administrators",
|
|
55
|
+
"delegate.enable": "administrators",
|
|
56
|
+
"delegate.audit": "authenticated",
|
|
57
|
+
"delegate.example.export": "authenticated"
|
|
45
58
|
}
|
|
46
59
|
}
|
|
@@ -40,6 +40,13 @@ func WithRequestDeadline(next http.Handler) http.Handler {
|
|
|
40
40
|
// ErrNoSession means the request carries no valid DSM session.
|
|
41
41
|
var ErrNoSession = errors.New("no valid DSM session")
|
|
42
42
|
|
|
43
|
+
// ErrAdminRequired is an entry refusal: the app admits only administrators.
|
|
44
|
+
var ErrAdminRequired = errors.New("app entry requires an administrator")
|
|
45
|
+
|
|
46
|
+
// ErrAppPrivilegeDenied is an entry refusal: DSM Application Privileges do not
|
|
47
|
+
// allow this account to use the app from this address.
|
|
48
|
+
var ErrAppPrivilegeDenied = errors.New("DSM Application Privileges deny this app")
|
|
49
|
+
|
|
43
50
|
// Authenticator verifies the DSM session behind a request.
|
|
44
51
|
type Authenticator interface {
|
|
45
52
|
Authenticate(r *http.Request) (Identity, error)
|
|
@@ -212,18 +219,24 @@ func (s *Server) authorize(r *http.Request, method string) (Caller, Route, *Erro
|
|
|
212
219
|
if errors.Is(err, ErrNoSession) {
|
|
213
220
|
return Caller{}, Route{}, &Error{"session_required", "sign in to DSM again"}
|
|
214
221
|
}
|
|
222
|
+
if errors.Is(err, ErrAdminRequired) {
|
|
223
|
+
return Caller{}, Route{}, adminRequired
|
|
224
|
+
}
|
|
225
|
+
if errors.Is(err, ErrAppPrivilegeDenied) {
|
|
226
|
+
return Caller{}, Route{}, &Error{"app_privilege_denied", "DSM Application Privileges do not allow this account to use this app"}
|
|
227
|
+
}
|
|
215
228
|
if err != nil {
|
|
216
229
|
log.Printf("authentication unavailable: %v", err)
|
|
217
230
|
return Caller{}, Route{}, &Error{"auth_unavailable", "DSM authentication is unavailable"}
|
|
218
231
|
}
|
|
219
|
-
//
|
|
220
|
-
//
|
|
221
|
-
if (!known || route.policy == policyAdmin) && !identity.Admin {
|
|
222
|
-
return Caller{}, Route{}, &Error{"admin_required", "this action needs the DSM administrators group"}
|
|
223
|
-
}
|
|
232
|
+
// Signed-in callers learn that a method is unregistered; method names
|
|
233
|
+
// already ship in the app's UI. Route constructors never grant permission.
|
|
224
234
|
if !known {
|
|
225
235
|
return Caller{}, Route{}, &Error{"unknown_method", "unknown method"}
|
|
226
236
|
}
|
|
237
|
+
if route.policy == policyAdmin && !identity.Admin {
|
|
238
|
+
return Caller{}, Route{}, adminRequired
|
|
239
|
+
}
|
|
227
240
|
caller := Caller{identity: identity, authenticated: true}
|
|
228
241
|
return caller, route, nil
|
|
229
242
|
}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
package app
|
|
2
|
+
|
|
3
|
+
import (
|
|
4
|
+
"encoding/json"
|
|
5
|
+
"errors"
|
|
6
|
+
"regexp"
|
|
7
|
+
)
|
|
8
|
+
|
|
9
|
+
type DelegateSettings struct {
|
|
10
|
+
Scope string
|
|
11
|
+
Operations, Destinations []string
|
|
12
|
+
Lifetime string
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
var destinationKey = regexp.MustCompile(`^[a-z][a-z0-9_-]{0,63}$`)
|
|
16
|
+
|
|
17
|
+
// ParseDelegateConfig consumes only build/startup settings. Legacy declarations
|
|
18
|
+
// retain their TTL/job branch; absent extension fields never imply permanence.
|
|
19
|
+
func ParseDelegateConfig(cfg Config) (DelegateSettings, error) {
|
|
20
|
+
out := DelegateSettings{Scope: cfg.DelegateScope, Lifetime: cfg.DelegateLifetime}
|
|
21
|
+
invalid := errors.New("invalid delegate build configuration")
|
|
22
|
+
if cfg.DelegateOperationsJSON != "" && json.Unmarshal([]byte(cfg.DelegateOperationsJSON), &out.Operations) != nil {
|
|
23
|
+
return DelegateSettings{}, invalid
|
|
24
|
+
}
|
|
25
|
+
if cfg.DelegateDestinationsJSON != "" && json.Unmarshal([]byte(cfg.DelegateDestinationsJSON), &out.Destinations) != nil {
|
|
26
|
+
return DelegateSettings{}, invalid
|
|
27
|
+
}
|
|
28
|
+
if out.Lifetime == "" {
|
|
29
|
+
if len(out.Destinations) != 0 {
|
|
30
|
+
return DelegateSettings{}, invalid
|
|
31
|
+
}
|
|
32
|
+
seen := map[string]bool{}
|
|
33
|
+
for _, op := range out.Operations {
|
|
34
|
+
switch op {
|
|
35
|
+
case "files.list", "files.info", "files.createFolder", "files.checkPermission", "files.write":
|
|
36
|
+
default:
|
|
37
|
+
return DelegateSettings{}, invalid
|
|
38
|
+
}
|
|
39
|
+
if seen[op] {
|
|
40
|
+
return DelegateSettings{}, invalid
|
|
41
|
+
}
|
|
42
|
+
seen[op] = true
|
|
43
|
+
}
|
|
44
|
+
return out, nil
|
|
45
|
+
}
|
|
46
|
+
if out.Lifetime != "until-revoked" || out.Scope == "" || len(out.Operations) != 1 || out.Operations[0] != "files.moveFromStaging" || len(out.Destinations) == 0 || len(out.Destinations) > 64 {
|
|
47
|
+
return DelegateSettings{}, invalid
|
|
48
|
+
}
|
|
49
|
+
seen := map[string]bool{}
|
|
50
|
+
for _, key := range out.Destinations {
|
|
51
|
+
if !destinationKey.MatchString(key) || seen[key] {
|
|
52
|
+
return DelegateSettings{}, invalid
|
|
53
|
+
}
|
|
54
|
+
seen[key] = true
|
|
55
|
+
}
|
|
56
|
+
return out, nil
|
|
57
|
+
}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
package app
|
|
2
|
+
|
|
3
|
+
import "testing"
|
|
4
|
+
|
|
5
|
+
func TestDelegateBuildConfigStrictlySeparatesLegacyAndPermanent(t *testing.T) {
|
|
6
|
+
valid := Config{DelegateScope: "home", DelegateOperationsJSON: `["files.moveFromStaging"]`, DelegateDestinationsJSON: `["save"]`, DelegateLifetime: "until-revoked"}
|
|
7
|
+
settings, err := ParseDelegateConfig(valid)
|
|
8
|
+
if err != nil || settings.Lifetime != "until-revoked" || len(settings.Destinations) != 1 {
|
|
9
|
+
t.Fatal(settings, err)
|
|
10
|
+
}
|
|
11
|
+
for _, cfg := range []Config{{}, {DelegateScope: "home"}, {DelegateScope: "home", DelegateOperationsJSON: `["files.write"]`}} {
|
|
12
|
+
settings, err = ParseDelegateConfig(cfg)
|
|
13
|
+
if err != nil || settings.Lifetime != "" || len(settings.Destinations) != 0 {
|
|
14
|
+
t.Fatal("legacy changed", settings, err)
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
for _, mutate := range []func(*Config){
|
|
18
|
+
func(c *Config) { c.DelegateLifetime = "" }, func(c *Config) { c.DelegateScope = "" }, func(c *Config) { c.DelegateOperationsJSON = `["files.write"]` },
|
|
19
|
+
func(c *Config) { c.DelegateDestinationsJSON = `["save","save"]` }, func(c *Config) { c.DelegateDestinationsJSON = `["Save"]` }, func(c *Config) { c.DelegateDestinationsJSON = `[]` }, func(c *Config) { c.DelegateDestinationsJSON = `null` },
|
|
20
|
+
func(c *Config) { c.DelegateDestinationsJSON = `["save"] {}` },
|
|
21
|
+
} {
|
|
22
|
+
cfg := valid
|
|
23
|
+
mutate(&cfg)
|
|
24
|
+
if _, err = ParseDelegateConfig(cfg); err == nil {
|
|
25
|
+
t.Fatal("invalid trusted config accepted", cfg)
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
package app
|
|
2
|
+
|
|
3
|
+
import (
|
|
4
|
+
"context"
|
|
5
|
+
"encoding/json"
|
|
6
|
+
|
|
7
|
+
"dsmapp/internal/api"
|
|
8
|
+
"dsmapp/internal/portal"
|
|
9
|
+
)
|
|
10
|
+
|
|
11
|
+
// portalRoutes serves portal.status when dsm-package.yaml declares `portal`.
|
|
12
|
+
// An administrator sets the alias with DSM's own AppPortal API from the UI;
|
|
13
|
+
// the package only reads DSM's saved setting.
|
|
14
|
+
func (cfg Config) portalRoutes() []api.Route {
|
|
15
|
+
if !cfg.Portal {
|
|
16
|
+
return nil
|
|
17
|
+
}
|
|
18
|
+
return []api.Route{api.Handle("portal.status", cfg.portalStatus)}
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
func (cfg Config) portalStatus(_ context.Context, _ api.Caller, params json.RawMessage) (any, error) {
|
|
22
|
+
if err := decodeParams(params, &struct{}{}); err != nil {
|
|
23
|
+
return nil, err
|
|
24
|
+
}
|
|
25
|
+
path := cfg.PortalConfig
|
|
26
|
+
if path == "" {
|
|
27
|
+
path = portal.ConfigPath(cfg.PackageID)
|
|
28
|
+
}
|
|
29
|
+
return portal.Read(path, "SYNO.SDS."+cfg.PackageID+".Instance"), nil
|
|
30
|
+
}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
package app
|
|
2
|
+
|
|
3
|
+
import (
|
|
4
|
+
"os"
|
|
5
|
+
"path/filepath"
|
|
6
|
+
"testing"
|
|
7
|
+
)
|
|
8
|
+
|
|
9
|
+
func portalConfig(t *testing.T, saved string) Config {
|
|
10
|
+
cfg := testConfig(t)
|
|
11
|
+
cfg.Portal = true
|
|
12
|
+
cfg.PortalConfig = filepath.Join(t.TempDir(), "AppPortal.json")
|
|
13
|
+
if saved != "" {
|
|
14
|
+
if err := os.WriteFile(cfg.PortalConfig, []byte(saved), 0o644); err != nil {
|
|
15
|
+
t.Fatal(err)
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
return cfg
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
func TestPortalStatusTellsEverySignedInUserTheAlias(t *testing.T) {
|
|
22
|
+
cfg := portalConfig(t, `{"alias":"hello-go","id":"SYNO.SDS.HelloGo.Instance","version":3}`)
|
|
23
|
+
code, out := call(t, cfg, bob, "portal.status", `{}`)
|
|
24
|
+
if code != "" {
|
|
25
|
+
t.Fatalf("%q %v", code, out)
|
|
26
|
+
}
|
|
27
|
+
data := out["data"].(map[string]any)
|
|
28
|
+
if data["state"] != "active" || data["alias"] != "hello-go" {
|
|
29
|
+
t.Fatalf("%v", data)
|
|
30
|
+
}
|
|
31
|
+
if code, _ := call(t, cfg, nobody, "portal.status", `{}`); code != "session_required" {
|
|
32
|
+
t.Fatalf("anonymous: %q", code)
|
|
33
|
+
}
|
|
34
|
+
if code, _ := call(t, cfg, bob, "portal.status", `{"alias":"x"}`); code != "bad_request" {
|
|
35
|
+
t.Fatalf("params: %q", code)
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
func TestPortalStatusFailsClosedOnAnotherAppsSetting(t *testing.T) {
|
|
40
|
+
cfg := portalConfig(t, `{"alias":"hello-go","id":"SYNO.SDS.Other.Instance"}`)
|
|
41
|
+
_, out := call(t, cfg, bob, "portal.status", `{}`)
|
|
42
|
+
if data := out["data"].(map[string]any); data["state"] != "unavailable" || data["alias"] != nil {
|
|
43
|
+
t.Fatalf("%v", data)
|
|
44
|
+
}
|
|
45
|
+
_, out = call(t, portalConfig(t, ""), bob, "portal.status", `{}`)
|
|
46
|
+
if data := out["data"].(map[string]any); data["state"] != "inactive" {
|
|
47
|
+
t.Fatalf("%v", data)
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
func TestPortalStatusExistsOnlyForAPortalBuild(t *testing.T) {
|
|
52
|
+
if code, _ := call(t, testConfig(t), alice, "portal.status", `{}`); code != "unknown_method" {
|
|
53
|
+
t.Fatalf("%q", code)
|
|
54
|
+
}
|
|
55
|
+
}
|
|
@@ -24,8 +24,9 @@ import (
|
|
|
24
24
|
|
|
25
25
|
// Config is fixed at build time and startup, never taken from a request.
|
|
26
26
|
type Config struct {
|
|
27
|
-
DelegateScope
|
|
28
|
-
|
|
27
|
+
DelegateScope string
|
|
28
|
+
DelegateOperationsJSON, DelegateDestinationsJSON, DelegateLifetime string
|
|
29
|
+
ExecutorDigest, PolicyDigest string
|
|
29
30
|
|
|
30
31
|
// SessionFiles is the interactive File Station adapter; nil keeps legacy refusal.
|
|
31
32
|
SessionFiles *filestation.Service
|
|
@@ -36,6 +37,10 @@ type Config struct {
|
|
|
36
37
|
DataDir string
|
|
37
38
|
// VolumeRoot is where /volumeN lives; empty means "/". Tests set it.
|
|
38
39
|
VolumeRoot string
|
|
40
|
+
// Portal serves portal.status; PortalConfig overrides DSM's saved
|
|
41
|
+
// AppPortal.json path in tests.
|
|
42
|
+
Portal bool
|
|
43
|
+
PortalConfig string
|
|
39
44
|
}
|
|
40
45
|
|
|
41
46
|
func Routes(cfg Config) []api.Route {
|
|
@@ -47,6 +52,7 @@ func Routes(cfg Config) []api.Route {
|
|
|
47
52
|
}...)
|
|
48
53
|
routes = append(routes, cfg.SessionFiles.Routes()...)
|
|
49
54
|
routes = append(routes, cfg.backgroundRoutes()...)
|
|
55
|
+
routes = append(routes, cfg.portalRoutes()...)
|
|
50
56
|
return append(routes, cfg.rootRoutes()...)
|
|
51
57
|
}
|
|
52
58
|
|
|
@@ -14,7 +14,7 @@ import (
|
|
|
14
14
|
// Work is one fixed worker algorithm. It receives only the job's input bytes.
|
|
15
15
|
type Work func(ctx context.Context, in io.Reader) (Result, error)
|
|
16
16
|
|
|
17
|
-
// SHA256V1
|
|
17
|
+
// SHA256V1 hashes the imported private copy; delegate assembly adds a separate fixed worker.
|
|
18
18
|
func SHA256V1(ctx context.Context, in io.Reader) (Result, error) {
|
|
19
19
|
h := sha256.New()
|
|
20
20
|
buf := make([]byte, 32*1024)
|
|
@@ -61,18 +61,20 @@ const (
|
|
|
61
61
|
func (s State) terminal() bool { return s != StateQueued && s != StateRunning }
|
|
62
62
|
|
|
63
63
|
var (
|
|
64
|
-
ErrBusy
|
|
65
|
-
ErrOwnerQueueFull
|
|
66
|
-
ErrOwnerQuota
|
|
67
|
-
ErrInvalid
|
|
68
|
-
ErrTooLarge
|
|
69
|
-
ErrQueueFull
|
|
70
|
-
ErrQuota
|
|
71
|
-
ErrKeyConflict
|
|
72
|
-
ErrNotFound
|
|
73
|
-
ErrNotCancelable
|
|
74
|
-
ErrNotRunning
|
|
75
|
-
ErrUnsafeSpool
|
|
64
|
+
ErrBusy = errors.New("background journal is busy; retry later")
|
|
65
|
+
ErrOwnerQueueFull = errors.New("owner pending quota reached")
|
|
66
|
+
ErrOwnerQuota = errors.New("owner storage quota reached")
|
|
67
|
+
ErrInvalid = errors.New("invalid background request")
|
|
68
|
+
ErrTooLarge = errors.New("input is larger than the per-file limit")
|
|
69
|
+
ErrQueueFull = errors.New("background queue is full")
|
|
70
|
+
ErrQuota = errors.New("background spool quota reached")
|
|
71
|
+
ErrKeyConflict = errors.New("idempotency key already used for another input")
|
|
72
|
+
ErrNotFound = errors.New("job not found")
|
|
73
|
+
ErrNotCancelable = errors.New("job already finished")
|
|
74
|
+
ErrNotRunning = errors.New("job is not running")
|
|
75
|
+
ErrUnsafeSpool = errors.New("background spool is not private to the package account")
|
|
76
|
+
ErrJournalUnreadable = errors.New("background journal unreadable")
|
|
77
|
+
ErrJournalSchema = errors.New("background journal has an unsupported schema")
|
|
76
78
|
)
|
|
77
79
|
|
|
78
80
|
// Submitter binds visibility to a fresh DSM username and UID. It never grants
|
|
@@ -336,10 +338,10 @@ func (s *Store) readJournal(root *os.Root) (journal, error) {
|
|
|
336
338
|
}
|
|
337
339
|
b, err := io.ReadAll(io.LimitReader(f, maxJournal+1))
|
|
338
340
|
if err != nil || len(b) > maxJournal {
|
|
339
|
-
return j,
|
|
341
|
+
return j, ErrJournalUnreadable
|
|
340
342
|
}
|
|
341
343
|
if err := json.Unmarshal(b, &j); err != nil || j.Schema != schemaVersion {
|
|
342
|
-
return journal{},
|
|
344
|
+
return journal{}, ErrJournalSchema
|
|
343
345
|
}
|
|
344
346
|
return j, nil
|
|
345
347
|
}
|
|
@@ -56,8 +56,14 @@ func runCGI(ctx context.Context, path string, env []string) ([]byte, error) {
|
|
|
56
56
|
}
|
|
57
57
|
|
|
58
58
|
func parseNativeRole(out []byte, err error) (bool, error) {
|
|
59
|
+
return parseNativeBit(out, err, errNativeRole)
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
// parseNativeBit accepts only a bridge's exact "1\n" or "0\n"; anything else,
|
|
63
|
+
// including a failed run, is the caller's unavailable error.
|
|
64
|
+
func parseNativeBit(out []byte, err, unavailable error) (bool, error) {
|
|
59
65
|
if err != nil {
|
|
60
|
-
return false,
|
|
66
|
+
return false, unavailable
|
|
61
67
|
}
|
|
62
68
|
switch string(out) {
|
|
63
69
|
case "1\n":
|
|
@@ -65,6 +71,6 @@ func parseNativeRole(out []byte, err error) (bool, error) {
|
|
|
65
71
|
case "0\n":
|
|
66
72
|
return false, nil
|
|
67
73
|
default:
|
|
68
|
-
return false,
|
|
74
|
+
return false, unavailable
|
|
69
75
|
}
|
|
70
76
|
}
|
|
@@ -23,31 +23,61 @@ var adminAMD64 []byte
|
|
|
23
23
|
//go:embed native/admin-aarch64.elf
|
|
24
24
|
var adminARM64 []byte
|
|
25
25
|
|
|
26
|
+
//go:embed native/apppriv-x86_64.elf
|
|
27
|
+
var appPrivAMD64 []byte
|
|
28
|
+
|
|
29
|
+
//go:embed native/apppriv-aarch64.elf
|
|
30
|
+
var appPrivARM64 []byte
|
|
31
|
+
|
|
32
|
+
//go:embed native/admin-armv7.elf
|
|
33
|
+
var adminARMv7 []byte
|
|
34
|
+
|
|
35
|
+
//go:embed native/apppriv-armv7.elf
|
|
36
|
+
var appPrivARMv7 []byte
|
|
37
|
+
|
|
38
|
+
// Bridges per runtime.GOARCH; an architecture without one is refused.
|
|
39
|
+
var (
|
|
40
|
+
adminBridges = map[string][]byte{"amd64": adminAMD64, "arm64": adminARM64, "arm": adminARMv7}
|
|
41
|
+
appPrivBridges = map[string][]byte{"amd64": appPrivAMD64, "arm64": appPrivARM64, "arm": appPrivARMv7}
|
|
42
|
+
)
|
|
43
|
+
|
|
26
44
|
func nativeAdministrator(ctx context.Context, principal string) (bool, error) {
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
45
|
+
out, err := runBridge(ctx, adminBridges, principal)
|
|
46
|
+
return parseNativeRole(out, err)
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
func nativeAppPrivilege(ctx context.Context, principal, app, addr string) (bool, error) {
|
|
50
|
+
out, err := runBridge(ctx, appPrivBridges, principal, app, addr)
|
|
51
|
+
return parseNativeBit(out, err, errNativeAppPriv)
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
// runBridge executes the sealed bridge for this architecture with fixed
|
|
55
|
+
// arguments and a minimal environment, returning at most 16 bytes of output.
|
|
56
|
+
func runBridge(ctx context.Context, bridges map[string][]byte, args ...string) ([]byte, error) {
|
|
57
|
+
payload, ok := bridges[runtime.GOARCH]
|
|
58
|
+
if !ok {
|
|
59
|
+
return nil, errors.New("unsupported architecture")
|
|
35
60
|
}
|
|
36
61
|
file, err := sealedBridge(payload)
|
|
37
62
|
if err != nil {
|
|
38
|
-
return
|
|
63
|
+
return nil, err
|
|
39
64
|
}
|
|
40
65
|
defer file.Close()
|
|
41
|
-
cmd := exec.CommandContext(ctx, "/proc/self/fd/3",
|
|
66
|
+
cmd := exec.CommandContext(ctx, "/proc/self/fd/3", args...)
|
|
42
67
|
cmd.ExtraFiles = []*os.File{file}
|
|
43
68
|
// In particular, never inherit LD_PRELOAD/LD_LIBRARY_PATH or credentials.
|
|
44
69
|
cmd.Env = []string{"LANG=C", "LC_ALL=C"}
|
|
45
|
-
|
|
46
|
-
return parseNativeRole(out, err)
|
|
70
|
+
return commandOutput(cmd, 16)
|
|
47
71
|
}
|
|
48
72
|
|
|
73
|
+
// memfdCreate is the sealing primitive; tests replace it to model old kernels.
|
|
74
|
+
var memfdCreate = unix.MemfdCreate
|
|
75
|
+
|
|
49
76
|
func sealedBridge(payload []byte) (*os.File, error) {
|
|
50
|
-
fd, err :=
|
|
77
|
+
fd, err := memfdCreate("synopkgland-admin", unix.MFD_CLOEXEC|unix.MFD_ALLOW_SEALING)
|
|
78
|
+
if errors.Is(err, unix.ENOSYS) {
|
|
79
|
+
return unlinkedBridge(bridgeFallbackDir, payload)
|
|
80
|
+
}
|
|
51
81
|
if err != nil {
|
|
52
82
|
return nil, err
|
|
53
83
|
}
|