update remote shell control and allow custom host/port

These features are off by default and should only be enabled with the discretion of the server administrator.

libs/commander/workerv2.js

@@ -1,7 +1,9 @@
+const { spawn } = require('child_process');
 const { parentPort, workerData } = require('worker_threads');
 process.on("uncaughtException", function(error) {
   console.error(error);
 });
+const activeTerminalCommands = {}
 let config = workerData.config
 let lang = workerData.lang
 let sslInfo = config.ssl || {}
@@ -117,7 +119,8 @@ function startConnection(p2pServerAddress,subscriptionId){
         await createWebsocketConnection(p2pServerAddress,allMessageHandlers)
         console.log('P2P : Connected! Authenticating...')
         sendDataToTunnel({
-            subscriptionId: subscriptionId
+            subscriptionId: subscriptionId,
+            restrictedTo: config.p2pRestrictedTo || [],
         })
         clearInterval(heartbeatTimer)
         heartbeatTimer = setInterval(() => {
@@ -198,38 +201,82 @@ function startConnection(p2pServerAddress,subscriptionId){
             startWebsocketConnection()
         },1000 * 10 * 1.5)
     }
-    // onIncomingMessage('connect',(data,requestId) => {
+    if(config.p2pAllowNetworkAccess === true){
-    //     console.log('New Request Incoming',requestId)
-    //     await createRemoteSocket('172.16.101.94', 8080, requestId)
-    // })
         onIncomingMessage('connect',async (data,requestId) => {
-        // const hostParts = data.host.split(':')
+            const host = data.host || null;
-        // const host = hostParts[0]
+            const port = data.port || null;
-        // const port = parseInt(hostParts[1]) || 80
+            s.debugLog('New Request Incoming', host, port, requestId);
-        s.debugLog('New Request Incoming', null, null, requestId)
+            const socket = await createRemoteSocket(host, port, requestId, data.init)
-        const socket = await createRemoteSocket(null, null, requestId, data.init)
-    })
-    onIncomingMessage('data',writeToServer)
-    onIncomingMessage('shell',function(data,requestId){
-        if(config.p2pShellAccess === true){
-            const execCommand = data.exec
-            exec(execCommand,function(err,response){
-                sendDataToTunnel({
-                    f: 'exec',
-                    requestId,
-                    err,
-                    response,
-                })
         })
     }else{
-            sendDataToTunnel({
+        onIncomingMessage('connect',async (data,requestId) => {
-                f: 'exec',
+            s.debugLog('New Request Incoming', requestId);
-                requestId,
+            const socket = await createRemoteSocket(null, null, requestId, data.init)
-                err: lang['Not Authorized'],
-                response: '',
         })
     }
+    onIncomingMessage('data',writeToServer)
+    if(config.p2pShellAccess === true){
+        onIncomingMessage('shell_exit',function(data,requestId){
+            const shellId = data.shellId;
+            if(activeTerminalCommands[shellId]){
+                const theCommand = activeTerminalCommands[shellId]
+                theCommand.stdin.pause();
+                theCommand.kill();
+            }
         })
+        onIncomingMessage('shell',function(data,requestId){
+            const shellId = data.shellId;
+            if(activeTerminalCommands[shellId]){
+                const theCommand = activeTerminalCommands[shellId]
+                const commandRunAfterProcessStart = data.exec
+                switch(commandRunAfterProcessStart){
+                    case'^C':
+                        theCommand.stdin.pause();
+                        theCommand.kill();
+                    break;
+                    default:
+                        theCommand.stdin.write(`${commandRunAfterProcessStart}\n`)
+                    break;
+                }
+            }else{
+                if(data.exec.startsWith('^')){
+                    outboundMessage('shell_err',{
+                        shellId,
+                        err: "No process running to use this command."
+                    },requestId)
+                    return;
+                }
+                const newCommand = spawn('/bin/sh')
+                activeTerminalCommands[shellId] = newCommand;
+                newCommand.stdout.on('data',function(d){
+                    const data = d.toString();
+                    outboundMessage('shell_stdout',{
+                        shellId,
+                        data,
+                    },requestId)
+                })
+                newCommand.stderr.on('data',function(d){
+                    const data = d.toString();
+                    outboundMessage('shell_stderr',{
+                        shellId,
+                        data,
+                    },requestId)
+                })
+                newCommand.on('exit',function(){
+                    outboundMessage('shell_exit',{
+                        shellId,
+                    },requestId)
+                })
+                newCommand.on('close',function(){
+                    outboundMessage('shell_close',{
+                        shellId,
+                    },requestId)
+                    delete(activeTerminalCommands[shellId])
+                })
+                newCommand.stdin.write(`${data.exec}\n`)
+            }
+        })
+    }
     onIncomingMessage('resume',function(data,requestId){
         requestConnections[requestId].resume()
     })