Spaces:

SketchyAI
/

linum

Paused

App Files Files Community

Rémy commited on Oct 19, 2024

Commit

0694075

1 Parent(s): d45df14

Improvement

Browse files

Files changed (2) hide show

app.py +24 -6
static/index.html +35 -12

app.py CHANGED Viewed

@@ -1,11 +1,11 @@
-from fastapi import FastAPI, HTTPException
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.staticfiles import StaticFiles
 from fastapi.responses import FileResponse
 from pydantic import BaseModel
 import subprocess
 import shlex
 app = FastAPI()
 # Add CORS middleware
@@ -28,8 +28,16 @@ class Command(BaseModel):
     command: str
 @app.post("/execute")
-async def execute_command(command: Command):
     try:
         # Parse the command to get the base command
         base_command = shlex.split(command.command)[0]
@@ -37,12 +45,22 @@ async def execute_command(command: Command):
         if base_command not in ALLOWED_COMMANDS:
             raise HTTPException(status_code=403, detail=f"Command '{base_command}' is not allowed")
-        # Execute the command in a controlled environment
-        result = subprocess.run(command.command, shell=True, capture_output=True, text=True, timeout=5)
         return {
             "output": result.stdout,
             "error": result.stderr,
-            "returncode": result.returncode
         }
     except subprocess.TimeoutExpired:
         raise HTTPException(status_code=408, detail="Command execution timed out")

 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.staticfiles import StaticFiles
 from fastapi.responses import FileResponse
 from pydantic import BaseModel
 import subprocess
 import shlex
+import os
+from fastapi import FastAPI, HTTPException, Request
 app = FastAPI()
 # Add CORS middleware
     command: str
 @app.post("/execute")
+async def execute_command(command: Command, request: Request):
     try:
+        # Get or create a session-specific directory
+        session = request.session
+        if 'working_dir' not in session:
+            session['working_dir'] = '/tmp/user_' + os.urandom(8).hex()
+            os.makedirs(session['working_dir'], exist_ok=True)
+        working_dir = session['working_dir']
         # Parse the command to get the base command
         base_command = shlex.split(command.command)[0]
         if base_command not in ALLOWED_COMMANDS:
             raise HTTPException(status_code=403, detail=f"Command '{base_command}' is not allowed")
+        # Handle 'cd' command specially
+        if base_command == 'cd':
+            new_dir = os.path.join(working_dir, shlex.split(command.command)[1])
+            if os.path.isdir(new_dir):
+                session['working_dir'] = new_dir
+                return {"output": "", "error": "", "returncode": 0, "currentDirectory": new_dir}
+            else:
+                return {"output": "", "error": "No such directory", "returncode": 1, "currentDirectory": working_dir}
+        # Execute the command in the controlled environment
+        result = subprocess.run(command.command, shell=True, capture_output=True, text=True, timeout=5, cwd=working_dir)
         return {
             "output": result.stdout,
             "error": result.stderr,
+            "returncode": result.returncode,
+            "currentDirectory": working_dir
         }
     except subprocess.TimeoutExpired:
         raise HTTPException(status_code=408, detail="Command execution timed out")

static/index.html CHANGED Viewed

@@ -6,11 +6,11 @@
     <title>Linux Practice Tool</title>
     <style>
         body {
-            font-family: monospace;
-            background-color: #000;
-            color: #0f0;
             margin: 0;
-            padding: 20px;
         }
         #terminal {
             width: 100%;
@@ -25,17 +25,23 @@
             margin-top: 10px;
         }
         #prompt {
             margin-right: 5px;
         }
         #command-input {
             flex-grow: 1;
             background-color: transparent;
             border: none;
-            color: #0f0;
             font-family: inherit;
             font-size: inherit;
             outline: none;
         }
     </style>
 </head>
 <body>
