@@ -35,7 +35,7 @@ export default function HostAccessList({ ops, ticked, onTick, added = [], testId
reason={note.reason}
meta={[op.risk ? t(`hostAccess.risk.${op.risk}`) : '', isNew ? t('hostAccess.op.new') : ''].filter(Boolean).join(' · ') || undefined}
checked={on}
- disabled={!tickable(op) || op.required}
+ disabled={locked || !tickable(op) || op.required}
onChange={(next) => onTick(op.name, next)}
stacked
testId={`${testId}-op`}
diff --git a/core/http/react-ui/src/components/addons/HostAccessView.jsx b/core/http/react-ui/src/components/addons/HostAccessView.jsx
index d37e21e7c7..1c1a9e82fb 100644
--- a/core/http/react-ui/src/components/addons/HostAccessView.jsx
+++ b/core/http/react-ui/src/components/addons/HostAccessView.jsx
@@ -69,7 +69,7 @@ export default function HostAccessView({ grants, api = hostGrantsApi }) {
{t('hostAccess.intro')}
{grants.stale &&
{t('apps.stale')}}
- {locked &&
{t('hostAccess.locked')}}
+ {locked &&
{t(data.lockedReason === 'no_auth' ? 'hostAccess.lockedNoAuth' : 'hostAccess.locked')}}
{notice &&
{notice.text}}
{pending.map(a =>
setApproving(a)} />)}
diff --git a/core/http/react-ui/src/components/addons/InstallDialog.jsx b/core/http/react-ui/src/components/addons/InstallDialog.jsx
index d8e574a42e..ce2a80c61b 100644
--- a/core/http/react-ui/src/components/addons/InstallDialog.jsx
+++ b/core/http/react-ui/src/components/addons/InstallDialog.jsx
@@ -122,7 +122,8 @@ export default function InstallDialog({ entry, flow, actions, onClose, installed
{host.preview.official === false && (
{t('hostAccess.notOfficial', { library: entry.sourceId })}
)}
-
+
+ {host.preview.locked && {t(host.preview.lockedReason === 'no_auth' ? 'hostAccess.lockedNoAuth' : 'hostAccess.locked')}}
{block && (
{t(block.kind === 'blocked' ? 'hostAccess.cannotInstallBlocked' : 'hostAccess.cannotInstallUnsupported', { ops: block.ops.join(', ') })}
diff --git a/core/http/react-ui/src/components/addons/hostGrantsState.js b/core/http/react-ui/src/components/addons/hostGrantsState.js
index 6a64572565..7b9fee530c 100644
--- a/core/http/react-ui/src/components/addons/hostGrantsState.js
+++ b/core/http/react-ui/src/components/addons/hostGrantsState.js
@@ -79,6 +79,9 @@ export function normalizePreview(payload) {
revision: Number(p.revision) || 0,
nonce: typeof p.nonce === 'string' ? p.nonce : '',
official: p.official === true ? true : (p.official === false ? false : null),
+ // The owner keeps UI grants locked: the dialog shows what the add-on asks for and grants nothing.
+ locked: p.locked === true,
+ lockedReason: p.lockedReason === 'no_auth' ? 'no_auth' : 'deployment',
// Operations that are new in this version. Empty on an install.
added: list(p.added),
requested,
@@ -103,6 +106,7 @@ export function tickable(op) {
// before an uninstall (the owner sends it as a hint).
export function initialTicks(preview) {
const out = []
+ if (preview.locked) return out
for (const op of preview.ops) {
if (!tickable(op)) continue
if (op.required || op.hint) out.push(op.name)
@@ -114,6 +118,7 @@ export function initialTicks(preview) {
// can still be granted, so a required operation can never go missing from the
// request because of a stale tick list.
export function approvedOps(preview, ticked) {
+ if (preview.locked) return []
const set = new Set(ticked)
for (const op of preview.ops) if (tickable(op) && op.required) set.add(op.name)
return preview.ops.filter(op => tickable(op) && set.has(op.name)).map(op => op.name)
@@ -201,6 +206,7 @@ export function normalizeOverview(payload) {
return {
revision: Number(p.revision) || 0,
locked: p.locked === true,
+ lockedReason: p.lockedReason === 'no_auth' ? 'no_auth' : 'deployment',
blanket: {
mode,
includeOptional: b.includeOptional === true,
diff --git a/core/http/react-ui/tests/unit/hostgrants.test.mjs b/core/http/react-ui/tests/unit/hostgrants.test.mjs
index 9ac920b153..208256ea0d 100644
--- a/core/http/react-ui/tests/unit/hostgrants.test.mjs
+++ b/core/http/react-ui/tests/unit/hostgrants.test.mjs
@@ -199,3 +199,13 @@ test('hostgrants: install with an approval goes through the host-grants route, a
assert.ok(calls.includes('plain:install'))
assert.ok(!calls.some(c => c.startsWith('grants:')))
})
+
+test('hostgrants: a locked preview ticks nothing and approves no operation', () => {
+ const p = normalizePreview({ ...PREVIEW, locked: true, lockedReason: 'no_auth' })
+ assert.equal(p.locked, true)
+ assert.equal(p.lockedReason, 'no_auth')
+ assert.deepEqual(initialTicks(p), [])
+ assert.deepEqual(approvedOps(p, ['egress.check']), [])
+ assert.equal(normalizeOverview({ locked: true, lockedReason: 'no_auth' }).lockedReason, 'no_auth')
+ assert.equal(normalizePreview(PREVIEW).locked, false)
+})