pywebexec 1.1.11__py3-none-any.whl → 1.1.15__py3-none-any.whl

pywebexec/pywebexec.py

@@ -15,13 +15,8 @@ from gunicorn.app.base import Application
 import ipaddress
 from socket import gethostname, gethostbyname_ex
 import ssl
-
 if os.environ.get('PYWEBEXEC_LDAP_SERVER'):
-    try:
-        from ldap3 import Server, Connection, ALL, SIMPLE, SUBTREE, Tls
-    except:
-        print("Need to install ldap3: pip install ldap3", file=sys.stderr)
-        sys.exit(1)
+    from ldap3 import Server, Connection, ALL, SIMPLE, SUBTREE, Tls
 
 app = Flask(__name__)
 app.secret_key = os.urandom(24)  # Secret key for session management
@@ -42,8 +37,6 @@ if os.path.isdir(f"{CONFDIR}/.config"):
     CONFDIR += '/.config'
 CONFDIR += "/.pywebexec"
 
-if not os.path.exists(COMMAND_STATUS_DIR):
-    os.makedirs(COMMAND_STATUS_DIR)
 
 # In-memory cache for command statuses
 command_status_cache = {}
@@ -271,7 +264,8 @@ def parseargs():
     else:
         print(f"Error: {args.dir} not found", file=sys.stderr)
         sys.exit(1)
-
+    if not os.path.exists(COMMAND_STATUS_DIR):
+        os.makedirs(COMMAND_STATUS_DIR)
     if args.gencert:
         hostname = resolve_hostname(gethostname())
         args.cert = args.cert or f"{CONFDIR}/pywebexec.crt"

pywebexec/static/css/style.css

@@ -139,3 +139,29 @@ input {
 tr.clickable-row {
     cursor: pointer;
 }
+body.dimmed {
+    background-color: rgba(0, 0, 0, 0.5);
+    pointer-events: none;
+}
+body.dimmed * {
+    pointer-events: none;
+}
+.dimmer {
+    display: none;
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.5);
+    z-index: 1000;
+}
+.dimmer-text {
+    color: white;
+    font-size: 24px;
+    text-align: center;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+}

pywebexec/static/js/script.js

