feat: Add pluggable secret providers (1Password, Infisical, HashiCorp Vault) (#1360)

* Add pluggable secret provider foundation

Introduces a provider-agnostic secret backend abstraction so stacks can
pull deploy-time secrets from 1Password, Infisical or HashiCorp Vault.

Providers implement the SecretProvider contract in secretproviders/shared.ts
and advertise which of the two resolution modes they support:

  - reference interpolation: a variable's value is an inline reference in
    the backend's own syntax (e.g. 1Password's op://vault/item/field)
  - bulk pull: every secret under a provider-defined selector, fetched as
    a flat key/value map

Adding a backend means dropping a file in secretproviders/ and registering
it in the index; no caller changes.

Four providers ship here: 1Password service account (references + bulk),
1Password Connect (references), Infisical (bulk) and HashiCorp Vault KV v2
(bulk). Provider config is persisted as an encrypted JSON blob in the new
secret_providers table, mirroring the existing notification_settings
type+config pattern, and stack_sources gains a nullable secret_provider_id.

Decrypted tokens stay in the provider modules for the duration of a call
and are never written to disk or returned to the client.

Co-authored-by: GooRoo <sergey.olendarenko@gmail.com>

* Add secret provider API routes and permissions

CRUD plus two test-connection endpoints under /api/secret-providers. The
unsaved variant validates a config posted from the provider form; the
stored variant tests a persisted provider by id.

Responses only ever carry provider summaries (id, type, name, timestamps).
The decrypted config never leaves the server.

Adds a "secrets" permission resource with view/create/edit/delete actions,
wired through the permission type, the role editor and the seeded roles,
and a secret_provider audit entity type so provider changes are logged.
Config rotations are audited as a boolean rather than a value.

* Resolve provider secrets at stack deploy time

Stacks can bind a secret provider; when one is bound, its secrets are
resolved and merged into the vars handed to docker compose.

Bulk pull is triggered by a selector variable: OP_ENVIRONMENT_ID, kept for
compatibility with the original 1Password integration, or the generic
DOCKHAND_SECRET_SELECTOR for any bulk-capable provider. The selector is
consumed by the provider and stripped before the vars reach the stack.
Values the bound provider recognises as inline references are resolved in
place, and references found only in the stack's .env file are promoted into
the secret set so they are never written back as literals.

Resolution is applied on deploy, on up, on recreate and on service update.
Explicitly configured secrets always win over bulk-pulled ones. A missing
or unsupported provider warns and leaves values untouched rather than
failing the deploy; a provider that errors mid-resolution fails it.

* Add secret provider settings UI and stack binding

A Secrets tab under settings lists configured providers and drives the
create/edit modal, which switches its fields on the selected provider type
and can test a connection before saving.

Both stack modals gain a provider selector so a stack can be bound to a
provider or left unbound. When a provider is bound, the bulk selector
variables are no longer reported as unused compose variables, since they
are consumed by the provider rather than the compose file.

---------

Co-authored-by: GooRoo <sergey.olendarenko@gmail.com>
Co-authored-by: Jarek Krochmalski <jotka@users.noreply.github.com>
This commit is contained in:
authored and GitHub committed 2026-08-13 10:08:02 +02:00
1 parent 905c4a004d
commit 1ad36a83fb
39 files changed
+3094 -31

No files matched your search

+72
View File
@@ -154,6 +154,11 @@
let copiedWebhookUrl = $state<'ok' | 'error' | null>(null);
let copiedWebhookSecret = $state<'ok' | 'error' | null>(null);
// Secret providers
type SecretProviderOption = { id: number; name: string };
let secretProviders = $state<SecretProviderOption[]>([]);
let formSecretProviderId = $state<number | null>(null);
// Environment variables state
let formEnvFilePath = $state<string | null>(null);
let envFiles = $state<string[]>([]);
@@ -205,8 +210,21 @@
// Add global mouse event listeners for split dragging
window.addEventListener('mousemove', handleMouseMove);
window.addEventListener('mouseup', handleMouseUp);
fetchSecretProviders();
});
async function fetchSecretProviders() {
try {
const response = await fetch('/api/secret-providers');
if (!response.ok) return;
const data = await response.json();
secretProviders = (data ?? []).map((p: any) => ({ id: p.id, name: p.name }));
} catch (e) {
console.warn('Failed to load secret providers:', e);
}
}
onDestroy(() => {
window.removeEventListener('mousemove', handleMouseMove);
window.removeEventListener('mouseup', handleMouseUp);
@@ -426,6 +444,10 @@
formRepullImages = gitStack.repullImages ?? false;
formForceRedeploy = gitStack.forceRedeploy ?? false;
formDeployNow = false;
formSecretProviderId = null;
// Load secret provider binding
loadSecretProviderBindingForStack(gitStack.stackName);
// Load env files and overrides SYNCHRONOUSLY to avoid race conditions
// Wait for all loads to complete before allowing any other effect to run
@@ -455,6 +477,20 @@
formRepullImages = false;
formForceRedeploy = false;
formDeployNow = false;
formSecretProviderId = null;
}
}
async function loadSecretProviderBindingForStack(stackName: string) {
try {
const url = environmentId ? `/api/stacks/sources?env=${environmentId}` : '/api/stacks/sources';
const response = await fetch(url);
if (!response.ok) return;
const sourceMap = await response.json();
const source = sourceMap?.[stackName];
formSecretProviderId = source?.secretProviderId ?? null;
} catch (e) {
console.warn('Failed to load secret provider binding for git stack:', e);
}
}
@@ -540,6 +576,7 @@
repullImages: formRepullImages,
forceRedeploy: formForceRedeploy,
deployNow: deployAfterSave,
secretProviderId: formSecretProviderId,
envVars: overrideVars.map(v => ({
key: v.key.trim(),
value: v.value,
@@ -1151,6 +1188,41 @@
<!-- Right column: Environment Variables -->
<div class="flex-1 min-w-0 flex flex-col overflow-hidden bg-zinc-50 dark:bg-zinc-800/50">
<!-- Secret provider selector -->
<div class="px-3 py-2 border-b border-zinc-200 dark:border-zinc-700 bg-zinc-100/60 dark:bg-zinc-800/60 flex items-center gap-2 text-xs">
<Label for="secret-provider-select-git" class="text-xs text-muted-foreground shrink-0">Secret provider</Label>
<Select.Root
type="single"
value={formSecretProviderId !== null ? String(formSecretProviderId) : ''}
onValueChange={(v) => { formSecretProviderId = v ? parseInt(v) : null; }}
>
<Select.Trigger id="secret-provider-select-git" class="h-7 text-xs">
{#if formSecretProviderId !== null}
{secretProviders.find((p) => p.id === formSecretProviderId)?.name ?? 'Unknown provider'}
{:else}
<span class="text-muted-foreground">None — disabled</span>
{/if}
</Select.Trigger>
<Select.Content>
<Select.Item value="" label="None">
<span class="text-muted-foreground">None — disabled</span>
</Select.Item>
{#each secretProviders as provider (provider.id)}
<Select.Item value={String(provider.id)} label={provider.name}>
{provider.name}
</Select.Item>
{/each}
</Select.Content>
</Select.Root>
<Tooltip.Root>
<Tooltip.Trigger>
<HelpCircle class="w-3.5 h-3.5 text-muted-foreground shrink-0" />
</Tooltip.Trigger>
<Tooltip.Content class="max-w-xs text-xs">
Inline references (e.g. <code>op://</code> for 1Password) are still resolved. For bulk pull, set <code>OP_ENVIRONMENT_ID</code> (1Password Environment) or the generic <code>DOCKHAND_SECRET_SELECTOR</code> in env vars; the provider's secrets are loaded and injected.
</Tooltip.Content>
</Tooltip.Root>
</div>
<StackEnvVarsPanel
bind:variables={envVars}
placeholder={{ key: 'MY_VAR', value: 'value' }}
+90 -2
View File
@@ -7,7 +7,7 @@
import CodeEditor, { type VariableMarker } from '$lib/components/CodeEditor.svelte';
import StackEnvVarsPanel from '$lib/components/StackEnvVarsPanel.svelte';
import { type EnvVar, type ValidationResult } from '$lib/components/StackEnvVarsEditor.svelte';
import { Layers, Save, Play, Code, GitGraph, GitBranch, GitCommitHorizontal, Github, Loader2, AlertCircle, X, Sun, Moon, TriangleAlert, GripVertical, FolderOpen, Copy, Check, XCircle, MapPin, ArrowRight, ArrowDown, Info, Box, FolderSync, Archive } from 'lucide-svelte';
import { Layers, Save, Play, Code, GitGraph, GitBranch, GitCommitHorizontal, Github, Loader2, AlertCircle, X, Sun, Moon, TriangleAlert, GripVertical, FolderOpen, Copy, Check, XCircle, MapPin, ArrowRight, ArrowDown, Info, Box, FolderSync, HelpCircle, Archive } from 'lucide-svelte';
import BackupPanel from '../containers/BackupPanel.svelte';
import { volumesForStack, type VolumeInfo } from '$lib/utils/mounts';
import { fetchBackupExecutions } from '$lib/utils/backup';
@@ -70,11 +70,30 @@
// Ref to the embedded backup panel so close can check its inline form for unsaved edits.
let backupPanelRef = $state<BackupPanel | undefined>(undefined);
// Secret providers
type SecretProviderOption = { id: number; name: string };
let secretProviders = $state<SecretProviderOption[]>([]);
let formSecretProviderId = $state<number | null>(null);
// Environment variables state
let envVars = $state<EnvVar[]>([]);
let rawEnvContent = $state(''); // Raw .env file content (comments preserved)
let envValidation = $state<ValidationResult | null>(null);
let validating = $state(false);
// The bulk-pull selector vars (OP_ENVIRONMENT_ID for 1Password, the generic
// DOCKHAND_SECRET_SELECTOR for other providers) are consumed by the secret
// provider, not the compose file, so they only count as "used" when a provider
// is bound to the stack.
const SELECTOR_VARS = ['OP_ENVIRONMENT_ID', 'DOCKHAND_SECRET_SELECTOR'];
const effectiveValidation = $derived.by<ValidationResult | null>(() => {
if (!envValidation || formSecretProviderId === null) return envValidation;
if (!envValidation.unused.some((v) => SELECTOR_VARS.includes(v))) return envValidation;
return {
...envValidation,
unused: envValidation.unused.filter((v) => !SELECTOR_VARS.includes(v))
};
});
let existingSecretKeys = $state<Set<string>>(new Set());
let hadExistingDbVars = $state(false); // Track if DB had any vars on load (for proper cleanup)
@@ -694,8 +713,21 @@
// Add global mouse event listeners for split dragging
window.addEventListener('mousemove', handleMouseMove);
window.addEventListener('mouseup', handleMouseUp);
fetchSecretProviders();
});
async function fetchSecretProviders() {
try {
const response = await fetch('/api/secret-providers');
if (!response.ok) return;
const data = await response.json();
secretProviders = (data ?? []).map((p: any) => ({ id: p.id, name: p.name }));
} catch (e) {
console.warn('Failed to load secret providers:', e);
}
}
onDestroy(() => {
window.removeEventListener('mousemove', handleMouseMove);
window.removeEventListener('mouseup', handleMouseUp);
@@ -811,6 +843,18 @@
originalComposePath = data.composePath || null;
originalEnvPath = data.envPath || null;
// Load secret provider binding
try {
const sourcesRes = await fetch(appendEnvParam('/api/stacks/sources', envId));
if (sourcesRes.ok) {
const sourceMap = await sourcesRes.json();
const source = sourceMap?.[stackName];
formSecretProviderId = source?.secretProviderId ?? null;
}
} catch (e) {
console.warn('Failed to load stack source for secret provider binding:', e);
}
// Volumes/binds for the backup picker (managed/internal stack path).
try {
await loadStackVolumes(envId);
@@ -968,6 +1012,8 @@
requestBody.envPath = envPathToSave;
}
requestBody.secretProviderId = formSecretProviderId;
// Create the stack
response = await fetch(appendEnvParam('/api/stacks', envId), {
method: 'POST',
@@ -1099,6 +1145,8 @@
requestBody.moveFromDir = moveFromDir;
}
requestBody.secretProviderId = formSecretProviderId;
// Save env files BEFORE compose to ensure deploy reads fresh values
// Save raw content to .env file (non-secrets only, comments preserved)
const rawEnvResponse = await fetch(
@@ -1710,11 +1758,51 @@
</div>
<!-- Environment variables panel -->
<div class="flex-1 min-w-0 flex flex-col overflow-hidden bg-zinc-50 dark:bg-zinc-800/50">
<!-- Secret provider selector -->
<div class="px-3 py-2 border-b border-zinc-200 dark:border-zinc-700 bg-zinc-100/60 dark:bg-zinc-800/60 flex items-center gap-2 text-xs">
<Label for="secret-provider-select" class="text-xs text-muted-foreground shrink-0">Secret provider</Label>
<Select.Root
type="single"
value={formSecretProviderId !== null ? String(formSecretProviderId) : ''}
onValueChange={(v) => {
formSecretProviderId = v ? parseInt(v) : null;
markDirty();
}}
>
<Select.Trigger id="secret-provider-select" class="h-7 text-xs">
{#if formSecretProviderId !== null}
{secretProviders.find((p) => p.id === formSecretProviderId)?.name ?? 'Unknown provider'}
{:else}
<span class="text-muted-foreground">None — disabled</span>
{/if}
</Select.Trigger>
<Select.Content>
<Select.Item value="" label="None">
<span class="text-muted-foreground">None — disabled</span>
</Select.Item>
{#each secretProviders as provider (provider.id)}
<Select.Item value={String(provider.id)} label={provider.name}>
{provider.name}
</Select.Item>
{/each}
</Select.Content>
</Select.Root>
<Tooltip.Provider delayDuration={150}>
<Tooltip.Root>
<Tooltip.Trigger>
<HelpCircle class="w-3.5 h-3.5 text-muted-foreground shrink-0" />
</Tooltip.Trigger>
<Tooltip.Content class="max-w-xs text-xs">
Inline references (e.g. <code>op://</code> for 1Password) are still resolved. For bulk pull, set <code>OP_ENVIRONMENT_ID</code> (1Password Environment) or the generic <code>DOCKHAND_SECRET_SELECTOR</code> in env vars; the provider's secrets are loaded and injected.
</Tooltip.Content>
</Tooltip.Root>
</Tooltip.Provider>
</div>
<StackEnvVarsPanel
bind:this={envVarsPanelRef}
bind:variables={envVars}
bind:rawContent={rawEnvContent}
validation={envValidation}
validation={effectiveValidation}
existingSecretKeys={mode === 'edit' ? existingSecretKeys : new Set()}
{readonly}
onchange={() => { markDirty(); debouncedValidate(); }}