@@ -49,9 +55,9 @@
     <script>
         const output = document.getElementById('output');
         const input = document.getElementById('command-input');
         let commandHistory = [];
         let historyIndex = -1;
         input.addEventListener('keydown', async (event) => {
             if (event.key === 'Enter') {
@@ -85,7 +91,7 @@
             if (command.toLowerCase() === 'help') {
                 displayHelp();
             } else {
-                output.innerHTML += `$ ${command}\n`;
                 try {
                     const response = await fetch('/execute', {
@@ -93,27 +99,44 @@
                         headers: {
                             'Content-Type': 'application/json',
                         },
-                        body: JSON.stringify({ command }),
                     });
                     const data = await response.json();
                     if (response.ok) {
-                        output.innerHTML += data.output;
                         if (data.error) {
-                            output.innerHTML += `Error: ${data.error}\n`;
                         }
                     } else {
-                        output.innerHTML += `Error: ${data.detail}\n`;
                     }
                 } catch (error) {
-                    output.innerHTML += `Error: ${error.message}\n`;
                 }
             }
             output.scrollTop = output.scrollHeight;
         }
         function displayHelp() {
             const helpText = `
 Available commands:

     <title>Linux Practice Tool</title>
     <style>
         body {
+            font-family: 'Courier New', monospace;
+            background-color: #300a24;
+            color: #ffffff;
             margin: 0;
+            padding: 10px;
         }
         #terminal {
             width: 100%;
             margin-top: 10px;
         }
         #prompt {
+            color: #4e9a06;
             margin-right: 5px;
         }
         #command-input {
             flex-grow: 1;
             background-color: transparent;
             border: none;
+            color: #ffffff;
             font-family: inherit;
             font-size: inherit;
             outline: none;
         }
+        .directory { color: #3465a4; }
+        .executable { color: #4e9a06; }
+        .image { color: #75507b; }
+        .archive { color: #c4a000; }
+        .text { color: #cc0000; }
     </style>
 </head>
 <body>
     <script>
         const output = document.getElementById('output');
         const input = document.getElementById('command-input');
         let commandHistory = [];
         let historyIndex = -1;
+        let currentDirectory = '/';
         input.addEventListener('keydown', async (event) => {
             if (event.key === 'Enter') {
             if (command.toLowerCase() === 'help') {
                 displayHelp();
             } else {
+                output.innerHTML += `<span id="prompt">$</span> ${command}\n`;
                 try {
                     const response = await fetch('/execute', {
                         headers: {
                             'Content-Type': 'application/json',
                         },
+                        body: JSON.stringify({ command, currentDirectory }),
                     });
                     const data = await response.json();
                     if (response.ok) {
+                        if (command.startsWith('cd ')) {
+                            currentDirectory = data.currentDirectory;
+                        }
+                        output.innerHTML += colorize(data.output);
                         if (data.error) {
+                            output.innerHTML += `<span style="color: #cc0000;">Error: ${data.error}</span>\n`;
                         }
                     } else {
+                        output.innerHTML += `<span style="color: #cc0000;">Error: ${data.detail}</span>\n`;
                     }
                 } catch (error) {
+                    output.innerHTML += `<span style="color: #cc0000;">Error: ${error.message}</span>\n`;
                 }
             }
             output.scrollTop = output.scrollHeight;
         }
+        function colorize(text) {
+            const lines = text.split('\n');
+            return lines.map(line => {
+                return line.replace(/(\S+)/g, (match) => {
+                    if (match.endsWith('/')) return `<span class="directory">${match}</span>`;
+                    if (match.endsWith('.exe') || match.endsWith('.sh')) return `<span class="executable">${match}</span>`;
+                    if (match.match(/\.(jpg|jpeg|png|gif|bmp)$/i)) return `<span class="image">${match}</span>`;
+                    if (match.match(/\.(zip|tar|gz|rar)$/i)) return `<span class="archive">${match}</span>`;
+                    if (match.match(/\.(txt|md|log)$/i)) return `<span class="text">${match}</span>`;
+                    return match;
+                });
+            }).join('\n');
+        }
         function displayHelp() {
             const helpText = `
 Available commands: