test connection on a saved environment without re-entering the token
This commit is contained in:
2 files changed
+48
-14
No files matched your search
@@ -1,6 +1,8 @@
|
|||||||
import { json } from '@sveltejs/kit';
|
import { json } from '@sveltejs/kit';
|
||||||
import { unixSocketRequest, httpsAgentRequest } from '$lib/server/docker';
|
import { unixSocketRequest, httpsAgentRequest } from '$lib/server/docker';
|
||||||
import type { DockerClientConfig } from '$lib/server/docker';
|
import type { DockerClientConfig } from '$lib/server/docker';
|
||||||
|
import { getEnvironment } from '$lib/server/db';
|
||||||
|
import { authorize } from '$lib/server/authorize';
|
||||||
import { isSafeNotificationUrl } from '$lib/server/url-safety';
|
import { isSafeNotificationUrl } from '$lib/server/url-safety';
|
||||||
import type { RequestHandler } from './$types';
|
import type { RequestHandler } from './$types';
|
||||||
|
|
||||||
@@ -15,6 +17,14 @@ interface TestConnectionRequest {
|
|||||||
tlsKey?: string;
|
tlsKey?: string;
|
||||||
tlsSkipVerify?: boolean;
|
tlsSkipVerify?: boolean;
|
||||||
hawserToken?: string;
|
hawserToken?: string;
|
||||||
|
/**
|
||||||
|
* When editing an existing environment, secrets (hawserToken, tlsKey) are never sent
|
||||||
|
* back to the client, so an unchanged token comes through empty. Passing the env id lets
|
||||||
|
* the server fall back to the STORED secret for any secret field the body left blank, so
|
||||||
|
* "Test connection" works without re-typing the token (#1483). Non-secret fields still
|
||||||
|
* come from the body, so the test reflects the edited form.
|
||||||
|
*/
|
||||||
|
environmentId?: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
function cleanPem(pem: string): string {
|
function cleanPem(pem: string): string {
|
||||||
@@ -45,16 +55,36 @@ function buildDockerClientConfig(config: TestConnectionRequest): DockerClientCon
|
|||||||
*
|
*
|
||||||
* @openapi
|
* @openapi
|
||||||
* summary: Test a Docker/Hawser connection configuration WITHOUT saving it as an environment
|
* summary: Test a Docker/Hawser connection configuration WITHOUT saving it as an environment
|
||||||
* body: {connectionType:string!, socketPath:string, host:string, port:integer, protocol:string, tlsCa:string, tlsCert:string, tlsKey:string, tlsSkipVerify:boolean, hawserToken:string}
|
* description: Pass environmentId to fall back to that saved environment's stored secrets (hawserToken, tlsKey) for any secret field left blank in the body, so Test connection works when editing without re-entering the token.
|
||||||
|
* body: {connectionType:string!, socketPath:string, host:string, port:integer, protocol:string, tlsCa:string, tlsCert:string, tlsKey:string, tlsSkipVerify:boolean, hawserToken:string, environmentId:integer}
|
||||||
* body-example: {"connectionType":"socket","socketPath":"/var/run/docker.sock"}
|
* body-example: {"connectionType":"socket","socketPath":"/var/run/docker.sock"}
|
||||||
* resp-200: {success:boolean!, info:{serverVersion:string, containers:integer, images:integer, name:string}, hawser:{}}
|
* resp-200: {success:boolean!, info:{serverVersion:string, containers:integer, images:integer, name:string}, hawser:{}}
|
||||||
* resp-200-desc: success:false with a human-readable error message is also returned as HTTP 200 (connection failures are not transport errors)
|
* resp-200-desc: success:false with a human-readable error message is also returned as HTTP 200 (connection failures are not transport errors)
|
||||||
* resp-400: Host is required for direct/hawser-standard connection types
|
* resp-400: Host is required for direct/hawser-standard connection types
|
||||||
|
* resp-403: The caller cannot access the environment named by environmentId
|
||||||
*/
|
*/
|
||||||
export const POST: RequestHandler = async ({ request }) => {
|
export const POST: RequestHandler = async ({ request, cookies }) => {
|
||||||
try {
|
try {
|
||||||
const config: TestConnectionRequest = await request.json();
|
const config: TestConnectionRequest = await request.json();
|
||||||
|
|
||||||
|
// Fill unchanged secrets from the stored environment when editing (#1483): the client
|
||||||
|
// never receives hawserToken / tlsKey, so an untouched field arrives empty. Only fall
|
||||||
|
// back for a BLANK field, so a freshly typed token/key still wins.
|
||||||
|
if (config.environmentId) {
|
||||||
|
// Gate the id: without this, any authenticated user could name another
|
||||||
|
// environment's id and have its stored token sent to a body-supplied host,
|
||||||
|
// exfiltrating a secret they may have no access to (env-scoped RBAC).
|
||||||
|
const auth = await authorize(cookies);
|
||||||
|
if (!(await auth.canAccessEnvironment(config.environmentId))) {
|
||||||
|
return json({ success: false, error: 'Access denied' }, { status: 403 });
|
||||||
|
}
|
||||||
|
const stored = await getEnvironment(config.environmentId);
|
||||||
|
if (stored) {
|
||||||
|
if (!config.hawserToken) config.hawserToken = stored.hawserToken || undefined;
|
||||||
|
if (!config.tlsKey) config.tlsKey = stored.tlsKey || undefined;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Build fetch options based on connection type
|
// Build fetch options based on connection type
|
||||||
let response: Response;
|
let response: Response;
|
||||||
|
|
||||||
|
|||||||
@@ -743,7 +743,10 @@
|
|||||||
tlsCert: cleanCertificate(formTlsCert),
|
tlsCert: cleanCertificate(formTlsCert),
|
||||||
tlsKey: cleanCertificate(formTlsKey),
|
tlsKey: cleanCertificate(formTlsKey),
|
||||||
tlsSkipVerify: formTlsSkipVerify,
|
tlsSkipVerify: formTlsSkipVerify,
|
||||||
hawserToken: formHawserToken || pendingToken
|
hawserToken: formHawserToken || pendingToken,
|
||||||
|
// When editing, let the server fall back to the stored token/key for any
|
||||||
|
// secret the form left blank (secrets are never sent back to the client) (#1483).
|
||||||
|
environmentId: isEditing && environment ? environment.id : undefined
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -961,9 +964,9 @@
|
|||||||
// - socket/direct: the deploy staging dir AND the in-app editor source
|
// - socket/direct: the deploy staging dir AND the in-app editor source
|
||||||
// (containers' compose project labels point here, so redeploy is
|
// (containers' compose project labels point here, so redeploy is
|
||||||
// required after rename or next restart fails)
|
// required after rename or next restart fails)
|
||||||
// - hawser-standard/edge: the in-app editor staging source for stacks
|
// - hawser-standard/edge: the in-app editor source for ALL stacks
|
||||||
// (the agent's deployed dir lives on the remote host and is not affected)
|
// PLUS the git-repos clones for git stacks (the agent's deployed
|
||||||
// Git repository clones are shared per-repo under git-repos/<repoName>/.
|
// dir lives on the remote host and is not affected)
|
||||||
// → fire the warning whenever the name changes.
|
// → fire the warning whenever the name changes.
|
||||||
const newName = formName.trim();
|
const newName = formName.trim();
|
||||||
const willRenameOnDisk = newName !== environment.name;
|
const willRenameOnDisk = newName !== environment.name;
|
||||||
@@ -3143,11 +3146,8 @@
|
|||||||
</Dialog.Content>
|
</Dialog.Content>
|
||||||
</Dialog.Root>
|
</Dialog.Root>
|
||||||
|
|
||||||
<!-- Env-rename confirmation: fires when the name changes. The server renames
|
<!-- Env-rename confirmation: only fires for socket/direct envs where the
|
||||||
env-scoped staging under $DATA_DIR/stacks/<oldName>. When STACKS_DIR is set
|
server actually moves $DATA_DIR/stacks/<oldName> → <newName>. -->
|
||||||
for local envs, deployed stack files stay at STACKS_DIR/<stackName>/ and are
|
|
||||||
not moved by an env rename. Shared git clones under git-repos/<repoName>/
|
|
||||||
are unaffected. -->
|
|
||||||
<Dialog.Root bind:open={showRenameConfirm}>
|
<Dialog.Root bind:open={showRenameConfirm}>
|
||||||
<Dialog.Content class="max-w-2xl">
|
<Dialog.Content class="max-w-2xl">
|
||||||
<Dialog.Header>
|
<Dialog.Header>
|
||||||
@@ -3156,13 +3156,17 @@
|
|||||||
Rename environment?
|
Rename environment?
|
||||||
</Dialog.Title>
|
</Dialog.Title>
|
||||||
<Dialog.Description class="pt-2 space-y-3 text-sm">
|
<Dialog.Description class="pt-2 space-y-3 text-sm">
|
||||||
<p>The following staging directories will be moved on the Dockhand host (local deployed stacks under <code class="text-xs">STACKS_DIR</code>, when configured, are not renamed):</p>
|
<p>The following directories will be moved on the Dockhand host:</p>
|
||||||
<div class="space-y-1 text-xs font-mono bg-muted/40 rounded-md p-3 border overflow-x-auto">
|
<div class="space-y-1 text-xs font-mono bg-muted/40 rounded-md p-3 border overflow-x-auto">
|
||||||
<div class="flex items-center gap-2 whitespace-nowrap">
|
<div class="flex items-center gap-2 whitespace-nowrap">
|
||||||
<code class="whitespace-nowrap">$DATA_DIR/stacks/{renameConfirmFrom}/</code>
|
<code class="whitespace-nowrap">$DATA_DIR/stacks/{renameConfirmFrom}/</code>
|
||||||
<ArrowRight class="w-3.5 h-3.5 shrink-0 text-muted-foreground" />
|
<ArrowRight class="w-3.5 h-3.5 shrink-0 text-muted-foreground" />
|
||||||
<code class="whitespace-nowrap">$DATA_DIR/stacks/{renameConfirmTo}/</code>
|
<code class="whitespace-nowrap">$DATA_DIR/stacks/{renameConfirmTo}/</code>
|
||||||
<span class="text-muted-foreground shrink-0">(staging)</span>
|
</div>
|
||||||
|
<div class="flex items-center gap-2 whitespace-nowrap">
|
||||||
|
<code class="whitespace-nowrap">$DATA_DIR/git-repos/{renameConfirmFrom}/</code>
|
||||||
|
<ArrowRight class="w-3.5 h-3.5 shrink-0 text-muted-foreground" />
|
||||||
|
<code class="whitespace-nowrap">$DATA_DIR/git-repos/{renameConfirmTo}/</code>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{#if renameCountsUnknown}
|
{#if renameCountsUnknown}
|
||||||
@@ -3212,7 +3216,7 @@
|
|||||||
<p>
|
<p>
|
||||||
Their containers run on the Hawser agent host, where the deploy
|
Their containers run on the Hawser agent host, where the deploy
|
||||||
directory doesn't include the env name — those keep working without
|
directory doesn't include the env name — those keep working without
|
||||||
a redeploy. Only the local editor staging directory is renamed.
|
a redeploy. Only the local editor source and git clone caches move.
|
||||||
</p>
|
</p>
|
||||||
{/if}
|
{/if}
|
||||||
</Dialog.Description>
|
</Dialog.Description>
|
||||||
|
|||||||
Reference in new issue
Block a user