From c38f23d50e169f51534a18f29ffdc9b8a9a7c2f6 Mon Sep 17 00:00:00 2001
From: Raven Scott <raven@ssh.surf>
Date: Sun, 1 Dec 2024 22:14:26 -0500
Subject: [PATCH] test again

---
 app.js                 |   2 +-
 index.html             |  18 ++---
 libs/dockerTerminal.js | 153 ++++++++++++++++++++++-------------------
 server/server.js       |  78 +++++++++++----------
 4 files changed, 135 insertions(+), 116 deletions(-)

diff --git a/app.js b/app.js
index e1ccba2..df13b68 100644
--- a/app.js
+++ b/app.js
@@ -398,7 +398,7 @@ connectionItem.querySelector('.docker-terminal-btn').addEventListener('click', (
   e.stopPropagation();
   const connection = connections[topicId];
   if (connection && connection.peer) {
-    import('./dockerTerminal.js').then(({ startDockerTerminal }) => {
+    import('./libs/dockerTerminal.js').then(({ startDockerTerminal }) => {
       startDockerTerminal(topicId, connection.peer);
     });
   } else {
diff --git a/index.html b/index.html
index 5ae7e0e..fb2c45d 100644
--- a/index.html
+++ b/index.html
@@ -516,16 +516,16 @@
   </div>
 
   <!-- Docker Terminal Modal -->
-<div id="docker-terminal-modal" style="display: none; flex-direction: column;">
-  <div class="header">
-    <span id="docker-terminal-title"></span>
-    <div>
-      <button id="docker-kill-terminal-btn" class="btn btn-sm btn-danger">
-        <i class="fas fa-times-circle"></i>
-      </button>
-    </div>
+<!-- Docker CLI Terminal Modal -->
+<div id="docker-terminal-modal" class="position-fixed bottom-0 start-0 w-100 max-height-90 bg-dark text-white d-flex flex-column" style="display: none; z-index: 1000;">
+  <div class="header d-flex justify-content-between align-items-center bg-secondary p-2">
+    <span id="docker-terminal-title" class="fw-bold">Docker CLI Terminal</span>
+    <button id="docker-kill-terminal-btn" class="btn btn-sm btn-danger">
+      <i class="fas fa-times-circle"></i>
+    </button>
   </div>
-  <div id="docker-terminal-container" style="flex: 1; overflow: hidden; background-color: black;"></div>
+  <div id="docker-terminal-container" class="flex-grow-1 overflow-hidden" style="background-color: black;"></div>
+  <div id="docker-terminal-resize-handle" class="bg-secondary" style="height: 10px; cursor: ns-resize;"></div>
 </div>
 
   <!-- Alert Container -->
diff --git a/libs/dockerTerminal.js b/libs/dockerTerminal.js
index 31758da..1e3b097 100644
--- a/libs/dockerTerminal.js
+++ b/libs/dockerTerminal.js
@@ -10,87 +10,98 @@ const dockerKillTerminalBtn = document.getElementById('docker-kill-terminal-btn'
 // Terminal variables
 let dockerTerminalSession = null;
 
-// Start Docker CLI terminal session
 function startDockerTerminal(connectionId, peer) {
-  if (!peer) {
-    console.error('[ERROR] No active peer for Docker CLI terminal.');
-    return;
-  }
-
-  if (dockerTerminalSession) {
-    console.log(`[INFO] Docker CLI terminal session already exists for connection: ${connectionId}`);
-    return;
-  }
-
-  console.log(`[INFO] Starting Docker CLI terminal for connection: ${connectionId}`);
-
-  const xterm = new Terminal({
-    cursorBlink: true,
-    theme: { background: '#1a1a1a', foreground: '#ffffff' },
-  });
-  const fitAddon = new FitAddon();
-  xterm.loadAddon(fitAddon);
-
-  dockerTerminalContainer.innerHTML = ''; // Clear previous content
-  xterm.open(dockerTerminalContainer);
-  fitAddon.fit();
-
-  dockerTerminalSession = { xterm, fitAddon, connectionId, peer };
-
-  xterm.onData((input) => {
-    const sanitizedInput = sanitizeDockerCommand(input.trim());
-    if (sanitizedInput) {
-      console.log(`[DEBUG] Sending Docker CLI command: ${sanitizedInput}`);
-      peer.write(
-        JSON.stringify({
-          type: 'dockerCommand',
-          data: sanitizedInput,
-        })
-      );
-    } else {
-      xterm.write('\r\n[ERROR] Invalid command. Only Docker CLI commands are allowed.\r\n');
+    if (!peer) {
+      console.error('[ERROR] No active peer for Docker CLI terminal.');
+      return;
     }
-  });
-
-  peer.on('data', (data) => {
-    try {
-      const response = JSON.parse(data.toString());
-      if (response.type === 'dockerOutput' && response.connectionId === connectionId) {
-        xterm.write(response.data);
+  
+    if (dockerTerminalSession) {
+      console.log('[INFO] Docker CLI terminal session already exists.');
+      return;
+    }
+  
+    const xterm = new Terminal({
+      cursorBlink: true,
+      theme: { background: '#000000', foreground: '#ffffff' },
+    });
+    const fitAddon = new FitAddon();
+    xterm.loadAddon(fitAddon);
+  
+    dockerTerminalContainer.innerHTML = ''; // Clear previous content
+    xterm.open(dockerTerminalContainer);
+    fitAddon.fit();
+  
+    dockerTerminalSession = { xterm, fitAddon, connectionId, peer };
+  
+    let inputBuffer = ''; // Buffer for user input
+  
+    xterm.onData((input) => {
+      if (input === '\r') { // User pressed Enter
+        const sanitizedInput = sanitizeDockerCommand(inputBuffer.trim());
+        if (sanitizedInput) {
+          console.log(`[DEBUG] Sending Docker CLI command: ${sanitizedInput}`);
+          peer.write(
+            JSON.stringify({
+              type: 'dockerCommand',
+              connectionId,
+              data: sanitizedInput,
+            })
+          );
+          xterm.write('\r\n'); // Move to the next line in the terminal
+        } else {
+          xterm.write('\r\n[ERROR] Invalid command. Only Docker CLI commands are allowed.\r\n');
+        }
+        inputBuffer = ''; // Clear the buffer after processing
+      } else if (input === '\u007F') { // Handle backspace
+        if (inputBuffer.length > 0) {
+          inputBuffer = inputBuffer.slice(0, -1); // Remove the last character from the buffer
+          xterm.write('\b \b'); // Erase the character from the terminal display
+        }
+      } else {
+        inputBuffer += input; // Append input to the buffer
+        xterm.write(input); // Display input in the terminal
       }
-    } catch (error) {
-      console.error(`[ERROR] Failed to parse response from peer: ${error.message}`);
-    }
-  });
-
-  dockerTerminalTitle.textContent = `Docker CLI Terminal: ${connectionId}`;
-  dockerTerminalModal.style.display = 'flex';
-}
-
+    });
+  
+    peer.on('data', (data) => {
+      try {
+        const response = JSON.parse(data.toString());
+        if (response.type === 'dockerOutput' && response.connectionId === connectionId) {
+          xterm.write(`${response.data}\r\n`);
+        }
+      } catch (error) {
+        console.error(`[ERROR] Failed to parse response from peer: ${error.message}`);
+      }
+    });
+  
+    dockerTerminalTitle.textContent = `Docker CLI Terminal: ${connectionId}`;
+    dockerTerminalModal.style.display = 'flex';
+  
+    dockerKillTerminalBtn.onclick = () => {
+      cleanUpDockerTerminal();
+    };
+  }
+  
 // Sanitize input to ensure only Docker CLI commands are allowed
 function sanitizeDockerCommand(command) {
-  const allowedCommands = ['docker', 'docker-compose'];
-  const parts = command.split(/\s+/);
-  const baseCommand = parts[0];
-
-  if (allowedCommands.includes(baseCommand)) {
-    return command; // Valid Docker command
+    // Allow commands starting with "docker" and disallow dangerous operators
+    const isValid = /^docker(\s+[\w.-]+)*$/i.test(command);
+    return isValid ? command : null;
   }
 
-  return null; // Invalid command
-}
-
 // Clean up Docker CLI terminal session
 function cleanUpDockerTerminal() {
-  if (dockerTerminalSession) {
-    dockerTerminalSession.xterm.dispose();
-    dockerTerminalSession = null;
-    dockerTerminalContainer.innerHTML = '';
-    dockerTerminalModal.style.display = 'none';
-    console.log('[INFO] Docker CLI terminal session cleaned up.');
+    if (dockerTerminalSession) {
+      dockerTerminalSession.xterm.dispose();
+      dockerTerminalSession = null;
+      dockerTerminalContainer.innerHTML = ''; // Clear terminal content
+      dockerTerminalModal.style.display = 'none'; // Hide the modal
+      dockerTerminalModal.classList.add('hidden');
+      console.log('[INFO] Docker CLI terminal session cleaned up.');
+    }
   }
-}
-
+  
 // Handle Kill Terminal button
 dockerKillTerminalBtn.onclick = () => {
   cleanUpDockerTerminal();
diff --git a/server/server.js b/server/server.js
index 45377dd..70ad8f1 100644
--- a/server/server.js
+++ b/server/server.js
@@ -107,44 +107,52 @@ swarm.on('connection', (peer) => {
 
           await duplicateContainer(name, image, hostname, netmode, cpu, memoryInMB, dupConfig, peer);
           return; // Response is handled within the duplicateContainer function
-        case 'dockerCommand':
-          console.log(`[INFO] Executing Docker CLI command: ${parsedData.data}`);
-          try {
-            const exec = spawn('sh', ['-c', parsedData.data]);
-
-            exec.stdout.on('data', (output) => {
+          case 'dockerCommand':
+            console.log(`[INFO] Executing Docker CLI command: ${parsedData.data}`);
+            try {
+              const exec = spawn('sh', ['-c', parsedData.data]); // Use `spawn` to execute the command
+          
+              exec.stdout.on('data', (output) => {
+                console.log(`[DEBUG] Command output: ${output.toString()}`);
+                peer.write(
+                  JSON.stringify({
+                    type: 'dockerOutput',
+                    connectionId: parsedData.connectionId,
+                    data: output.toString(),
+                  })
+                );
+              });
+          
+              exec.stderr.on('data', (error) => {
+                console.error(`[ERROR] Command error output: ${error.toString()}`);
+                peer.write(
+                  JSON.stringify({
+                    type: 'dockerOutput',
+                    connectionId: parsedData.connectionId,
+                    data: `[ERROR] ${error.toString()}`,
+                  })
+                );
+              });
+          
+              exec.on('close', (code) => {
+                console.log(`[INFO] Command exited with code: ${code}`);
+                peer.write(
+                  JSON.stringify({
+                    type: 'dockerOutput',
+                    connectionId: parsedData.connectionId,
+                    data: `[INFO] Command exited with code ${code}\n`,
+                  })
+                );
+              });
+            } catch (error) {
+              console.error(`[ERROR] Failed to execute command: ${error.message}`);
               peer.write(
-                JSON.stringify({
-                  type: 'dockerOutput',
-                  connectionId: parsedData.connectionId,
-                  data: output.toString(),
+                JSON.stringify({ 
+                  error: `Failed to execute command: ${error.message}` 
                 })
               );
-            });
-
-            exec.stderr.on('data', (error) => {
-              peer.write(
-                JSON.stringify({
-                  type: 'dockerOutput',
-                  connectionId: parsedData.connectionId,
-                  data: `[ERROR] ${error.toString()}`,
-                })
-              );
-            });
-
-            exec.on('close', (code) => {
-              peer.write(
-                JSON.stringify({
-                  type: 'dockerOutput',
-                  connectionId: parsedData.connectionId,
-                  data: `[INFO] Command exited with code ${code}\n`,
-                })
-              );
-            });
-          } catch (error) {
-            peer.write(JSON.stringify({ error: `Failed to execute command: ${error.message}` }));
-          }
-          break;
+            }
+            break;
         case 'startContainer':
           console.log(`[INFO] Handling 'startContainer' command for container: ${parsedData.args.id}`);
           await docker.getContainer(parsedData.args.id).start();