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

+10 -1
View File
@@ -62,6 +62,14 @@ export const POST: RequestHandler = async (event) => {
return json({ error: 'Stack name must be lowercase, start with a letter or number, and contain only letters, numbers, hyphens, and underscores' }, { status: 400 });
}
if (
'secretProviderId' in data &&
data.secretProviderId !== null &&
typeof data.secretProviderId !== 'number'
) {
return json({ error: 'secretProviderId must be a number or null' }, { status: 400 });
}
// Check for name conflicts with existing stacks (regular/external/git)
const existing = await getStackSource(trimmedStackName, data.environmentId || null);
if (existing) {
@@ -139,7 +147,8 @@ export const POST: RequestHandler = async (event) => {
environmentId: data.environmentId || null,
sourceType: 'git',
gitRepositoryId: repositoryId,
gitStackId: gitStack.id
gitStackId: gitStack.id,
secretProviderId: data.secretProviderId ?? null
});
// Register schedule with croner if auto-update is enabled
+16 -1
View File
@@ -1,6 +1,6 @@
import { json } from '@sveltejs/kit';
import type { RequestHandler } from './$types';
import { getGitStack, updateGitStack, deleteGitStack, deleteStackSource, updateStackSourceName, updateStackEnvVarsName, setStackEnvVars, getStackEnvVars, deleteStackEnvVars } from '$lib/server/db';
import { getGitStack, updateGitStack, deleteGitStack, deleteStackSource, updateStackSourceName, updateStackEnvVarsName, setStackEnvVars, getStackEnvVars, deleteStackEnvVars, updateStackSource } from '$lib/server/db';
import { deleteGitStackFiles, deployGitStack } from '$lib/server/git';
import { authorize } from '$lib/server/authorize';
import { registerSchedule, unregisterSchedule } from '$lib/server/scheduler';
@@ -51,6 +51,14 @@ export const PUT: RequestHandler = async (event) => {
const data = await request.json();
if (
'secretProviderId' in data &&
data.secretProviderId !== null &&
typeof data.secretProviderId !== 'number'
) {
return json({ error: 'secretProviderId must be a number or null' }, { status: 400 });
}
// Validate stack name if it's being changed
if (data.stackName !== undefined) {
const trimmedStackName = data.stackName.trim();
@@ -94,6 +102,13 @@ export const PUT: RequestHandler = async (event) => {
await updateStackEnvVarsName(oldStackName, data.stackName, existing.environmentId);
}
// Update secret provider binding
if ('secretProviderId' in data) {
await updateStackSource(updated.stackName, existing.environmentId, {
secretProviderId: data.secretProviderId ?? null
});
}
// Register or unregister schedule with croner
if (updated.autoUpdate && updated.autoUpdateCron) {
await registerSchedule(id, 'git_stack_sync', updated.environmentId);
@@ -0,0 +1,58 @@
import { json } from '@sveltejs/kit';
import type { RequestHandler } from './$types';
import { getSecretProviders, createSecretProvider } from '$lib/server/db';
import { hasProvider } from '$lib/server/secretproviders';
import { authorize } from '$lib/server/authorize';
import { auditSecretProvider } from '$lib/server/audit';
export const GET: RequestHandler = async ({ cookies }) => {
const auth = await authorize(cookies);
if (auth.authEnabled && !(await auth.can('secrets', 'view'))) {
return json({ error: 'Permission denied' }, { status: 403 });
}
try {
// Summaries never include the decrypted config.
const providers = await getSecretProviders();
return json(providers);
} catch (error) {
console.error('Error fetching secret providers:', error);
return json({ error: 'Failed to fetch secret providers' }, { status: 500 });
}
};
export const POST: RequestHandler = async (event) => {
const { request, cookies } = event;
const auth = await authorize(cookies);
if (auth.authEnabled && !(await auth.can('secrets', 'create'))) {
return json({ error: 'Permission denied' }, { status: 403 });
}
try {
const data = await request.json();
const name = typeof data.name === 'string' ? data.name.trim() : '';
const type = typeof data.type === 'string' ? data.type.trim() : '';
const config = data.config;
if (!name || !type) {
return json({ error: 'Name and type are required' }, { status: 400 });
}
if (!hasProvider(type)) {
return json({ error: `Unknown secret provider type: ${type}` }, { status: 400 });
}
if (!config || typeof config !== 'object' || Array.isArray(config)) {
return json({ error: 'Config is required' }, { status: 400 });
}
const provider = await createSecretProvider({ type, name, config });
await auditSecretProvider(event, 'create', provider.id, provider.name, { type });
// Never return the decrypted config.
return json(provider, { status: 201 });
} catch (error: any) {
console.error('Error creating secret provider:', error);
if (error.message?.includes('UNIQUE') || error.message?.includes('unique')) {
return json({ error: 'A secret provider with this name already exists' }, { status: 400 });
}
return json({ error: 'Failed to create secret provider' }, { status: 500 });
}
};
@@ -0,0 +1,112 @@
import { json } from '@sveltejs/kit';
import type { RequestHandler } from './$types';
import {
getSecretProviders,
getSecretProviderById,
updateSecretProvider,
deleteSecretProvider
} from '$lib/server/db';
import { hasProvider } from '$lib/server/secretproviders';
import { authorize } from '$lib/server/authorize';
import { auditSecretProvider } from '$lib/server/audit';
export const GET: RequestHandler = async ({ params, cookies }) => {
const auth = await authorize(cookies);
if (auth.authEnabled && !(await auth.can('secrets', 'view'))) {
return json({ error: 'Permission denied' }, { status: 403 });
}
const id = Number.parseInt(params.id);
if (Number.isNaN(id)) {
return json({ error: 'Invalid secret provider ID' }, { status: 400 });
}
const providers = await getSecretProviders();
const provider = providers.find((p) => p.id === id);
if (!provider) {
return json({ error: 'Secret provider not found' }, { status: 404 });
}
// Summary only, never the decrypted config.
return json(provider);
};
export const PUT: RequestHandler = async (event) => {
const { params, request, cookies } = event;
const auth = await authorize(cookies);
if (auth.authEnabled && !(await auth.can('secrets', 'edit'))) {
return json({ error: 'Permission denied' }, { status: 403 });
}
try {
const id = Number.parseInt(params.id);
if (Number.isNaN(id)) {
return json({ error: 'Invalid secret provider ID' }, { status: 400 });
}
const existing = await getSecretProviderById(id);
if (!existing) {
return json({ error: 'Secret provider not found' }, { status: 404 });
}
const data = await request.json();
const name = typeof data.name === 'string' ? data.name.trim() : undefined;
const type = typeof data.type === 'string' ? data.type.trim() : undefined;
const config = 'config' in data ? data.config : undefined;
if (name !== undefined && !name) {
return json({ error: 'Name cannot be empty' }, { status: 400 });
}
if (type !== undefined && !hasProvider(type)) {
return json({ error: `Unknown secret provider type: ${type}` }, { status: 400 });
}
if (config !== undefined && (typeof config !== 'object' || config === null || Array.isArray(config))) {
return json({ error: 'Config must be an object' }, { status: 400 });
}
const updated = await updateSecretProvider(id, { name, type, config });
if (!updated) {
return json({ error: 'Secret provider not found' }, { status: 404 });
}
const details: Record<string, any> = {};
if (name && name !== existing.name) details.name = { from: existing.name, to: name };
if (type && type !== existing.type) details.type = { from: existing.type, to: type };
if (config !== undefined) details.configRotated = true;
await auditSecretProvider(event, 'update', id, updated.name, details);
// Never return the decrypted config.
return json(updated);
} catch (error: any) {
console.error('Error updating secret provider:', error);
if (error.message?.includes('UNIQUE') || error.message?.includes('unique')) {
return json({ error: 'A secret provider with this name already exists' }, { status: 400 });
}
return json({ error: 'Failed to update secret provider' }, { status: 500 });
}
};
export const DELETE: RequestHandler = async (event) => {
const { params, cookies } = event;
const auth = await authorize(cookies);
if (auth.authEnabled && !(await auth.can('secrets', 'delete'))) {
return json({ error: 'Permission denied' }, { status: 403 });
}
try {
const id = Number.parseInt(params.id);
if (Number.isNaN(id)) {
return json({ error: 'Invalid secret provider ID' }, { status: 400 });
}
const deleted = await deleteSecretProvider(id);
if (!deleted) {
return json({ error: 'Secret provider not found' }, { status: 404 });
}
await auditSecretProvider(event, 'delete', id, deleted.name);
return json({ success: true });
} catch (error) {
console.error('Error deleting secret provider:', error);
return json({ error: 'Failed to delete secret provider' }, { status: 500 });
}
};
@@ -0,0 +1,29 @@
import { json } from '@sveltejs/kit';
import type { RequestHandler } from './$types';
import { getSecretProviderById } from '$lib/server/db';
import { authorize } from '$lib/server/authorize';
import { testProviderConnection } from '$lib/server/secretproviders';
/** Test a stored provider using its persisted (decrypted) config. */
export const POST: RequestHandler = async ({ params, cookies }) => {
const auth = await authorize(cookies);
if (auth.authEnabled && !(await auth.can('secrets', 'view'))) {
return json({ error: 'Permission denied' }, { status: 403 });
}
const id = Number.parseInt(params.id);
if (Number.isNaN(id)) {
return json({ error: 'Invalid secret provider ID' }, { status: 400 });
}
const provider = await getSecretProviderById(id);
if (!provider) {
return json({ error: 'Secret provider not found' }, { status: 404 });
}
const result = await testProviderConnection(provider.type, provider.config);
if (!result.ok) {
return json({ ok: false, error: result.error }, { status: 200 });
}
return json({ ok: true });
};
@@ -0,0 +1,32 @@
import { json } from '@sveltejs/kit';
import type { RequestHandler } from './$types';
import { authorize } from '$lib/server/authorize';
import { hasProvider, testProviderConnection } from '$lib/server/secretproviders';
/** Test a provider config before it's persisted to the database. */
export const POST: RequestHandler = async ({ request, cookies }) => {
const auth = await authorize(cookies);
if (auth.authEnabled && !(await auth.can('secrets', 'create'))) {
return json({ error: 'Permission denied' }, { status: 403 });
}
let type = '';
let config: unknown;
try {
const data = await request.json();
type = typeof data.type === 'string' ? data.type.trim() : '';
config = data.config;
} catch {
return json({ error: 'Invalid request body' }, { status: 400 });
}
if (!type || !hasProvider(type)) {
return json({ ok: false, error: 'A valid provider type is required' }, { status: 200 });
}
if (!config || typeof config !== 'object' || Array.isArray(config)) {
return json({ ok: false, error: 'Config is required' }, { status: 200 });
}
const result = await testProviderConnection(type, config as any);
return json(result);
};
+13 -3
View File
@@ -91,7 +91,7 @@ export const POST: RequestHandler = async (event) => {
try {
const body = await request.json();
const { name, compose, start, envVars, rawEnvContent, composePath, envPath } = body;
const { name, compose, start, envVars, rawEnvContent, composePath, envPath, secretProviderId } = body;
if (!name || typeof name !== 'string') {
return json({ error: 'Stack name is required' }, { status: 400 });
@@ -101,6 +101,14 @@ export const POST: RequestHandler = async (event) => {
return json({ error: 'Compose file content is required' }, { status: 400 });
}
if (
'secretProviderId' in body &&
secretProviderId !== null &&
typeof secretProviderId !== 'number'
) {
return json({ error: 'secretProviderId must be a number or null' }, { status: 400 });
}
// If start is false, only create the compose file without deploying
if (start === false) {
const result = await saveStackComposeFile(name, compose, true, envIdNum, {
@@ -134,7 +142,8 @@ export const POST: RequestHandler = async (event) => {
environmentId: envIdNum,
sourceType: 'internal',
composePath: composePath || undefined,
envPath: envPath || undefined
envPath: envPath || undefined,
secretProviderId,
});
// Audit log
@@ -175,7 +184,8 @@ export const POST: RequestHandler = async (event) => {
environmentId: envIdNum,
sourceType: 'internal',
composePath: composePath || undefined,
envPath: envPath || undefined
envPath: envPath || undefined,
secretProviderId
});
// Deploy via SSE to keep connection alive during long operations
@@ -56,15 +56,23 @@ export const PUT: RequestHandler = async ({ params, request, url, cookies }) =>
try {
const body = await request.json();
const { content, restart = false, composePath, envPath, moveFromDir, oldComposePath, oldEnvPath } = body;
const { content, restart = false, composePath, envPath, moveFromDir, oldComposePath, oldEnvPath, secretProviderId } = body;
if (!content || typeof content !== 'string') {
return json({ error: 'Compose file content is required' }, { status: 400 });
}
// Build options object for custom paths, move operation, and file renames
const pathOptions = (composePath || envPath !== undefined || moveFromDir || oldComposePath || oldEnvPath)
? { composePath, envPath, moveFromDir, oldComposePath, oldEnvPath }
if (
'secretProviderId' in body &&
secretProviderId !== null &&
typeof secretProviderId !== 'number'
) {
return json({ error: 'secretProviderId must be a number or null' }, { status: 400 });
}
// Build options object for custom paths, move operation, file renames, and secret provider binding
const pathOptions = (composePath || envPath !== undefined || moveFromDir || oldComposePath || oldEnvPath || secretProviderId !== undefined)
? { composePath, envPath, moveFromDir, oldComposePath, oldEnvPath, secretProviderId }
: undefined;
if (restart) {
+11 -2
View File
@@ -18,12 +18,21 @@ export const GET: RequestHandler = async ({ url, cookies }) => {
const sources = await getStackSources(envIdNum);
// Convert to a map for easier lookup in the frontend
const sourceMap: Record<string, { sourceType: string; composePath?: string | null; repository?: any }> = {};
const sourceMap: Record<
string,
{
sourceType: string;
composePath?: string | null;
repository?: any;
secretProviderId?: number | null;
}
> = {};
for (const source of sources) {
sourceMap[source.stackName] = {
sourceType: source.sourceType,
composePath: source.composePath,
repository: source.repository
repository: source.repository,
secretProviderId: source.secretProviderId,
};
}
+6
View File
@@ -17,6 +17,7 @@
Info,
GitBranch,
Tags,
KeyRound,
Archive
} from 'lucide-svelte';
import PageHeader from '$lib/components/PageHeader.svelte';
@@ -27,6 +28,7 @@
import LabelsTab from './labels/LabelsTab.svelte';
import RegistriesTab from './registries/RegistriesTab.svelte';
import GitTab from './git/GitTab.svelte';
import SecretsTab from './secrets/SecretsTab.svelte';
import ConfigSetsTab from './config-sets/ConfigSetsTab.svelte';
import NotificationsTab from './notifications/NotificationsTab.svelte';
import BackupsTab from './backups/BackupsTab.svelte';
@@ -71,6 +73,10 @@
<GitBranch class="w-4 h-4" />
Git
</Tabs.Trigger>
<Tabs.Trigger value="secrets" class="flex-1 flex items-center justify-center gap-1.5">
<KeyRound class="w-4 h-4" />
Secrets
</Tabs.Trigger>
<Tabs.Trigger value="config-sets" class="flex-1 flex items-center justify-center gap-1.5">
<Layers class="w-4 h-4" />
Config sets
@@ -66,6 +66,7 @@
audit_logs: string[];
activity: string[];
schedules: string[];
secrets: string[];
backups: string[];
}>({
containers: [],
@@ -84,6 +85,7 @@
audit_logs: [],
activity: [],
schedules: [],
secrets: [],
backups: []
});
@@ -142,6 +144,12 @@
{ key: 'edit', label: 'Edit schedules' },
{ key: 'run', label: 'Run schedules' }
],
secrets: [
{ key: 'view', label: 'View secrets' },
{ key: 'create', label: 'Create secrets' },
{ key: 'edit', label: 'Edit secrets' },
{ key: 'delete', label: 'Delete secrets' }
],
backups: [
{ key: 'view', label: 'View backups' },
{ key: 'run', label: 'Run backups' },
@@ -214,6 +222,7 @@
audit_logs: ClipboardList,
activity: Activity,
schedules: Timer,
secrets: KeyRound,
backups: Archive
};
@@ -234,6 +243,7 @@
audit_logs: 'bg-stone-100 dark:bg-stone-950 text-stone-700 dark:text-stone-400 border-stone-300 dark:border-stone-800',
activity: 'bg-emerald-100 dark:bg-emerald-950 text-emerald-700 dark:text-emerald-400 border-emerald-300 dark:border-emerald-800',
schedules: 'bg-sky-100 dark:bg-sky-950 text-sky-700 dark:text-sky-400 border-sky-300 dark:border-sky-800',
secrets: 'bg-fuchsia-100 dark:bg-fuchsia-950 text-fuchsia-700 dark:text-fuchsia-400 border-fuchsia-300 dark:border-fuchsia-800',
backups: 'bg-lime-100 dark:bg-lime-950 text-lime-700 dark:text-lime-400 border-lime-300 dark:border-lime-800'
};
@@ -284,6 +294,7 @@
audit_logs: [],
activity: [],
schedules: [],
secrets: [],
backups: []
};
}
@@ -315,6 +326,7 @@
audit_logs: [...(role.permissions.audit_logs || [])],
activity: [...(role.permissions.activity || [])],
schedules: [...(role.permissions.schedules || [])],
secrets: [...(role.permissions.secrets || [])],
backups: [...(role.permissions.backups || [])]
};
formError = '';
@@ -344,6 +356,7 @@
audit_logs: [...(copyFrom.permissions.audit_logs || [])],
activity: [...(copyFrom.permissions.activity || [])],
schedules: [...(copyFrom.permissions.schedules || [])],
secrets: [...(copyFrom.permissions.secrets || [])],
backups: [...(copyFrom.permissions.backups || [])]
};
formError = '';
@@ -0,0 +1,352 @@
<script lang='ts' module>
export interface SecretProvider {
id: number;
type: string;
name: string;
createdAt: string;
updatedAt?: string;
}
interface ProviderField {
key: string;
label: string;
type: 'text' | 'password';
required: boolean;
placeholder?: string;
hint?: string;
}
// Selectable provider types + their labels. Mirrors the registered providers
// in src/lib/server/secretproviders (index.ts / shared.ts).
export const PROVIDER_TYPES: { value: string; label: string }[] = [
{ value: 'op-service-account', label: '1Password service account' },
{ value: 'op-connect', label: '1Password Connect' },
{ value: 'infisical', label: 'Infisical' },
{ value: 'vault', label: 'HashiCorp Vault' },
];
// Config fields per provider type, matching the config shapes in
// secretproviders/shared.ts. Non-required fields are optional overrides.
export const PROVIDER_FIELDS: Record<string, ProviderField[]> = {
'op-service-account': [
{ key: 'token', label: 'Service account token', type: 'password', required: true, placeholder: 'ops_eyJ...' },
],
'op-connect': [
{ key: 'host', label: 'Connect host URL', type: 'text', required: true, placeholder: 'https://connect.example.com' },
{ key: 'token', label: 'Connect token', type: 'password', required: true, placeholder: 'eyJ...' },
],
infisical: [
{ key: 'host', label: 'API host', type: 'text', required: true, placeholder: 'https://app.infisical.com' },
{ key: 'token', label: 'Access token', type: 'password', required: true, placeholder: 'st...' },
{ key: 'projectId', label: 'Project ID', type: 'text', required: true, placeholder: 'workspace / project id' },
{ key: 'environment', label: 'Environment', type: 'text', required: true, placeholder: 'prod' },
{ key: 'path', label: 'Secret path', type: 'text', required: false, placeholder: '/' },
],
vault: [
{ key: 'address', label: 'Vault address', type: 'text', required: true, placeholder: 'https://vault.example.com' },
{ key: 'token', label: 'Vault token', type: 'password', required: true, placeholder: 'hvs...' },
{ key: 'namespace', label: 'Namespace', type: 'text', required: false, placeholder: 'admin (Enterprise / HCP)' },
{ key: 'mount', label: 'KV mount', type: 'text', required: false, placeholder: 'secret' },
],
};
export function providerTypeLabel(type: string): string {
return PROVIDER_TYPES.find((t) => t.value === type)?.label ?? type;
}
</script>
<script lang='ts'>
import { Button } from '$lib/components/ui/button';
import * as Dialog from '$lib/components/ui/dialog';
import * as Select from '$lib/components/ui/select';
import { Label } from '$lib/components/ui/label';
import { Input } from '$lib/components/ui/input';
import { Plus, Check, RefreshCw, PlugZap } from 'lucide-svelte';
import { toast } from 'svelte-sonner';
import { focusFirstInput } from '$lib/utils';
interface Props {
open: boolean;
provider?: SecretProvider | null;
onClose: () => void;
onSaved: () => void;
}
let {
open = $bindable(),
provider = null,
onClose,
onSaved,
}: Props = $props();
const isEditing = $derived(provider !== null);
let formName = $state('');
let formType = $state('op-service-account');
// One value per config field; blank means 'unset' (on edit: keep existing).
let formConfig = $state<Record<string, string>>({});
let formError = $state('');
let formSaving = $state(false);
let formTesting = $state(false);
const fields = $derived(PROVIDER_FIELDS[formType] ?? []);
function resetConfig() {
formConfig = {};
}
function resetForm() {
formName = '';
formType = 'op-service-account';
resetConfig();
formError = '';
formSaving = false;
formTesting = false;
}
$effect(() => {
if (open) {
if (provider) {
formName = provider.name;
formType = provider.type;
resetConfig();
formError = '';
} else {
resetForm();
}
}
});
// The config never leaves the server, so on edit the fields start blank.
// Collect only the fields the user actually filled in.
function collectConfig(): Record<string, string> {
const config: Record<string, string> = {};
for (const field of fields) {
const value = (formConfig[field.key] ?? '').trim();
if (value) config[field.key] = value;
}
return config;
}
function missingRequired(config: Record<string, string>): string | null {
for (const field of fields) {
if (field.required && !config[field.key]) {
return `${field.label} is required`;
}
}
return null;
}
function onTypeChange(value: string) {
formType = value;
// Fields differ per type; drop any stale values.
resetConfig();
formError = '';
}
async function testCurrent() {
formTesting = true;
formError = '';
try {
const config = collectConfig();
const configProvided = Object.keys(config).length > 0;
let response: Response;
if (isEditing && !configProvided) {
// Test the stored (server-side) config.
response = await fetch(`/api/secret-providers/${provider!.id}/test`, {
method: 'POST',
});
} else {
const missing = missingRequired(config);
if (missing) {
formError = missing;
return;
}
response = await fetch('/api/secret-providers/test', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ type: formType, config }),
});
}
const data = await response.json();
if (data.ok) {
toast.success('Connection works');
} else {
toast.error(data.error || 'Connection failed');
formError = data.error || 'Connection failed';
}
} catch {
toast.error('Connection test failed');
} finally {
formTesting = false;
}
}
async function save() {
if (!formName.trim()) {
formError = 'Name is required';
return;
}
const config = collectConfig();
const configProvided = Object.keys(config).length > 0;
// On create, a complete config is required. On edit, config is optional
// (blank keeps the stored config); if the user touches any field they
// must supply the whole config, since it is replaced wholesale.
if (!isEditing || configProvided) {
const missing = missingRequired(config);
if (missing) {
formError = missing;
return;
}
}
formSaving = true;
formError = '';
try {
const body: Record<string, unknown> = {
name: formName.trim(),
type: formType,
};
if (configProvided) body.config = config;
const url = isEditing
? `/api/secret-providers/${provider!.id}`
: '/api/secret-providers';
const method = isEditing ? 'PUT' : 'POST';
const response = await fetch(url, {
method,
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(body),
});
if (response.ok) {
open = false;
onSaved();
} else {
const data = await response.json();
formError =
data.error ||
`Failed to ${isEditing ? 'update' : 'create'} secret provider`;
}
} catch {
formError = `Failed to ${isEditing ? 'update' : 'create'} secret provider`;
} finally {
formSaving = false;
}
}
function handleClose() {
open = false;
onClose();
}
</script>
<Dialog.Root
bind:open
onOpenChange={(o) => {
if (o) {
formError = "";
focusFirstInput();
}
}}
>
<Dialog.Content class="max-w-md">
<Dialog.Header>
<Dialog.Title
>{isEditing ? "Edit" : "Add"} secret provider</Dialog.Title
>
</Dialog.Header>
<div class="space-y-4">
{#if formError}
<div class="text-sm text-red-600 dark:text-red-400">
{formError}
</div>
{/if}
<div class="space-y-2">
<Label for="provider-name">Name</Label>
<Input
id="provider-name"
bind:value={formName}
placeholder="Production secrets"
/>
</div>
<div class="space-y-2">
<Label for="provider-type">Provider</Label>
<Select.Root
type="single"
value={formType}
onValueChange={onTypeChange}
disabled={isEditing}
>
<Select.Trigger id="provider-type">
{providerTypeLabel(formType)}
</Select.Trigger>
<Select.Content>
{#each PROVIDER_TYPES as t (t.value)}
<Select.Item value={t.value} label={t.label}>
{t.label}
</Select.Item>
{/each}
</Select.Content>
</Select.Root>
</div>
{#each fields as field (field.key)}
<div class="space-y-2">
<Label for={`provider-${field.key}`}>
{field.label}{#if !field.required}<span
class="text-muted-foreground"
>
(optional)</span
>{/if}
</Label>
<Input
id={`provider-${field.key}`}
type={field.type}
bind:value={formConfig[field.key]}
placeholder={isEditing && field.type === "password"
? "leave blank to keep existing"
: field.placeholder}
/>
{#if field.hint}
<p class="text-xs text-muted-foreground">{field.hint}</p>
{/if}
</div>
{/each}
<p class="text-xs text-muted-foreground">
Configuration is stored encrypted.{#if isEditing}
Leave secret fields blank to keep the existing values.{/if}
</p>
</div>
<Dialog.Footer>
<Button
variant="outline"
onclick={testCurrent}
disabled={formTesting || formSaving}
>
{#if formTesting}
<RefreshCw class="w-4 h-4 mr-1 animate-spin" />
{:else}
<PlugZap class="w-4 h-4 mr-1" />
{/if}
Test connection
</Button>
<div class="flex-1"></div>
<Button variant="outline" onclick={handleClose}>Cancel</Button>
<Button onclick={save} disabled={formSaving}>
{#if formSaving}
<RefreshCw class="w-4 h-4 mr-1 animate-spin" />
{:else if isEditing}
<Check class="w-4 h-4" />
{:else}
<Plus class="w-4 h-4" />
{/if}
{isEditing ? "Save" : "Add"}
</Button>
</Dialog.Footer>
</Dialog.Content>
</Dialog.Root>
@@ -0,0 +1,215 @@
<script lang='ts'>
import { onMount } from 'svelte';
import { fade } from 'svelte/transition';
import { toast } from 'svelte-sonner';
import { Button } from '$lib/components/ui/button';
import * as Card from '$lib/components/ui/card';
import { Badge } from '$lib/components/ui/badge';
import {
Plus,
Trash2,
Pencil,
KeyRound,
PlugZap,
RefreshCw,
} from 'lucide-svelte';
import ConfirmPopover from '$lib/components/ConfirmPopover.svelte';
import { canAccess } from '$lib/stores/auth';
import { EmptyState } from '$lib/components/ui/empty-state';
import ProviderModal, {
type SecretProvider,
providerTypeLabel,
} from './ProviderModal.svelte';
let providers = $state<SecretProvider[]>([]);
let loading = $state(true);
let showModal = $state(false);
let editing = $state<SecretProvider | null>(null);
let confirmDeleteId = $state<number | null>(null);
let testingId = $state<number | null>(null);
async function fetchProviders() {
loading = true;
try {
const response = await fetch('/api/secret-providers');
providers = await response.json();
} catch (e) {
console.error('Failed to fetch secret providers:', e);
toast.error('Failed to fetch secret providers');
} finally {
loading = false;
}
}
function openModal(provider?: SecretProvider) {
editing = provider || null;
showModal = true;
}
async function deleteProvider(id: number) {
try {
const response = await fetch(`/api/secret-providers/${id}`, {
method: 'DELETE',
});
if (response.ok) {
await fetchProviders();
toast.success('Secret provider deleted');
} else {
const data = await response.json();
toast.error(data.error || 'Failed to delete secret provider');
}
} catch {
toast.error('Failed to delete secret provider');
}
}
async function testProvider(provider: SecretProvider) {
testingId = provider.id;
try {
const response = await fetch(
`/api/secret-providers/${provider.id}/test`,
{ method: 'POST' },
);
const data = await response.json();
if (data.ok) {
toast.success(`${provider.name}: connection works`);
} else {
toast.error(
`${provider.name}: ${data.error || 'connection failed'}`,
);
}
} catch {
toast.error('Connection test failed');
} finally {
testingId = null;
}
}
onMount(() => {
fetchProviders();
});
</script>
<div class="space-y-4">
<div class="flex justify-between items-center">
<div class="flex items-center gap-3">
<Badge variant="secondary" class="text-xs"
>{providers.length} total</Badge
>
</div>
<div class="flex gap-2">
{#if $canAccess("secrets", "create")}
<Button size="sm" onclick={() => openModal()}>
<Plus class="w-4 h-4" />
Add secret provider
</Button>
{/if}
<Button size="sm" variant="outline" onclick={fetchProviders}
>Refresh</Button
>
</div>
</div>
{#if loading && providers.length === 0}
<p class="text-muted-foreground text-sm">Loading secret providers...</p>
{:else if providers.length === 0}
<EmptyState
icon={KeyRound}
title="No secret providers"
description="Add a provider (1Password, Infisical, HashiCorp Vault, ...) to load secrets at deploy time"
/>
{:else}
<div class="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
{#each providers as provider (provider.id)}
<div out:fade={{ duration: 200 }}>
<Card.Root>
<Card.Header class="pb-2">
<div class="flex items-start justify-between">
<div class="flex items-center gap-2">
<KeyRound
class="w-5 h-5 text-muted-foreground"
/>
<Card.Title class="text-base"
>{provider.name}</Card.Title
>
</div>
<Badge variant="secondary" class="text-xs"
>{providerTypeLabel(provider.type)}</Badge
>
</div>
</Card.Header>
<Card.Content class="space-y-3">
<div class="text-xs text-muted-foreground">
Added {new Date(
provider.createdAt,
).toLocaleDateString()}
</div>
<div class="flex gap-2 pt-2 min-h-[32px]">
{#if $canAccess("secrets", "view")}
<Button
variant="outline"
size="sm"
onclick={() => testProvider(provider)}
disabled={testingId === provider.id}
>
{#if testingId === provider.id}
<RefreshCw
class="w-3 h-3 animate-spin"
/>
{:else}
<PlugZap class="w-3 h-3" />
{/if}
Test
</Button>
{/if}
{#if $canAccess("secrets", "edit")}
<Button
variant="outline"
size="sm"
onclick={() => openModal(provider)}
>
<Pencil class="w-3 h-3" />
</Button>
{/if}
{#if $canAccess("secrets", "delete")}
<ConfirmPopover
open={confirmDeleteId === provider.id}
action="Delete"
itemType="secret provider"
itemName={provider.name}
title="Remove"
position="left"
onConfirm={() =>
deleteProvider(provider.id)}
onOpenChange={(open) =>
(confirmDeleteId = open
? provider.id
: null)}
>
{#snippet children({ open })}
<Trash2
class="w-3 h-3 {open
? 'text-destructive'
: 'text-muted-foreground hover:text-destructive'}"
/>
{/snippet}
</ConfirmPopover>
{/if}
</div>
</Card.Content>
</Card.Root>
</div>
{/each}
</div>
{/if}
</div>
<ProviderModal
bind:open={showModal}
provider={editing}
onClose={() => {
showModal = false;
editing = null;
}}
onSaved={fetchProviders}
/>
+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(); }}