@@ -5,76 +5,108 @@ document.getElementById('launchForm').addEventListener('submit', async (event) =
     event.preventDefault();
     const commandName = document.getElementById('commandName').value;
     const params = document.getElementById('params').value.split(' ');
-    const response = await fetch('/run_command', {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/json'
-        },
-        body: JSON.stringify({ command: commandName, params: params })
-    });
-    const data = await response.json();
-    fetchCommands();
-    viewOutput(data.command_id);
+    try {
+        const response = await fetch('/run_command', {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify({ command: commandName, params: params })
+        });
+        if (!response.ok) {
+            throw new Error('Failed to launch command');
+        }
+        const data = await response.json();
+        fetchCommands();
+        viewOutput(data.command_id);
+    } catch (error) {
+        console.log('Error running command:', error);
+    }
 });
 
 async function fetchCommands() {
-    const response = await fetch('/commands');
-    const commands = await response.json();
-    commands.sort((a, b) => new Date(b.start_time) - new Date(a.start_time));
-    const commandsTbody = document.getElementById('commands');
-    commandsTbody.innerHTML = '';
-    if (!currentCommandId && commands.length) {
-        currentCommandId = commands[0].command_id;
-        viewOutput(currentCommandId);
+    try {
+        const response = await fetch('/commands');
+        if (!response.ok) {
+            document.getElementById('dimmer').style.display = 'block';
+            return;
+        }
+        const commands = await response.json();
+        commands.sort((a, b) => new Date(b.start_time) - new Date(a.start_time));
+        const commandsTbody = document.getElementById('commands');
+        commandsTbody.innerHTML = '';
+        if (!currentCommandId && commands.length) {
+            currentCommandId = commands[0].command_id;
+            viewOutput(currentCommandId);
+        }
+        commands.forEach(command => {
+            const commandRow = document.createElement('tr');
+            commandRow.className = `clickable-row ${command.command_id === currentCommandId ? 'currentcommand' : ''}`;
+            commandRow.onclick = () => viewOutput(command.command_id);
+            commandRow.innerHTML = `
+                <td class="monospace">
+                    ${navigator.clipboard == undefined ? `${command.command_id.slice(0, 8)}` : `<span class="copy_clip" onclick="copyToClipboard('${command.command_id}', this, event)">${command.command_id.slice(0, 8)}</span>`}
+                </td>
+                <td><span class="status-icon status-${command.status}"></span>${command.status}</td>
+                <td>${formatTime(command.start_time)}</td>
+                <td>${command.status === 'running' ? formatDuration(command.start_time, new Date().toISOString()) : formatDuration(command.start_time, command.end_time)}</td>
+                <td>${command.exit_code}</td>
+                <td>${command.command.replace(/^\.\//, '')}</td>
+                <td>
+                    ${command.status === 'running' ? `<button onclick="stopCommand('${command.command_id}')">Stop</button>` : `<button onclick="relaunchCommand('${command.command_id}')">Run</button>`}
+                </td>
+                <td class="monospace outcol">${command.last_output_line || ''}</td>
+            `;
+            commandsTbody.appendChild(commandRow);
+        });
+        document.getElementById('dimmer').style.display = 'none';
+    } catch (error) {
+        console.log('Error fetching commands:', error);
+        document.getElementById('dimmer').style.display = 'block';
     }
-    commands.forEach(command => {
-        const commandRow = document.createElement('tr');
-        commandRow.className = `clickable-row ${command.command_id === currentCommandId ? 'currentcommand' : ''}`;
-        commandRow.onclick = () => viewOutput(command.command_id);
-        commandRow.innerHTML = `
-            <td class="monospace">
-                ${navigator.clipboard == undefined ? `${command.command_id}` : `<span class="copy_clip" onclick="copyToClipboard('${command.command_id.slice(0, 8)}', this, event)">${command.command_id.slice(0, 8)}</span>`}
-            </td>
-            <td><span class="status-icon status-${command.status}"></span>${command.status}</td>
-            <td>${formatTime(command.start_time)}</td>
-            <td>${command.status === 'running' ? formatDuration(command.start_time, new Date().toISOString()) : formatDuration(command.start_time, command.end_time)}</td>
-            <td>${command.exit_code}</td>
-            <td>${command.command.replace(/^\.\//, '')}</td>
-            <td>
-                ${command.status === 'running' ? `<button onclick="stopCommand('${command.command_id}')">Stop</button>` : `<button onclick="relaunchCommand('${command.command_id}')">Run</button>`}
-            </td>
-            <td class="monospace outcol">${command.last_output_line || ''}</td>
-        `;
-        commandsTbody.appendChild(commandRow);
-    });
 }
 
 async function fetchExecutables() {
-    const response = await fetch('/executables');
-    const executables = await response.json();
-    const commandNameSelect = document.getElementById('commandName');
-    commandNameSelect.innerHTML = '';
-    executables.forEach(executable => {
-        const option = document.createElement('option');
-        option.value = executable;
-        option.textContent = executable;
-        commandNameSelect.appendChild(option);
-    });
+    try {
+        const response = await fetch('/executables');
+        if (!response.ok) {
+            throw new Error('Failed to fetch command status');
+        }
+        const executables = await response.json();
+        const commandNameSelect = document.getElementById('commandName');
+        commandNameSelect.innerHTML = '';
+        executables.forEach(executable => {
+            const option = document.createElement('option');
+            option.value = executable;
+            option.textContent = executable;
+            commandNameSelect.appendChild(option);
+        });
+    } catch (error) {
+        console.log('Error fetching executables:', error);
+        alert("Failed to fetch executables");
+    }
 }
 
 async function fetchOutput(command_id) {
-    const outputDiv = document.getElementById('output');
-    const response = await fetch(`/command_output/${command_id}`);
-    const data = await response.json();
-    if (data.error) {
-        outputDiv.innerHTML = data.error;
-        clearInterval(outputInterval);
-    } else {
-        outputDiv.innerHTML = data.output;
-        outputDiv.scrollTop = outputDiv.scrollHeight;
-        if (data.status != 'running') {
+    try {
+        const outputDiv = document.getElementById('output');
+        const response = await fetch(`/command_output/${command_id}`);
+        if (!response.ok) {
+            return;
+        }
+        const data = await response.json();
+        if (data.error) {
+            outputDiv.innerHTML = data.error;
             clearInterval(outputInterval);
+        } else {
+            outputDiv.innerHTML = data.output;
+            outputDiv.scrollTop = outputDiv.scrollHeight;
+            if (data.status != 'running') {
+                clearInterval(outputInterval);
+            }
         }
+    } catch (error) {
+        console.log('Error fetching output:', error);
     }
 }
 
@@ -82,49 +114,75 @@ async function viewOutput(command_id) {
     adjustOutputHeight();
     currentCommandId = command_id;
     clearInterval(outputInterval);
-    const response = await fetch(`/command_status/${command_id}`);
-    const data = await response.json();
-    if (data.status === 'running') {
-        fetchOutput(command_id);
-        outputInterval = setInterval(() => fetchOutput(command_id), 1000);
-    } else {
-        fetchOutput(command_id);
+    try {
+        const response = await fetch(`/command_status/${command_id}`);
+        if (!response.ok) {
+            return;
+        }
+        const data = await response.json();
+        if (data.status === 'running') {
+            fetchOutput(command_id);
+            outputInterval = setInterval(() => fetchOutput(command_id), 1000);
+        } else {
+            fetchOutput(command_id);
+        }
+        fetchCommands(); // Refresh the command list to highlight the current command
+    } catch (error) {
+        console.log('Error viewing output:', error);
     }
-    fetchCommands(); // Refresh the command list to highlight the current command
 }
 
 async function relaunchCommand(command_id) {
-    const response = await fetch(`/command_status/${command_id}`);
-    const data = await response.json();
-    if (data.error) {
-        alert(data.error);
-        return;
+    try {
+        const response = await fetch(`/command_status/${command_id}`);
+        if (!response.ok) {
+            throw new Error('Failed to fetch command status');
+        }
+        const data = await response.json();
+        if (data.error) {
+            alert(data.error);
+            return;
+        }
+        const relaunchResponse = await fetch('/run_command', {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify({
+                command: data.command,
+                params: data.params
+            })
+        });
+        if (!relaunchResponse.ok) {
+            throw new Error('Failed to relaunch command');
+        }
+        const relaunchData = await relaunchResponse.json();
+        fetchCommands();
+        viewOutput(relaunchData.command_id);
+    } catch (error) {
+        console.log('Error relaunching command:', error);
+        alert('Failed to relaunch command. Please try again.');
     }
-    const relaunchResponse = await fetch('/run_command', {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/json'
-        },
-        body: JSON.stringify({
-            command: data.command,
-            params: data.params
-        })
-    });
-    const relaunchData = await relaunchResponse.json();
-    fetchCommands();
-    viewOutput(relaunchData.command_id);
 }
 
 async function stopCommand(command_id) {
-    const response = await fetch(`/stop_command/${command_id}`, {
-        method: 'POST'
-    });
-    const data = await response.json();
-    if (data.error) {
-        alert(data.error);
-    } else {
-        alert(data.message);
-        fetchCommands();
+    try {
+        const response = await fetch(`/stop_command/${command_id}`, {
+            method: 'POST'
+        });
+        if (!response.ok) {
+            throw new Error('Failed to stop command');
+        }
+        const data = await response.json();
+        if (data.error) {
+            alert(data.error);
+        } else {
+            alert(data.message);
+            fetchCommands();
+        }
+    } catch (error) {
+        console.log('Error stopping command:', error);
+        alert('Failed to stop command. Please try again.');
     }
 }
 

pywebexec/templates/index.html

@@ -7,6 +7,9 @@
     <link rel="stylesheet" href="/static/css/style.css">
 </head>
 <body>
+    <div id="dimmer" class="dimmer">
+        <div class="dimmer-text">Server not reachable</div>
+    </div>
     <h2><span class="status-icon title-icon"></span>{{ title }}</h2>
     <form id="launchForm">
         <label for="commandName">Command</label>

pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.1.11'
-__version_tuple__ = version_tuple = (1, 1, 11)
+__version__ = version = '1.1.15'
+__version_tuple__ = version_tuple = (1, 1, 15)

{pywebexec-1.1.11.dist-info → pywebexec-1.1.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 1.1.11
+Version: 1.1.15
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau

{pywebexec-1.1.11.dist-info → pywebexec-1.1.15.dist-info}/RECORD

@@ -1,7 +1,7 @@
 pywebexec/__init__.py,sha256=4spIsVaF8RJt8S58AG_wWoORRNkws9Iwqprj27C3ljM,99
-pywebexec/pywebexec.py,sha256=nXo0K6dBS9zKRUEP1hFyGWpL3BV2sUku3CFeGi0QQ-w,21479
-pywebexec/version.py,sha256=9JSmVS_AC0iwzCn3SBDWoTqahTE6DWQZLNs5YmBeMMk,413
-pywebexec/static/css/style.css,sha256=rYpzhBftpZ9pw_FTZFwcAnGC9-EhVOOSy6w56Ybe-Wk,2902
+pywebexec/pywebexec.py,sha256=DQJ1uc8otLP0IOa3kk14oAadi27VzZDphtagciy7jXs,21365
+pywebexec/version.py,sha256=lhzTCd4R60DxNLLFyeDP7u5gfCa_r796diruMLGD-PY,413
+pywebexec/static/css/style.css,sha256=BFiRkGhGrNoEmD2M3grfQXwsdI_bJWgB7GPHDoyT7R4,3374
 pywebexec/static/images/aborted.svg,sha256=_mP43hU5QdRLFZIknBgjx-dIXrHgQG23-QV27ApXK2A,381
 pywebexec/static/images/copy.svg,sha256=d9OwtGh5GzzZHzYcDrLfNxZYLth1Q64x7bRyYxu4Px0,622
 pywebexec/static/images/copy_ok.svg,sha256=mEqUVUhSq8xaJK2msQkxRawnz_KwlCZ-tok8QS6hJ3g,451
@@ -9,12 +9,12 @@ pywebexec/static/images/failed.svg,sha256=ADZ7IKrUyOXtqpivnz3VcH0-Wru-I5MOi3OJAk
 pywebexec/static/images/favicon.svg,sha256=ti80IfuDZwIvQcmJxkOeUaB1iMsiyOPmQmVO-h0y1IU,1126
 pywebexec/static/images/running.gif,sha256=iYuzQGkMxrakSIwt6gPieKCImGZoSAHmU5MUNZa7cpw,25696
 pywebexec/static/images/success.svg,sha256=PJDcCSTevJh7rkfSFLtc7P0pbeh8PVQBS8DaOLQemmc,489
-pywebexec/static/js/script.js,sha256=fbxMRP_BsRNYlFRJjVipaahV9_7letVITJD0ic4IwfA,7230
+pywebexec/static/js/script.js,sha256=OZlD4iowqDqY9qeOU_g4zc8SQMzTfNnMUfSN9MVCzUc,9328
 pywebexec/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pywebexec/templates/index.html,sha256=7dFHAmHXGMrK1-M6PIAbMS0bv7Pi5-6vDoyUk3irnQc,1346
-pywebexec-1.1.11.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-1.1.11.dist-info/METADATA,sha256=fc3XLIyoELPSQnOZsUFyFrGCb1OCfrB8AeX3J1ytMqE,6906
-pywebexec-1.1.11.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pywebexec-1.1.11.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-1.1.11.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-1.1.11.dist-info/RECORD,,
+pywebexec/templates/index.html,sha256=X0TsF1-fEuanpGPQo0GpCvvE87BWUEkYyrWA7IOu20Q,1454
+pywebexec-1.1.15.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-1.1.15.dist-info/METADATA,sha256=__yydXcA3rMRIxdF8IbxFu9do3Vlf6Ymo5AZr-pIAyg,6906
+pywebexec-1.1.15.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pywebexec-1.1.15.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-1.1.15.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-1.1.15.dist-info/RECORD,,