feat: guacd improvements, created tool bar

2026-07-16 05:13:36 +00:00 · 2026-05-21 22:35:58 -05:00
parent 23a0160ef0
commit 6bcbadcc25
9 changed files with 1131 additions and 267 deletions
@@ -1617,9 +1617,12 @@ async function deploySSHKeyToHost(
          const escapedKey = actualPublicKey
            .replace(/\\/g, "\\\\")
            .replace(/'/g, "'\\''");
+          const escapedName = credData.name
+            .replace(/\\/g, "\\\\")
+            .replace(/'/g, "'\\''");

          conn.exec(
-            `printf '%s\n' '${escapedKey} ${credData.name}@Termix' >> ~/.ssh/authorized_keys && chmod 600 ~/.ssh/authorized_keys`,
+            `printf '%s\n' '${escapedKey} ${escapedName}@Termix' >> ~/.ssh/authorized_keys && chmod 600 ~/.ssh/authorized_keys`,
            (err, stream) => {
              if (err) {
                clearTimeout(addTimeout);
@@ -43,6 +43,8 @@ const router = express.Router();

 const upload = multer({ storage: multer.memoryStorage() });

+const STATS_SERVER_URL = "http://localhost:30005";
+
 function notifyStatsHostUpdated(
  hostId: number,
  headers: Pick<Request["headers"], "authorization" | "cookie">,
@@ -50,7 +52,7 @@ function notifyStatsHostUpdated(
 ): void {
  axios
    .post(
-      "http://localhost:30005/host-updated",
+      `${STATS_SERVER_URL}/host-updated`,
      { hostId },
      {
        headers: {
@@ -1926,9 +1928,21 @@ router.get(
      const exportData = isRemoteDesktop
        ? {
            ...baseExportData,
-            domain: resolvedHost.domain || null,
-            security: resolvedHost.security || null,
-            ignoreCert: !!resolvedHost.ignoreCert,
+            enableRdp: !!resolvedHost.enableRdp,
+            enableVnc: !!resolvedHost.enableVnc,
+            enableTelnet: !!resolvedHost.enableTelnet,
+            rdpPort: resolvedHost.rdpPort || 3389,
+            vncPort: resolvedHost.vncPort || 5900,
+            telnetPort: resolvedHost.telnetPort || 23,
+            rdpUser: resolvedHost.rdpUser || null,
+            rdpPassword: resolvedHost.rdpPassword || null,
+            rdpDomain: resolvedHost.rdpDomain || null,
+            rdpSecurity: resolvedHost.rdpSecurity || null,
+            rdpIgnoreCert: !!resolvedHost.rdpIgnoreCert,
+            vncUser: resolvedHost.vncUser || null,
+            vncPassword: resolvedHost.vncPassword || null,
+            telnetUser: resolvedHost.telnetUser || null,
+            telnetPassword: resolvedHost.telnetPassword || null,
            guacamoleConfig: resolvedHost.guacamoleConfig
              ? JSON.parse(resolvedHost.guacamoleConfig as string)
              : null,
@@ -2252,9 +2266,8 @@ router.delete(

      try {
        const axios = (await import("axios")).default;
-        const statsPort = 30005;
        await axios.post(
-          `http://localhost:${statsPort}/host-deleted`,
+          `${STATS_SERVER_URL}/host-deleted`,
          { hostId: numericHostId },
          {
            headers: {
@@ -3429,11 +3442,10 @@ router.delete(

      try {
        const axios = (await import("axios")).default;
-        const statsPort = 30005;
        for (const host of hostsToDelete) {
          try {
            await axios.post(
-              `http://localhost:${statsPort}/host-deleted`,
+              `${STATS_SERVER_URL}/host-deleted`,
              { hostId: host.id },
              {
                headers: {
@@ -3853,9 +3865,21 @@ router.post(
          sshDataObj.key = null;
          sshDataObj.keyPassword = null;
          sshDataObj.keyType = null;
-          sshDataObj.domain = hostData.domain || null;
-          sshDataObj.security = hostData.security || null;
-          sshDataObj.ignoreCert = hostData.ignoreCert ? 1 : 0;
+          sshDataObj.rdpUser = hostData.rdpUser || null;
+          sshDataObj.rdpPassword = hostData.rdpPassword || null;
+          sshDataObj.rdpDomain = hostData.rdpDomain || null;
+          sshDataObj.rdpSecurity = hostData.rdpSecurity || null;
+          sshDataObj.rdpIgnoreCert = hostData.rdpIgnoreCert ? 1 : 0;
+          sshDataObj.rdpPort = hostData.rdpPort || 3389;
+          sshDataObj.vncUser = hostData.vncUser || null;
+          sshDataObj.vncPassword = hostData.vncPassword || null;
+          sshDataObj.vncPort = hostData.vncPort || 5900;
+          sshDataObj.telnetUser = hostData.telnetUser || null;
+          sshDataObj.telnetPassword = hostData.telnetPassword || null;
+          sshDataObj.telnetPort = hostData.telnetPort || 23;
+          sshDataObj.enableRdp = hostData.enableRdp ? 1 : 0;
+          sshDataObj.enableVnc = hostData.enableVnc ? 1 : 0;
+          sshDataObj.enableTelnet = hostData.enableTelnet ? 1 : 0;
          sshDataObj.guacamoleConfig = hostData.guacamoleConfig
            ? JSON.stringify(hostData.guacamoleConfig)
            : null;
@@ -18,18 +18,52 @@ const authManager = AuthManager.getInstance();
 router.use(authManager.createAuthMiddleware());

 /**
- * POST /guacamole/token
- * Generate an encrypted connection token for guacamole-lite
- *
- * Body: {
- *   type: "rdp" | "vnc" | "telnet",
- *   hostname: string,
- *   port?: number,
- *   username?: string,
- *   password?: string,
- *   domain?: string,
- *   // Additional protocol-specific options
- * }
+ * @openapi
+ * /guacamole/token:
+ *   post:
+ *     summary: Generate an encrypted Guacamole connection token
+ *     description: Creates an AES-256-CBC encrypted token for guacamole-lite with the given connection parameters
+ *     tags:
+ *       - Guacamole
+ *     security:
+ *       - bearerAuth: []
+ *     requestBody:
+ *       required: true
+ *       content:
+ *         application/json:
+ *           schema:
+ *             type: object
+ *             required:
+ *               - type
+ *               - hostname
+ *             properties:
+ *               type:
+ *                 type: string
+ *                 enum: [rdp, vnc, telnet]
+ *               hostname:
+ *                 type: string
+ *               port:
+ *                 type: integer
+ *               username:
+ *                 type: string
+ *               password:
+ *                 type: string
+ *               domain:
+ *                 type: string
+ *     responses:
+ *       200:
+ *         description: Encrypted connection token
+ *         content:
+ *           application/json:
+ *             schema:
+ *               type: object
+ *               properties:
+ *                 token:
+ *                   type: string
+ *       400:
+ *         description: Invalid request
+ *       500:
+ *         description: Server error
 */
 router.post("/token", async (req, res) => {
  try {
@@ -203,9 +237,35 @@ router.post(
      let token: string;
      let hostname = host.ip as string;
      let port = host.port as number;
-      const username = (host.username as string) || "";
-      const password = (host.password as string) || "";
-      const domain = (host.domain as string) || "";
+      let username: string;
+      let password: string;
+
+      switch (connectionType) {
+        case "rdp":
+          username =
+            (host.rdpUser as string) || (host.username as string) || "";
+          password =
+            (host.rdpPassword as string) || (host.password as string) || "";
+          port = (host.rdpPort as number) || port || 3389;
+          break;
+        case "vnc":
+          username = (host.vncUser as string) || "";
+          password =
+            (host.vncPassword as string) || (host.password as string) || "";
+          port = (host.vncPort as number) || port || 5900;
+          break;
+        case "telnet":
+          username = (host.telnetUser as string) || "";
+          password =
+            (host.telnetPassword as string) || (host.password as string) || "";
+          port = (host.telnetPort as number) || port || 23;
+          break;
+        default:
+          username = "";
+          password = "";
+      }
+      const domain =
+        (host.rdpDomain as string) || (host.domain as string) || "";

      // Establish SSH tunnel if jump hosts are configured
      let jumpHosts: Array<{ hostId: number }> = [];
@@ -299,11 +359,18 @@ router.post(
            guacConfig["create-drive-path"] = true;
          }
          token = tokenService.createRdpToken(hostname, username, password, {
-            port: port || 3389,
+            port,
            domain,
-            security: (host.security as string) || undefined,
+            security:
+              (host.rdpSecurity as string) ||
+              (host.security as string) ||
+              undefined,
            "ignore-cert":
-              host.ignoreCert !== undefined ? !!host.ignoreCert : true,
+              host.rdpIgnoreCert !== undefined
+                ? !!host.rdpIgnoreCert
+                : host.ignoreCert !== undefined
+                  ? !!host.ignoreCert
+                  : true,
            ...guacConfig,
          });
          break;
@@ -313,7 +380,7 @@ router.post(
            username || undefined,
            password,
            {
-              port: port || 5900,
+              port,
              security: "any",
              ...guacConfig,
            },
@@ -321,7 +388,7 @@ router.post(
          break;
        case "telnet":
          token = tokenService.createTelnetToken(hostname, username, password, {
-            port: port || 23,
+            port,
            ...guacConfig,
          });
          break;