mirror of
https://github.com/Termix-SSH/Termix.git
synced 2026-07-09 16:47:22 +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>
245 lines
8.7 KiB
JavaScript
245 lines
8.7 KiB
JavaScript
const fs = require("fs");
|
|
const path = require("path");
|
|
|
|
const guacdClientPath = path.join(
|
|
__dirname,
|
|
"..",
|
|
"node_modules",
|
|
"guacamole-lite",
|
|
"lib",
|
|
"GuacdClient.js",
|
|
);
|
|
const cryptPath = path.join(
|
|
__dirname,
|
|
"..",
|
|
"node_modules",
|
|
"guacamole-lite",
|
|
"lib",
|
|
"Crypt.js",
|
|
);
|
|
|
|
if (!fs.existsSync(guacdClientPath) || !fs.existsSync(cryptPath)) {
|
|
console.log("[patch-guacamole-lite] File not found, skipping");
|
|
process.exit(0);
|
|
}
|
|
|
|
let guacdClientContent = fs.readFileSync(guacdClientPath, "utf8");
|
|
let cryptContent = fs.readFileSync(cryptPath, "utf8");
|
|
|
|
// Patch 1: version acceptance list
|
|
const oldVersionCheck = "if (version === '1_0_0' || version === '1_1_0') {";
|
|
const newVersionCheck =
|
|
"if (version === '1_0_0' || version === '1_1_0' || version === '1_3_0' || version === '1_5_0') {";
|
|
|
|
// Patch 2: timezone instruction must be sent for all protocols >= 1.1.0, not just 1.1.0
|
|
const oldTimezone = "if (protocolVersion === '1_1_0') {";
|
|
const newTimezone = "if (protocolVersion !== '1_0_0') {";
|
|
|
|
// Patch 3: send the `name` handshake instruction for protocol >= 1.3.0.
|
|
// The Guacamole protocol added the `name` instruction in 1.3.0 (an optional
|
|
// human-readable identifier for the joining user). guacd 1.6.0 began requiring
|
|
// it during the VNC handshake even when negotiating older protocol versions,
|
|
// causing connections to silently drop right after "User joined". See
|
|
// Termix-SSH/Support#567 and #734.
|
|
const oldConnect =
|
|
" this.sendInstruction(['connect'].concat(connectArgs));";
|
|
const newConnect =
|
|
" if (protocolVersion === '1_3_0' || protocolVersion === '1_5_0') {\n" +
|
|
" this.sendInstruction(['name', this.connectionSettings.name || 'guacamole-lite']);\n" +
|
|
" }\n" +
|
|
"\n" +
|
|
" this.sendInstruction(['connect'].concat(connectArgs));";
|
|
|
|
// Patch 4: answer guacd's dynamic argument requests locally.
|
|
// macOS Screen Sharing can request VNC username/password through the
|
|
// post-handshake `required`/`require` flow. guacamole-lite forwards those
|
|
// instructions to the browser, but Termix already keeps the credentials in the
|
|
// server-side token and the browser does not provide an onrequired handler.
|
|
const oldSendBuffer =
|
|
" this.lastActivity = Date.now();\n" + " this.sendBuffer = '';";
|
|
const newSendBuffer =
|
|
" this.lastActivity = Date.now();\n" +
|
|
" this.sendBuffer = '';\n" +
|
|
" this.nextArgumentStreamIndex = 0;";
|
|
|
|
const oldSendInstructionBlock =
|
|
" sendInstruction(instruction) {\n" +
|
|
" // convert every element in the instruction array to a string. convert null to an empty string\n" +
|
|
" instruction = instruction.map((element) => {\n" +
|
|
" if (element === null || element === undefined) {\n" +
|
|
" return '';\n" +
|
|
" }\n" +
|
|
" return String(element);\n" +
|
|
" });\n" +
|
|
"\n" +
|
|
" const instructionString = GuacamoleParser.toInstruction(instruction);\n" +
|
|
" this.send(instructionString);\n" +
|
|
" }\n";
|
|
const newSendInstructionBlock =
|
|
oldSendInstructionBlock +
|
|
"\n" +
|
|
" sendArgumentValue(name, value) {\n" +
|
|
" const stream = this.nextArgumentStreamIndex++;\n" +
|
|
" this.sendInstruction(['argv', stream, 'text/plain', name]);\n" +
|
|
" this.sendInstruction(['blob', stream, Buffer.from(String(value ?? ''), 'utf8').toString('base64')]);\n" +
|
|
" this.sendInstruction(['end', stream]);\n" +
|
|
" }\n" +
|
|
"\n" +
|
|
" sendRequiredArguments(params) {\n" +
|
|
" params.forEach((name) => {\n" +
|
|
" this.sendArgumentValue(name, this.connectionSettings[name]);\n" +
|
|
" });\n" +
|
|
" }\n";
|
|
|
|
const oldReadyHandler =
|
|
' // Handle "ready" instruction\n' +
|
|
" if (opcode === 'ready') {";
|
|
const newReadyHandler =
|
|
" // Handle dynamic argument requests from guacd\n" +
|
|
" if (opcode === 'required' || opcode === 'require') {\n" +
|
|
" this.sendRequiredArguments(params);\n" +
|
|
" return;\n" +
|
|
" }\n" +
|
|
"\n" +
|
|
oldReadyHandler;
|
|
|
|
let patched = false;
|
|
|
|
if (!guacdClientContent.includes(newVersionCheck)) {
|
|
if (!guacdClientContent.includes(oldVersionCheck)) {
|
|
console.log(
|
|
"[patch-guacamole-lite] Version check target not found, skipping",
|
|
);
|
|
process.exit(0);
|
|
}
|
|
guacdClientContent = guacdClientContent.replace(
|
|
oldVersionCheck,
|
|
newVersionCheck,
|
|
);
|
|
patched = true;
|
|
}
|
|
|
|
if (!guacdClientContent.includes(newTimezone)) {
|
|
if (!guacdClientContent.includes(oldTimezone)) {
|
|
console.log("[patch-guacamole-lite] Timezone target not found, skipping");
|
|
process.exit(0);
|
|
}
|
|
guacdClientContent = guacdClientContent.replace(oldTimezone, newTimezone);
|
|
patched = true;
|
|
}
|
|
|
|
if (!guacdClientContent.includes(newConnect)) {
|
|
if (!guacdClientContent.includes(oldConnect)) {
|
|
console.log(
|
|
"[patch-guacamole-lite] Connect target not found, skipping name patch",
|
|
);
|
|
process.exit(0);
|
|
}
|
|
guacdClientContent = guacdClientContent.replace(oldConnect, newConnect);
|
|
patched = true;
|
|
}
|
|
|
|
if (!guacdClientContent.includes("this.nextArgumentStreamIndex = 0;")) {
|
|
if (!guacdClientContent.includes(oldSendBuffer)) {
|
|
console.log(
|
|
"[patch-guacamole-lite] Argument stream index target not found, skipping",
|
|
);
|
|
process.exit(0);
|
|
}
|
|
guacdClientContent = guacdClientContent.replace(oldSendBuffer, newSendBuffer);
|
|
patched = true;
|
|
}
|
|
|
|
if (!guacdClientContent.includes("sendRequiredArguments(params) {")) {
|
|
if (!guacdClientContent.includes(oldSendInstructionBlock)) {
|
|
console.log(
|
|
"[patch-guacamole-lite] Required argument helper target not found, skipping",
|
|
);
|
|
process.exit(0);
|
|
}
|
|
guacdClientContent = guacdClientContent.replace(
|
|
oldSendInstructionBlock,
|
|
newSendInstructionBlock,
|
|
);
|
|
patched = true;
|
|
}
|
|
|
|
if (
|
|
!guacdClientContent.includes("opcode === 'required' || opcode === 'require'")
|
|
) {
|
|
if (!guacdClientContent.includes(oldReadyHandler)) {
|
|
console.log(
|
|
"[patch-guacamole-lite] Required opcode target not found, skipping",
|
|
);
|
|
process.exit(0);
|
|
}
|
|
guacdClientContent = guacdClientContent.replace(
|
|
oldReadyHandler,
|
|
newReadyHandler,
|
|
);
|
|
patched = true;
|
|
}
|
|
|
|
// Patch 5: guacamole-lite decrypts token JSON through ASCII/binary strings,
|
|
// which corrupts IV/ciphertext bytes and non-ASCII connection settings such as
|
|
// RDP/VNC passwords with umlauts. Keep the encrypted fields as Buffers and
|
|
// decode the plaintext JSON as UTF-8.
|
|
const oldDecryptBlock =
|
|
" let encoded = JSON.parse(this.constructor.base64decode(encodedString));\n" +
|
|
"\n" +
|
|
" encoded.iv = this.constructor.base64decode(encoded.iv);\n" +
|
|
" encoded.value = this.constructor.base64decode(encoded.value, 'binary');\n" +
|
|
"\n" +
|
|
" const decipher = Crypto.createDecipheriv(this.cypher, this.key, encoded.iv);\n" +
|
|
"\n" +
|
|
" let decrypted = decipher.update(encoded.value, 'binary', 'ascii');\n" +
|
|
" decrypted += decipher.final('ascii');";
|
|
const oldPartiallyPatchedDecryptBlock =
|
|
" let encoded = JSON.parse(this.constructor.base64decode(encodedString));\n" +
|
|
"\n" +
|
|
" encoded.iv = this.constructor.base64decode(encoded.iv);\n" +
|
|
" encoded.value = this.constructor.base64decode(encoded.value, 'binary');\n" +
|
|
"\n" +
|
|
" const decipher = Crypto.createDecipheriv(this.cypher, this.key, encoded.iv);\n" +
|
|
"\n" +
|
|
" let decrypted = decipher.update(encoded.value, 'binary', 'utf8');\n" +
|
|
" decrypted += decipher.final('utf8');";
|
|
const newDecryptBlock =
|
|
" const encoded = JSON.parse(Buffer.from(encodedString, 'base64').toString('utf8'));\n" +
|
|
"\n" +
|
|
" const iv = Buffer.from(encoded.iv, 'base64');\n" +
|
|
" const value = Buffer.from(encoded.value, 'base64');\n" +
|
|
"\n" +
|
|
" const decipher = Crypto.createDecipheriv(this.cypher, this.key, iv);\n" +
|
|
"\n" +
|
|
" let decrypted = decipher.update(value, undefined, 'utf8');\n" +
|
|
" decrypted += decipher.final('utf8');";
|
|
|
|
if (!cryptContent.includes(newDecryptBlock)) {
|
|
if (cryptContent.includes(oldDecryptBlock)) {
|
|
cryptContent = cryptContent.replace(oldDecryptBlock, newDecryptBlock);
|
|
} else if (cryptContent.includes(oldPartiallyPatchedDecryptBlock)) {
|
|
cryptContent = cryptContent.replace(
|
|
oldPartiallyPatchedDecryptBlock,
|
|
newDecryptBlock,
|
|
);
|
|
} else {
|
|
console.log(
|
|
"[patch-guacamole-lite] UTF-8 token decrypt target not found, skipping",
|
|
);
|
|
process.exit(0);
|
|
}
|
|
patched = true;
|
|
}
|
|
|
|
if (!patched) {
|
|
console.log("[patch-guacamole-lite] Already patched");
|
|
process.exit(0);
|
|
}
|
|
|
|
fs.writeFileSync(guacdClientPath, guacdClientContent);
|
|
fs.writeFileSync(cryptPath, cryptContent);
|
|
console.log(
|
|
"[patch-guacamole-lite] Patched protocol VERSION_1_3_0/1_5_0 support, name handshake, required arguments, and UTF-8 token decrypt",
|
|
);
|