Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: allow Viewer role to browse Swarm resources (#3779)
Kyle Mendell3f205dea94fa
diff --git a/backend/pkg/authz/access_policy.go b/backend/pkg/authz/access_policy.goindex f678a4d21..59d3fe557 100644--- a/backend/pkg/authz/access_policy.go+++ b/backend/pkg/authz/access_policy.go@@ -79,16 +79,16 @@ var accessSurfacesInternal = []AccessSurface{routeSurfaceInternal("route.volumes", "/volumes", "Volumes", AccessScopeModeSelectedEnvPlusGlobal, []string{PermVolumesList, PermVolumesRead}, 60),routeSurfaceInternal("route.volumes.detail", "/volumes/{volumeName}", "Volume", AccessScopeModeSelectedEnvPlusGlobal, []string{PermVolumesList, PermVolumesRead}, 0),routeSurfaceInternal("route.swarm", "/swarm", "Swarm", AccessScopeModeSelectedEnvPlusGlobal, []string{PermSwarmRead}, 0),- routeSurfaceInternal("route.swarm.services", "/swarm/services", "Services", AccessScopeModeSelectedEnvPlusGlobal, []string{PermSwarmServices}, 80),- routeSurfaceInternal("route.swarm.services.detail", "/swarm/services/{serviceId}", "Service", AccessScopeModeSelectedEnvPlusGlobal, []string{PermSwarmServices}, 0),- routeSurfaceInternal("route.swarm.nodes", "/swarm/nodes", "Nodes", AccessScopeModeSelectedEnvPlusGlobal, []string{PermSwarmNodes}, 0),+ routeSurfaceInternal("route.swarm.services", "/swarm/services", "Services", AccessScopeModeSelectedEnvPlusGlobal, []string{PermSwarmRead}, 80),+ routeSurfaceInternal("route.swarm.services.detail", "/swarm/services/{serviceId}", "Service", AccessScopeModeSelectedEnvPlusGlobal, []string{PermSwarmRead}, 0),+ routeSurfaceInternal("route.swarm.nodes", "/swarm/nodes", "Nodes", AccessScopeModeSelectedEnvPlusGlobal, []string{PermSwarmRead}, 0),routeSurfaceInternal("route.swarm.tasks", "/swarm/tasks", "Tasks", AccessScopeModeSelectedEnvPlusGlobal, []string{PermSwarmRead}, 0),- routeSurfaceInternal("route.swarm.stacks", "/swarm/stacks", "Stacks", AccessScopeModeSelectedEnvPlusGlobal, []string{PermSwarmStacks}, 90),+ routeSurfaceInternal("route.swarm.stacks", "/swarm/stacks", "Stacks", AccessScopeModeSelectedEnvPlusGlobal, []string{PermSwarmRead}, 90),routeSurfaceInternal("route.swarm.stacks.new", "/swarm/stacks/new", "Create stack", AccessScopeModeSelectedEnvPlusGlobal, []string{PermSwarmStacks}, 0),- routeSurfaceInternal("route.swarm.stacks.detail", "/swarm/stacks/{name}", "Stack", AccessScopeModeSelectedEnvPlusGlobal, []string{PermSwarmStacks}, 0),+ routeSurfaceInternal("route.swarm.stacks.detail", "/swarm/stacks/{name}", "Stack", AccessScopeModeSelectedEnvPlusGlobal, []string{PermSwarmRead}, 0),routeSurfaceInternal("route.swarm.cluster", "/swarm/cluster", "Cluster", AccessScopeModeSelectedEnvPlusGlobal, []string{PermSwarmRead}, 100),- routeSurfaceInternal("route.swarm.configs", "/swarm/configs", "Configs", AccessScopeModeSelectedEnvPlusGlobal, []string{PermSwarmConfigs}, 0),- routeSurfaceInternal("route.swarm.secrets", "/swarm/secrets", "Secrets", AccessScopeModeSelectedEnvPlusGlobal, []string{PermSwarmSecrets}, 0),+ routeSurfaceInternal("route.swarm.configs", "/swarm/configs", "Configs", AccessScopeModeSelectedEnvPlusGlobal, []string{PermSwarmRead}, 0),+ routeSurfaceInternal("route.swarm.secrets", "/swarm/secrets", "Secrets", AccessScopeModeSelectedEnvPlusGlobal, []string{PermSwarmRead}, 0),routeSurfaceInternal("route.events", "/events", "Events", AccessScopeModeGlobalOnly, []string{PermEventsRead}, 110),routeSurfaceInternal("route.activities", "", "Activities", AccessScopeModeAnyEffectiveScope, []string{PermActivitiesRead}, 0),globalAdminRouteSurfaceInternal("route.oidc-role-mappings", "", "OIDC Role Mappings"),diff --git a/frontend/src/lib/components/swarm/swarm-kv-page.svelte b/frontend/src/lib/components/swarm/swarm-kv-page.svelteindex 9b7347f7d..c026d77e3 100644--- a/frontend/src/lib/components/swarm/swarm-kv-page.svelte+++ b/frontend/src/lib/components/swarm/swarm-kv-page.svelte@@ -190,26 +190,28 @@<ResourcePageLayout title={messages.pageTitle} subtitle={messages.pageSubtitle} {icon} {actionButtons} {statCards}>{#snippet mainContent()}- <div class="grid gap-4 lg:grid-cols-[1fr,1.1fr]">- <Card.Root class="pt-0">- <Card.Header>- <Card.Title>{messages.createTitle}</Card.Title>- <Card.Description>{messages.createSubtitle}</Card.Description>- </Card.Header>- <Card.Content class="space-y-3 pb-6">- <Input placeholder={messages.namePlaceholder} bind:value={createName} />- <Textarea rows={10} bind:value={createData} placeholder={messages.dataPlaceholder} class="font-mono text-xs" />- <IfPermitted perm={permission}>- <ArcaneButton- action="create"- customLabel={messages.createButton}- onclick={handleCreate}- disabled={!canManage || isLoading.create}- loading={isLoading.create}- />- </IfPermitted>- </Card.Content>- </Card.Root>+ <div class={canManage ? 'grid gap-4 lg:grid-cols-[1fr,1.1fr]' : 'grid gap-4'}>+ {#if canManage}+ <Card.Root class="pt-0">+ <Card.Header>+ <Card.Title>{messages.createTitle}</Card.Title>+ <Card.Description>{messages.createSubtitle}</Card.Description>+ </Card.Header>+ <Card.Content class="space-y-3 pb-6">+ <Input placeholder={messages.namePlaceholder} bind:value={createName} />+ <Textarea rows={10} bind:value={createData} placeholder={messages.dataPlaceholder} class="font-mono text-xs" />+ <IfPermitted perm={permission}>+ <ArcaneButton+ action="create"+ customLabel={messages.createButton}+ onclick={handleCreate}+ disabled={isLoading.create}+ loading={isLoading.create}+ />+ </IfPermitted>+ </Card.Content>+ </Card.Root>+ {/if}<div class="space-y-4"><Card.Root class="pt-0">@@ -252,16 +254,18 @@class="font-mono text-xs"readonly/>- <div class="flex flex-wrap items-center gap-2 pt-1">- <ArcaneButton- action="remove"- customLabel={messages.deleteButton}- icon={TrashIcon}- onclick={() => handleRemove(item)}- disabled={!canManage || isLoading.delete}- loading={isLoading.delete}- />- </div>+ {#if canManage}+ <div class="flex flex-wrap items-center gap-2 pt-1">+ <ArcaneButton+ action="remove"+ customLabel={messages.deleteButton}+ icon={TrashIcon}+ onclick={() => handleRemove(item)}+ disabled={isLoading.delete}+ loading={isLoading.delete}+ />+ </div>+ {/if}</div>{/if}</Card.Root>diff --git a/frontend/src/routes/(app)/swarm/nodes/nodes-table.svelte b/frontend/src/routes/(app)/swarm/nodes/nodes-table.svelteindex b233f3509..18359c4b0 100644--- a/frontend/src/routes/(app)/swarm/nodes/nodes-table.svelte+++ b/frontend/src/routes/(app)/swarm/nodes/nodes-table.svelte@@ -432,34 +432,30 @@<InspectIcon class="size-4" />{m.common_inspect()}</DropdownMenu.Item>- <DropdownMenu.Item onclick={() => openAgentDialog(item)} disabled={!canManageNodes}>- <EdgeConnectionIcon class="size-4" />- {getSwarmNodeAgentActionLabel(item.agent?.state)}- </DropdownMenu.Item>- <DropdownMenu.Separator />- <DropdownMenu.Item onclick={() => promoteNode(item)} disabled={!canManageNodes || isLoading || item.role === 'manager'}>- {m.swarm_node_promote()}- </DropdownMenu.Item>- <DropdownMenu.Item onclick={() => demoteNode(item)} disabled={!canManageNodes || isLoading || item.role !== 'manager'}>- {m.swarm_node_demote()}- </DropdownMenu.Item>- <DropdownMenu.Item- onclick={() => setAvailability(item, 'drain')}- disabled={!canManageNodes || isLoading || item.availability === 'drain'}- >- {m.drain()}- </DropdownMenu.Item>- <DropdownMenu.Item- onclick={() => setAvailability(item, 'active')}- disabled={!canManageNodes || isLoading || item.availability === 'active'}- >- {m.swarm_node_activate()}- </DropdownMenu.Item>- <DropdownMenu.Separator />- <DropdownMenu.Item variant="destructive" onclick={() => removeNode(item)} disabled={!canManageNodes || isLoading}>- <TrashIcon class="size-4" />- {m.common_delete()}- </DropdownMenu.Item>+ {#if canManageNodes}+ <DropdownMenu.Item onclick={() => openAgentDialog(item)}>+ <EdgeConnectionIcon class="size-4" />+ {getSwarmNodeAgentActionLabel(item.agent?.state)}+ </DropdownMenu.Item>+ <DropdownMenu.Separator />+ <DropdownMenu.Item onclick={() => promoteNode(item)} disabled={isLoading || item.role === 'manager'}>+ {m.swarm_node_promote()}+ </DropdownMenu.Item>+ <DropdownMenu.Item onclick={() => demoteNode(item)} disabled={isLoading || item.role !== 'manager'}>+ {m.swarm_node_demote()}+ </DropdownMenu.Item>+ <DropdownMenu.Item onclick={() => setAvailability(item, 'drain')} disabled={isLoading || item.availability === 'drain'}>+ {m.drain()}+ </DropdownMenu.Item>+ <DropdownMenu.Item onclick={() => setAvailability(item, 'active')} disabled={isLoading || item.availability === 'active'}>+ {m.swarm_node_activate()}+ </DropdownMenu.Item>+ <DropdownMenu.Separator />+ <DropdownMenu.Item variant="destructive" onclick={() => removeNode(item)} disabled={isLoading}>+ <TrashIcon class="size-4" />+ {m.common_delete()}+ </DropdownMenu.Item>+ {/if}</RowActionsMenu>{/snippet}diff --git a/frontend/src/routes/(app)/swarm/services/[serviceId]/+page.svelte b/frontend/src/routes/(app)/swarm/services/[serviceId]/+page.svelteindex 382f265cc..5366847b1 100644--- a/frontend/src/routes/(app)/swarm/services/[serviceId]/+page.svelte+++ b/frontend/src/routes/(app)/swarm/services/[serviceId]/+page.svelte@@ -92,7 +92,7 @@const serviceImage = $derived(containerSpec?.Image || '');const serviceMode = $derived(getSwarmServiceModeFromSpec(spec?.Mode));- const canScaleService = $derived(isSwarmServiceModeScalable(serviceMode));+ const showsReplicas = $derived(isSwarmServiceModeScalable(serviceMode));const desiredReplicas = $derived.by(() => {if (serviceMode === 'global') return 0;@@ -171,6 +171,8 @@const hasMounts = $derived(mounts.length > 0);const envId = $derived(environmentStore.selected?.id || '0');+ const canManageServices = $derived(hasPermission('swarm:services', envId));+ const canScaleService = $derived(canManageServices && showsReplicas);const canViewServiceLogs = $derived(hasPermission('swarm:services:logs', envId));const tabItems = $derived<TabItem[]>([@@ -298,7 +300,7 @@{serviceName}</h1><Badge variant={getSwarmServiceModeVariant(serviceMode)} minWidth="20">{getSwarmServiceModeLabel(serviceMode)}</Badge>- {#if canScaleService}+ {#if showsReplicas}<span class="font-mono text-sm text-muted-foreground">{desiredReplicas}{m.swarm_replicas()}@@ -308,36 +310,38 @@{/snippet}{#snippet headerActions()}- <div class="flex items-center gap-2">- {#if canScaleService}- <div class="flex items-center gap-2">- <Input- type="number"- min="0"- step="1"- value={scaleReplicas}- oninput={onScaleReplicasInput}- class="h-8 w-20"- disabled={isLoading.scale}- />- <ArcaneButton action="base" tone="outline" size="sm" onclick={handleScale} disabled={isLoading.scale}>- {m.swarm_service_scale()}- </ArcaneButton>- </div>- {/if}- <ArcaneButton action="base" tone="outline" size="sm" onclick={openEdit} disabled={isLoading.update}>- <EditIcon class="size-4" />- <span class="hidden sm:inline">{m.common_edit()}</span>- </ArcaneButton>- <ArcaneButton action="base" tone="outline" size="sm" onclick={handleRollback} disabled={isLoading.rollback}>- <RedeployIcon class="size-4" />- <span class="hidden sm:inline">{m.swarm_service_rollback()}</span>- </ArcaneButton>- <ArcaneButton action="base" tone="outline-destructive" size="sm" onclick={handleDelete} disabled={isLoading.remove}>- <TrashIcon class="size-4" />- <span class="hidden sm:inline">{m.common_delete()}</span>- </ArcaneButton>- </div>+ {#if canManageServices}+ <div class="flex items-center gap-2">+ {#if canScaleService}+ <div class="flex items-center gap-2">+ <Input+ type="number"+ min="0"+ step="1"+ value={scaleReplicas}+ oninput={onScaleReplicasInput}+ class="h-8 w-20"+ disabled={isLoading.scale}+ />+ <ArcaneButton action="base" tone="outline" size="sm" onclick={handleScale} disabled={isLoading.scale}>+ {m.swarm_service_scale()}+ </ArcaneButton>+ </div>+ {/if}+ <ArcaneButton action="base" tone="outline" size="sm" onclick={openEdit} disabled={isLoading.update}>+ <EditIcon class="size-4" />+ <span class="hidden sm:inline">{m.common_edit()}</span>+ </ArcaneButton>+ <ArcaneButton action="base" tone="outline" size="sm" onclick={handleRollback} disabled={isLoading.rollback}>+ <RedeployIcon class="size-4" />+ <span class="hidden sm:inline">{m.swarm_service_rollback()}</span>+ </ArcaneButton>+ <ArcaneButton action="base" tone="outline-destructive" size="sm" onclick={handleDelete} disabled={isLoading.remove}>+ <TrashIcon class="size-4" />+ <span class="hidden sm:inline">{m.common_delete()}</span>+ </ArcaneButton>+ </div>+ {/if}{/snippet}{#snippet tabContent(_activeTab)}diff --git a/frontend/src/routes/(app)/swarm/stacks/[name]/+page.svelte b/frontend/src/routes/(app)/swarm/stacks/[name]/+page.svelteindex 661eaf7a9..bb0cffaec 100644--- a/frontend/src/routes/(app)/swarm/stacks/[name]/+page.svelte+++ b/frontend/src/routes/(app)/swarm/stacks/[name]/+page.svelte@@ -22,6 +22,8 @@import SwarmTasksTable from '../../tasks/tasks-table.svelte';import type { SwarmStackSource } from '#lib/types/swarm';import { useUrlTab } from '#lib/hooks/use-url-tab.svelte';+ import { hasPermission } from '#lib/utils/auth';+ import { environmentStore } from '#lib/stores/environment.store.svelte';let { data } = $props();@@ -74,7 +76,9 @@const stackName = $derived(stack?.name ?? data.stackName);const hasLiveStack = $derived((stack?.services ?? 0) > 0);- const canViewSource = $derived(sourceState !== 'forbidden');+ const currentEnvId = $derived(environmentStore.selected?.id || '0');+ const canManageStacks = $derived(hasPermission('swarm:stacks', currentEnvId));+ const canViewSource = $derived(canManageStacks && sourceState !== 'forbidden');const tabItems = $derived<TabItem[]>([...(hasLiveStack ? [{ value: 'services', label: m.services(), icon: DockIcon }] : []),...(hasLiveStack ? [{ value: 'tasks', label: m.tasks(), icon: JobsIcon }] : []),@@ -102,6 +106,11 @@}async function refreshSource(showErrorToast = false) {+ if (!canManageStacks) {+ source = null;+ sourceState = 'forbidden';+ return;+ }try {source = await swarmService.getStackSource(stackName);sourceState = 'available';@@ -151,7 +160,9 @@} else {toast.error(m.common_refresh_failed({ resource: `${m.tasks()} (${stackName})` }));}- await refreshSource(true);+ if (canManageStacks) {+ await refreshSource(true);+ }} finally {isLoading.refresh = false;}@@ -160,7 +171,9 @@useEnvironmentRefresh(refresh);onMount(() => {- void refreshSource();+ if (canManageStacks) {+ void refreshSource();+ }});function handleDelete() {@@ -186,23 +199,27 @@}const actionButtons: ActionButton[] = $derived([- {- id: 'edit',- action: 'base',- label: m.common_edit(),- icon: EditIcon,- onclick: () => goto(`/swarm/stacks/new?fromStack=${encodeURIComponent(stackName)}`),- disabled: isLoading.remove- },- {- id: 'remove',- action: 'remove',- label: m.common_delete(),- icon: TrashIcon,- onclick: handleDelete,- loading: isLoading.remove,- disabled: isLoading.remove- },+ ...(canManageStacks+ ? [+ {+ id: 'edit',+ action: 'base' as const,+ label: m.common_edit(),+ icon: EditIcon,+ onclick: () => goto(`/swarm/stacks/new?fromStack=${encodeURIComponent(stackName)}`),+ disabled: isLoading.remove+ },+ {+ id: 'remove',+ action: 'remove' as const,+ label: m.common_delete(),+ icon: TrashIcon,+ onclick: handleDelete,+ loading: isLoading.remove,+ disabled: isLoading.remove+ }+ ]+ : []),{id: 'refresh',action: 'restart',