{t('file.relation.upgrade', { installed: local.installedVersion, version: local.version })}
)} diff --git a/core/http/react-ui/src/components/addons/fileInstall.js b/core/http/react-ui/src/components/addons/fileInstall.js index f67309b909..fa61474796 100644 --- a/core/http/react-ui/src/components/addons/fileInstall.js +++ b/core/http/react-ui/src/components/addons/fileInstall.js @@ -55,7 +55,8 @@ export function fileEntry(file) { // Whether the file may be installed at all, and what the person must confirm // first. The same version is never installed again; an older one needs a tick. -export function fileGate(file, { downgradeTicked = false } = {}) { +export function fileGate(file, { downgradeTicked = false, locked = false } = {}) { + if (locked) return { allowed: false, reason: 'locked' } if (!file || file.relation === 'same') return { allowed: false, reason: 'same' } if (file.relation === 'downgrade' && !downgradeTicked) return { allowed: false, reason: 'downgrade' } return { allowed: true, reason: '' } diff --git a/core/http/react-ui/tests/unit/addonfile.test.mjs b/core/http/react-ui/tests/unit/addonfile.test.mjs index 0ef33338d6..35761f5efc 100644 --- a/core/http/react-ui/tests/unit/addonfile.test.mjs +++ b/core/http/react-ui/tests/unit/addonfile.test.mjs @@ -42,6 +42,7 @@ test('addonfile: the same version is never installed, an older one needs the tic assert.equal(fileGate(f('upgrade')).allowed, true) assert.equal(fileGate(f('new')).allowed, true) assert.equal(fileGate(null).allowed, false) + assert.deepEqual(fileGate(f('new'), { locked: true }), { allowed: false, reason: 'locked' }) }) test('addonfile: an installed add-on is upgraded and a new one installed', () => { diff --git a/core/services/addons/gateway/hostfiles.go b/core/services/addons/gateway/hostfiles.go index b47e4b8b1b..8c2622c6af 100644 --- a/core/services/addons/gateway/hostfiles.go +++ b/core/services/addons/gateway/hostfiles.go @@ -87,6 +87,12 @@ func (o *HostGrantsOwner) fileCall(ctx context.Context, a contract.Actor, call H return nil, ErrUnavailable } bad := func() (any, error) { return nil, o.invalid() } + // An unsigned file installs only where UI host grants work: when the + // deployment locks them (sign-in off, or a policy file that is the only + // source), nothing can be staged either, and the answer says why. + if call.Op == HostGrantsFileBegin && o.cfg.Locked { + return nil, hgErr(403, HostGrantsLocked, o.lockedText()) + } switch call.Op { case HostGrantsFileBegin: var r fileBeginRequest diff --git a/core/services/addons/gateway/hostfiles_test.go b/core/services/addons/gateway/hostfiles_test.go index a9eec04746..1cf0185e1b 100644 --- a/core/services/addons/gateway/hostfiles_test.go +++ b/core/services/addons/gateway/hostfiles_test.go @@ -183,6 +183,18 @@ var _ = Describe("add-on zip files reach the owner", func() { Expect(typeOf(err)).To(Equal("not_human_surface")) }) + It("stages nothing while the deployment locks the UI host grants", func() { + sim := &fileSim{store: &uploads.Store{Root: filepath.Join(GinkgoT().TempDir(), "uploads")}, max: 1 << 20} + fx := newHGFixture(func(c *HostGrantsConfig) { c.Locked = true; c.LockedReason = LockedNoAuth }) + fx.svc.WithFiles(sim) + g := &Gateway{HostGrantsOwner: fx.svc, Revalidate: ok} + _, err := g.UploadFile(context.Background(), alice, "x.zip", strings.NewReader("x")) + Expect(typeOf(err)).To(Equal("locked_by_deployment")) + Expect(err.Error()).To(Equal(LockedNoAuthText)) + ents, _ := os.ReadDir(sim.store.Root) + Expect(ents).To(BeEmpty()) + }) + It("answers unavailable when the owner has no file service", func() { fx := newHGFixture() g := &Gateway{HostGrantsOwner: fx.svc, Revalidate: ok} diff --git a/docs/content/features/addons.md b/docs/content/features/addons.md index c8ce56e482..1fc9f7cd0d 100644 --- a/docs/content/features/addons.md +++ b/docs/content/features/addons.md @@ -1108,6 +1108,15 @@ and the confirmation of an administrator in their own browser session, like every change of what an add-on may do on the host. `--target` and `--api-key` come from `LOCALAI_TARGET` and `LOCALAI_API_KEY` when you leave them out. +### When sign-in is off or the grants are locked + +An unsigned file installs only where UI host grants work. While sign-in is off, +and when a deployment locks the UI grants, the owner refuses to stage a file +(`403 locked_by_deployment`) and the dialog says so. Turn the UI grants on +knowingly with `--addon-host-ui-grants-without-auth`, or turn sign-in on. A +package from a file replaces a package from another library or signer only with +the approval of the dialog, like any package from another source. + ### What the server does with the file The routes are administrator-only. `POST /api/addons/files` takes the zip as a