mirror of
https://github.com/Termix-SSH/Termix.git
synced 2026-07-15 21:03:47 +00:00
9de904dd4c
* feat(sshid) - sshid.io equivalent for termix (#919) * feat(ssh-id): database schema, migrations and field encryption Adds ssh_identities, ssh_identity_keys and ssh_identity_ca tables (public keys stored plaintext for the unauthenticated resolver; CA private key registered for per-user field encryption), with UNIQUE(user_id), an index on ssh_identity_keys(identity_id), and idempotent CREATE TABLE migrations. * feat(ssh-id): backend API — resolver, key management, CA and certificates Mounts /sshid (nginx route added). Public text/plain authorized_keys resolver (+ exact /:algo filter, HTML viewer) and CA public-key endpoint; no-store + noindex headers on every resolver response including early 404s. Authenticated management: claim/rename/delete handle, add/import/generate/enable/delete keys, and a per-user CA (create/rotate/delete) with pure-Node OpenSSH certificate issuance. Audit logging on all mutations; UNIQUE races map to a precise 409. Unit tests for key parsing and certificate signing (ssh-keygen-validated). * feat(ssh-id): frontend panel, API client and i18n SSH ID panel wired into the app rail and AppShell: claim handle, resolver URL + curl one-liner, key list, generate, paste/import, CA enable/rotate/remove with server trust command, and per-key certificate issuance. API client re-exported through main-axios.ts; all strings i18n'd. * style(ssh-id): align panel and resolver page with Termix theme - Rebuild the SSH ID sidebar panel with the theme's square components (SectionCard / SettingRow / FakeSwitch) instead of rounded ad-hoc cards; use accent-brand and destructive tokens rather than raw red/green. - Fix panel scrolling: move overflow to a block scroll container so the cards keep their natural height instead of being clipped. - Restyle the public resolver HTML page (/sshid/u/:handle) to the Termix dark theme: square corners, #18181b/#303032 palette, #f59145 accent, uppercase section labels. - Tidy copy: 'Save To Credentials' label, drop the redundant generate intro, and correct the generate tooltip (the key is stored when saving to vault). * feat: rename to Termix ID, improve UI, backend inconsistencies, and general bug fixes --------- Co-authored-by: LukeGus <bugattiguy527@gmail.com> * ci(deps): bump actions/checkout from 6 to 7 in the github-actions group (#922) Bumps the github-actions group with 1 update: [actions/checkout](https://github.com/actions/checkout). Updates `actions/checkout` from 6 to 7 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v6...v7) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): bump the dev-patch-updates group with 11 updates (#923) Bumps the dev-patch-updates group with 11 updates: | Package | From | To | | --- | --- | --- | | [@codemirror/search](https://github.com/codemirror/search) | `6.7.0` | `6.7.1` | | [@codemirror/view](https://github.com/codemirror/view) | `6.43.0` | `6.43.1` | | [@tailwindcss/vite](https://github.com/tailwindlabs/tailwindcss/tree/HEAD/packages/@tailwindcss-vite) | `4.3.0` | `4.3.1` | | [@vitest/coverage-v8](https://github.com/vitest-dev/vitest/tree/HEAD/packages/coverage-v8) | `4.1.8` | `4.1.9` | | [@vitest/ui](https://github.com/vitest-dev/vitest/tree/HEAD/packages/ui) | `4.1.8` | `4.1.9` | | [eslint-plugin-react-refresh](https://github.com/ArnaudBarre/eslint-plugin-react-refresh) | `0.5.2` | `0.5.3` | | [lint-staged](https://github.com/lint-staged/lint-staged) | `17.0.7` | `17.0.8` | | [prettier](https://github.com/prettier/prettier) | `3.8.3` | `3.8.4` | | [sharp](https://github.com/lovell/sharp) | `0.35.1` | `0.35.2` | | [tailwindcss](https://github.com/tailwindlabs/tailwindcss/tree/HEAD/packages/tailwindcss) | `4.3.0` | `4.3.1` | | [vitest](https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest) | `4.1.8` | `4.1.9` | Updates `@codemirror/search` from 6.7.0 to 6.7.1 - [Changelog](https://github.com/codemirror/search/blob/main/CHANGELOG.md) - [Commits](https://github.com/codemirror/search/commits) Updates `@codemirror/view` from 6.43.0 to 6.43.1 - [Changelog](https://github.com/codemirror/view/blob/main/CHANGELOG.md) - [Commits](https://github.com/codemirror/view/commits) Updates `@tailwindcss/vite` from 4.3.0 to 4.3.1 - [Release notes](https://github.com/tailwindlabs/tailwindcss/releases) - [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/tailwindlabs/tailwindcss/commits/v4.3.1/packages/@tailwindcss-vite) Updates `@vitest/coverage-v8` from 4.1.8 to 4.1.9 - [Release notes](https://github.com/vitest-dev/vitest/releases) - [Changelog](https://github.com/vitest-dev/vitest/blob/main/docs/releases.md) - [Commits](https://github.com/vitest-dev/vitest/commits/v4.1.9/packages/coverage-v8) Updates `@vitest/ui` from 4.1.8 to 4.1.9 - [Release notes](https://github.com/vitest-dev/vitest/releases) - [Changelog](https://github.com/vitest-dev/vitest/blob/main/docs/releases.md) - [Commits](https://github.com/vitest-dev/vitest/commits/v4.1.9/packages/ui) Updates `eslint-plugin-react-refresh` from 0.5.2 to 0.5.3 - [Release notes](https://github.com/ArnaudBarre/eslint-plugin-react-refresh/releases) - [Changelog](https://github.com/ArnaudBarre/eslint-plugin-react-refresh/blob/main/CHANGELOG.md) - [Commits](https://github.com/ArnaudBarre/eslint-plugin-react-refresh/compare/v0.5.2...v0.5.3) Updates `lint-staged` from 17.0.7 to 17.0.8 - [Release notes](https://github.com/lint-staged/lint-staged/releases) - [Changelog](https://github.com/lint-staged/lint-staged/blob/main/CHANGELOG.md) - [Commits](https://github.com/lint-staged/lint-staged/compare/v17.0.7...v17.0.8) Updates `prettier` from 3.8.3 to 3.8.4 - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/3.8.3...3.8.4) Updates `sharp` from 0.35.1 to 0.35.2 - [Release notes](https://github.com/lovell/sharp/releases) - [Commits](https://github.com/lovell/sharp/compare/v0.35.1...v0.35.2) Updates `tailwindcss` from 4.3.0 to 4.3.1 - [Release notes](https://github.com/tailwindlabs/tailwindcss/releases) - [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/tailwindlabs/tailwindcss/commits/v4.3.1/packages/tailwindcss) Updates `vitest` from 4.1.8 to 4.1.9 - [Release notes](https://github.com/vitest-dev/vitest/releases) - [Changelog](https://github.com/vitest-dev/vitest/blob/main/docs/releases.md) - [Commits](https://github.com/vitest-dev/vitest/commits/v4.1.9/packages/vitest) --- updated-dependencies: - dependency-name: "@codemirror/search" dependency-version: 6.7.1 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dev-patch-updates - dependency-name: "@codemirror/view" dependency-version: 6.43.1 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dev-patch-updates - dependency-name: "@tailwindcss/vite" dependency-version: 4.3.1 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dev-patch-updates - dependency-name: "@vitest/coverage-v8" dependency-version: 4.1.9 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dev-patch-updates - dependency-name: "@vitest/ui" dependency-version: 4.1.9 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dev-patch-updates - dependency-name: eslint-plugin-react-refresh dependency-version: 0.5.3 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dev-patch-updates - dependency-name: lint-staged dependency-version: 17.0.8 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dev-patch-updates - dependency-name: prettier dependency-version: 3.8.4 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dev-patch-updates - dependency-name: sharp dependency-version: 0.35.2 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dev-patch-updates - dependency-name: tailwindcss dependency-version: 4.3.1 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dev-patch-updates - dependency-name: vitest dependency-version: 4.1.9 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dev-patch-updates ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump nanoid in the prod-patch-updates group (#925) Bumps the prod-patch-updates group with 1 update: [nanoid](https://github.com/ai/nanoid). Updates `nanoid` from 5.1.11 to 5.1.15 - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](https://github.com/ai/nanoid/compare/5.1.11...5.1.15) --- updated-dependencies: - dependency-name: nanoid dependency-version: 5.1.15 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod-patch-updates ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump the major-updates group with 5 updates (#926) Bumps the major-updates group with 5 updates: | Package | From | To | | --- | --- | --- | | [js-yaml](https://github.com/nodeca/js-yaml) | `4.2.0` | `5.0.0` | | [@eslint/js](https://github.com/eslint/eslint/tree/HEAD/packages/js) | `9.39.4` | `10.0.1` | | [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) | `25.9.2` | `26.0.0` | | [concurrently](https://github.com/open-cli-tools/concurrently) | `9.2.1` | `10.0.3` | | [eslint](https://github.com/eslint/eslint) | `9.39.4` | `10.5.0` | Updates `js-yaml` from 4.2.0 to 5.0.0 - [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md) - [Commits](https://github.com/nodeca/js-yaml/compare/4.2.0...5.0.0) Updates `@eslint/js` from 9.39.4 to 10.0.1 - [Release notes](https://github.com/eslint/eslint/releases) - [Commits](https://github.com/eslint/eslint/commits/v10.0.1/packages/js) Updates `@types/node` from 25.9.2 to 26.0.0 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) Updates `concurrently` from 9.2.1 to 10.0.3 - [Release notes](https://github.com/open-cli-tools/concurrently/releases) - [Commits](https://github.com/open-cli-tools/concurrently/compare/v9.2.1...v10.0.3) Updates `eslint` from 9.39.4 to 10.5.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Commits](https://github.com/eslint/eslint/compare/v9.39.4...v10.5.0) --- updated-dependencies: - dependency-name: js-yaml dependency-version: 5.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: major-updates - dependency-name: "@eslint/js" dependency-version: 10.0.1 dependency-type: direct:development update-type: version-update:semver-major dependency-group: major-updates - dependency-name: "@types/node" dependency-version: 26.0.0 dependency-type: direct:development update-type: version-update:semver-major dependency-group: major-updates - dependency-name: concurrently dependency-version: 10.0.3 dependency-type: direct:development update-type: version-update:semver-major dependency-group: major-updates - dependency-name: eslint dependency-version: 10.5.0 dependency-type: direct:development update-type: version-update:semver-major dependency-group: major-updates ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * feat(ssh): add HashiCorp Vault SSH signer authentication * fix: small fixes to vault feature to align with Termix codebase * chore: add view docs links for vault/termix id * fix: file upload fails with 400 and missing schema migrations on upgrade (#929) Two bugs introduced in v2.4.1: 1. uploadFileStream uses fileManagerApi.post() which triggers axios's transformRequest to JSON-serialize the FormData because the instance default Content-Type is application/json. Change to postForm() which sets Content-Type: multipart/form-data so the browser XHR sends the correct multipart body with boundary. 2. Two schema items added to schema.ts were not included in migrateSchema() in db/index.ts, causing 500 errors on existing installations upgrading from v2.4.0: - user_preferences.status_color_scheme (no such column) - dashboard_service_links table (no such table) Fixes #928 Co-authored-by: sash <sash@fominykh.io> * fix: support PuTTY PPK ssh keys (#930) * fix: chunk large file manager uploads (#932) * fix: route dashboard hosts by protocol (#934) * fix: resolve tunnel endpoints reliably (#935) * Fix Electron OIDC browser auth failures (#936) * Allow RDP connections without stored credentials (#937) * Sync role credential shares for OIDC users (#938) * Fix terminal link dialog layering (#940) * Confirm large files before opening editor (#942) * Confirm closing active host connections (#943) * Preserve file path case in file manager UI (#941) * fix: preserve unicode guacamole tokens (#933) * Persist VNC authentication settings (#944) * Fix Guacamole websocket base path (#946) * Promote file manager terminals to tabs (#939) * Guard Guacamole disconnect during startup (#945) * chore: increment ver * feat: bitwarden ssh agent integration * feat: serial connections support * fix: various small bug fixes * feat: open all sessions in a folder and terminal custom theme color support * feat: cross host file manager clipboard and several small bug fixes * feat: tailscale/wireguard support and added a new status state for when backend is checking status * feat: grafana like server stats history, new alert system, ntfy/webhook support * feat: new grid and widget based homepage function * feat: new donate button in dashboard * fix: alert ui incorrectly using termix css and fixed issue with alert system not loading * chore: fix ci checks (#966) * Fix dashboard service link creation (#950) * Fix jump host SOCKS5 proxy selection (#951) * Fix jump host SOCKS5 proxy selection * fix: type jump host socks proxy config * Fix tmux detection path handling (#949) * Support GUACD_URL environment config (#952) * Retry autostart tunnel host fetches (#953) * Retry autostart tunnel host fetches * chore: format tunnel route * Fix PUID html ownership in Docker entrypoint (#954) * feat: allow custom tunnel endpoints (#977) * fix: skip metrics start for non-ssh hosts (#976) * Fix Proxmox import auth fallback (#956) * Fix Proxmox import auth fallback * chore: format proxmox import auth * Fix SSH heading syntax highlighting (#955) * Fix SSH heading syntax highlighting * chore: format terminal highlighter * Initialize auth before fullscreen terminal routes (#957) * Add WebAuthn passkey authentication (#959) * chore: add Biome tooling (#965) * chore: add biome tooling * chore: support tailwind syntax in biome * Fix VNC required argument handshake (#968) * Prioritize host results in command palette search (#969) * Prevent sidebar host hover layout shift (#970) * Add terminal font zoom with mouse wheel (#971) * Add host temperature metrics card (#972) * Make file downloads reliable in desktop app (#973) * Add app rail hover expansion setting (#974) * fix: use correct translation key for nav.close (#964) * fix(tunnel): skip endpoint credential validation for direct tunnels (#963) * fix: SSH port connection bug (#975) * fix: chunked upload for files >=1.5GB to bypass browser ArrayBuffer limit (#948) * feat: support SSH agent auth across SSH features (#960) * feat: add Podman container runtime support (#958) * chore: update readme and release notes * fix: stabilize Windows app icon (#978) * Add safe host sharing export (#979) * Add external editor support for file manager (#985) * Rework SSH credential password handling (#984) * Support password fallback for SSH key credentials * Complete SSH credential password fallback * Fix runtime base path for auth callbacks (#982) * Fix TUI terminal output highlighting (#983) Co-authored-by: LukeGus <bugattiguy527@gmail.com> * Add app fullscreen mode (#993) * Fix host metrics startup polling (#986) * chore: update release notes * fix: line chart text overlap * chore: update RELEASE_NOTES.md * chore: add donation goal to readme * chore: update readme * fix: hide full-screen button in electron app * fix: failed unit tests * chore: lint, format, and bump version to 2.5.0 * chore: remove timeout from crowdin translate * chore: sync Crowdin translations for 2.5.0 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: DivByZero <mr.oplus@yahoo.fr> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: devdanetra <46488477+devdanetra@users.noreply.github.com> Co-authored-by: Aleksandr Fominykh <neoformalex@users.noreply.github.com> Co-authored-by: sash <sash@fominykh.io> Co-authored-by: ZacharyZcR <zacharyzcr1984@gmail.com>
266 lines
7.8 KiB
TypeScript
266 lines
7.8 KiB
TypeScript
// Pure (DB-free) HashiCorp Vault SSH signer logic: ephemeral key generation,
|
|
// the Vault OIDC HTTP flow, certificate signing, and certificate parsing.
|
|
//
|
|
// Kept separate from vault-signer-auth.ts (which adds the encrypted per-user
|
|
// certificate cache) so this layer can be unit-tested without the native SQLite
|
|
// dependency.
|
|
|
|
import crypto from "crypto";
|
|
import ssh2Pkg from "ssh2";
|
|
import { sshLogger } from "../utils/logger.js";
|
|
|
|
const { utils: ssh2Utils } = ssh2Pkg;
|
|
|
|
export interface VaultProfileConfig {
|
|
id: number;
|
|
vaultAddr: string;
|
|
vaultNamespace?: string | null;
|
|
oidcMount?: string | null;
|
|
oidcRole?: string | null;
|
|
sshMount?: string | null;
|
|
sshRole: string;
|
|
validPrincipals?: string | null;
|
|
keyType?: string | null;
|
|
}
|
|
|
|
export interface EphemeralKeyPair {
|
|
privateKey: string;
|
|
publicKey: string;
|
|
}
|
|
|
|
export function normalizeAddr(addr: string): string {
|
|
return addr.trim().replace(/\/+$/, "");
|
|
}
|
|
|
|
export function trimMount(
|
|
mount: string | null | undefined,
|
|
fallback: string,
|
|
): string {
|
|
return (mount?.trim() || fallback).replace(/^\/+|\/+$/g, "");
|
|
}
|
|
|
|
function vaultHeaders(profile: VaultProfileConfig): Record<string, string> {
|
|
const headers: Record<string, string> = {};
|
|
if (profile.vaultNamespace?.trim()) {
|
|
headers["X-Vault-Namespace"] = profile.vaultNamespace.trim();
|
|
}
|
|
return headers;
|
|
}
|
|
|
|
async function vaultRequest(
|
|
url: string,
|
|
method: "GET" | "POST" | "PUT",
|
|
headers: Record<string, string>,
|
|
body?: Record<string, unknown>,
|
|
): Promise<any> {
|
|
let response: Response;
|
|
try {
|
|
response = await fetch(url, {
|
|
method,
|
|
headers: {
|
|
...(body ? { "Content-Type": "application/json" } : {}),
|
|
...headers,
|
|
},
|
|
body: body ? JSON.stringify(body) : undefined,
|
|
});
|
|
} catch (e) {
|
|
throw new Error(
|
|
`Failed to reach Vault at ${url}: ${
|
|
e instanceof Error ? e.message : String(e)
|
|
}`,
|
|
);
|
|
}
|
|
|
|
const text = await response.text();
|
|
let json: any;
|
|
if (text) {
|
|
try {
|
|
json = JSON.parse(text);
|
|
} catch {
|
|
// leave undefined for non-JSON bodies
|
|
}
|
|
}
|
|
|
|
if (!response.ok) {
|
|
const errs =
|
|
json && Array.isArray(json.errors) && json.errors.length
|
|
? json.errors.join("; ")
|
|
: text || `HTTP ${response.status}`;
|
|
throw new Error(`Vault request failed (${response.status}): ${errs}`);
|
|
}
|
|
return json;
|
|
}
|
|
|
|
/** Generate an ephemeral SSH keypair in OpenSSH format. */
|
|
export function generateEphemeralKeyPair(
|
|
keyType?: string | null,
|
|
): EphemeralKeyPair {
|
|
let ssh2Type: "ed25519" | "rsa" | "ecdsa" = "ed25519";
|
|
const options: { bits?: number } = {};
|
|
switch ((keyType || "ssh-ed25519").trim()) {
|
|
case "ssh-rsa":
|
|
ssh2Type = "rsa";
|
|
options.bits = 4096;
|
|
break;
|
|
case "ecdsa-sha2-nistp256":
|
|
ssh2Type = "ecdsa";
|
|
options.bits = 256;
|
|
break;
|
|
case "ssh-ed25519":
|
|
default:
|
|
ssh2Type = "ed25519";
|
|
break;
|
|
}
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
const pair = ssh2Utils.generateKeyPairSync(ssh2Type as any, options);
|
|
return { privateKey: pair.private, publicKey: pair.public };
|
|
}
|
|
|
|
/**
|
|
* Start a Vault OIDC login: returns the IdP auth URL plus the state/nonce
|
|
* needed to complete the callback. `redirectUri` must be allowed both by the
|
|
* Vault role's allowed_redirect_uris and by the IdP.
|
|
*/
|
|
export async function startVaultOidc(
|
|
profile: VaultProfileConfig,
|
|
redirectUri: string,
|
|
): Promise<{ authUrl: string; state: string; clientNonce: string }> {
|
|
const addr = normalizeAddr(profile.vaultAddr);
|
|
const mount = trimMount(profile.oidcMount, "oidc");
|
|
const clientNonce = crypto.randomBytes(20).toString("hex");
|
|
|
|
const json = await vaultRequest(
|
|
`${addr}/v1/auth/${mount}/oidc/auth_url`,
|
|
"POST",
|
|
vaultHeaders(profile),
|
|
{
|
|
role: profile.oidcRole?.trim() || "",
|
|
redirect_uri: redirectUri,
|
|
client_nonce: clientNonce,
|
|
},
|
|
);
|
|
|
|
const authUrl: string | undefined = json?.data?.auth_url;
|
|
if (!authUrl) {
|
|
throw new Error("Vault did not return an OIDC auth_url");
|
|
}
|
|
|
|
// Vault embeds the state it generated in the auth_url; we need it to correlate
|
|
// the browser callback back to this login attempt.
|
|
let state = "";
|
|
try {
|
|
state = new URL(authUrl).searchParams.get("state") || "";
|
|
} catch {
|
|
const m = authUrl.match(/[?&]state=([^&]+)/);
|
|
state = m ? decodeURIComponent(m[1]) : "";
|
|
}
|
|
if (!state) {
|
|
throw new Error("Could not determine OIDC state from Vault auth_url");
|
|
}
|
|
|
|
return { authUrl, state, clientNonce };
|
|
}
|
|
|
|
/** Complete the Vault OIDC callback and return a short-lived Vault token. */
|
|
export async function completeVaultOidc(
|
|
profile: VaultProfileConfig,
|
|
params: { state: string; code: string; clientNonce: string },
|
|
): Promise<string> {
|
|
const addr = normalizeAddr(profile.vaultAddr);
|
|
const mount = trimMount(profile.oidcMount, "oidc");
|
|
|
|
const url = new URL(`${addr}/v1/auth/${mount}/oidc/callback`);
|
|
url.searchParams.set("state", params.state);
|
|
url.searchParams.set("code", params.code);
|
|
url.searchParams.set("client_nonce", params.clientNonce);
|
|
|
|
const json = await vaultRequest(url.toString(), "GET", vaultHeaders(profile));
|
|
const token: string | undefined = json?.auth?.client_token;
|
|
if (!token) {
|
|
throw new Error("Vault OIDC callback did not return a client token");
|
|
}
|
|
return token;
|
|
}
|
|
|
|
/** Sign an SSH public key with Vault, returning the OpenSSH certificate line. */
|
|
export async function signWithVault(
|
|
profile: VaultProfileConfig,
|
|
vaultToken: string,
|
|
publicKey: string,
|
|
): Promise<string> {
|
|
const addr = normalizeAddr(profile.vaultAddr);
|
|
const mount = trimMount(profile.sshMount, "ssh-client-signer");
|
|
|
|
const headers = { ...vaultHeaders(profile), "X-Vault-Token": vaultToken };
|
|
const body: Record<string, unknown> = {
|
|
public_key: publicKey.trim(),
|
|
cert_type: "user",
|
|
};
|
|
if (profile.validPrincipals?.trim()) {
|
|
body.valid_principals = profile.validPrincipals.trim();
|
|
}
|
|
|
|
const json = await vaultRequest(
|
|
`${addr}/v1/${mount}/sign/${encodeURIComponent(profile.sshRole.trim())}`,
|
|
"POST",
|
|
headers,
|
|
body,
|
|
);
|
|
const signedKey: string | undefined = json?.data?.signed_key;
|
|
if (!signedKey) {
|
|
throw new Error("Vault sign response did not include a signed_key");
|
|
}
|
|
return signedKey.trim();
|
|
}
|
|
|
|
/**
|
|
* Parse the "valid before" Unix timestamp out of an OpenSSH certificate.
|
|
* Returns 0 if it can't be parsed (caller falls back to a conservative TTL).
|
|
*/
|
|
export function parseCertValidBefore(signedKey: string): number {
|
|
try {
|
|
const parts = signedKey.trim().split(/\s+/);
|
|
if (parts.length < 2) return 0;
|
|
const certType = parts[0];
|
|
const blob = Buffer.from(parts[1], "base64");
|
|
|
|
let pos = 0;
|
|
const readString = (): void => {
|
|
const len = blob.readUInt32BE(pos);
|
|
pos += 4 + len;
|
|
};
|
|
const readUint64 = (): number => {
|
|
const hi = blob.readUInt32BE(pos);
|
|
const lo = blob.readUInt32BE(pos + 4);
|
|
pos += 8;
|
|
return hi * 0x100000000 + lo;
|
|
};
|
|
|
|
readString(); // format id
|
|
readString(); // nonce
|
|
|
|
let keyFields: number;
|
|
if (certType.startsWith("ssh-ed25519")) keyFields = 1;
|
|
else if (certType.startsWith("ecdsa-sha2-")) keyFields = 2;
|
|
else if (certType.startsWith("ssh-rsa")) keyFields = 2;
|
|
else if (certType.startsWith("ssh-dss")) keyFields = 4;
|
|
else if (certType.startsWith("sk-ssh-ed25519")) keyFields = 2;
|
|
else if (certType.startsWith("sk-ecdsa-sha2-")) keyFields = 3;
|
|
else return 0;
|
|
for (let i = 0; i < keyFields; i++) readString();
|
|
|
|
readUint64(); // serial
|
|
pos += 4; // type (uint32)
|
|
readString(); // key id
|
|
readString(); // valid principals
|
|
readUint64(); // valid after
|
|
return readUint64(); // valid before
|
|
} catch (e) {
|
|
sshLogger.warn("Failed to parse Vault-signed certificate expiry", {
|
|
operation: "vault_cert_parse",
|
|
error: e instanceof Error ? e.message : String(e),
|
|
});
|
|
return 0;
|
|
}
|
|
}
|