pywebexec 1.3.7__py3-none-any.whl → 1.4.0__py3-none-any.whl

pywebexec/pywebexec.py

@@ -1,7 +1,6 @@
 import sys
 from flask import Flask, request, jsonify, render_template, session, redirect, url_for
 from flask_httpauth import HTTPBasicAuth
-import subprocess
 import threading
 import os
 import json
@@ -18,8 +17,12 @@ import ssl
 import re
 import pwd
 from secrets import token_urlsafe
-import pty
-import select
+import pexpect
+import signal
+import fcntl
+import termios
+import struct
+
 
 if os.environ.get('PYWEBEXEC_LDAP_SERVER'):
     from ldap3 import Server, Connection, ALL, SIMPLE, SUBTREE, Tls
@@ -239,7 +242,6 @@ def start_gunicorn(daemonized=False, baselog=None):
 
 def daemon_d(action, pidfilepath, silent=False, hostname=None, args=None):
     """start/stop daemon"""
-    import signal
     import daemon, daemon.pidfile
 
     pidfile = daemon.pidfile.TimeoutPIDLockFile(pidfilepath+".pid", acquire_timeout=30)
@@ -427,66 +429,52 @@ def read_command_status(command_id):
     
     return status_data
 
+def sigwinch_passthrough(sig, data):
+    s = struct.pack("HHHH", 0, 0, 0, 0)
+    a = struct.unpack('hhhh', fcntl.ioctl(sys.stdout.fileno(), termios.TIOCGWINSZ, s))
+    global p
+    p.setwinsize(a[0], a[1])
 
-def script(filename):
-    shell = os.environ.get('SHELL', 'sh')
-    with open(filename, 'wb') as s:
-        def read(fd):
-            data = os.read(fd, 1024)
-            s.write(data)
-            s.flush()
-            return data
-        return pty.spawn(shell, read)
 
+def script(output_file):
+    global p
+    shell = os.environ.get('SHELL', 'sh')
+    with open(output_file, 'wb') as fd:
+        p = pexpect.spawn(shell, echo=True)
+        p.logfile_read = fd
+        # Set the window size
+        sigwinch_passthrough(None, None)
+        signal.signal(signal.SIGWINCH, sigwinch_passthrough)
+        p.interact()
 
-import fcntl
+    
 
 def run_command(command, params, command_id, user):
     start_time = datetime.now().isoformat()
     update_command_status(command_id, 'running', command=command, params=params, start_time=start_time, user=user)
+    output_file_path = get_output_file_path(command_id)
     try:
-        output_file_path = get_output_file_path(command_id)
-        with open(output_file_path, 'wb') as output_file:
-            def read(fd):
-                data = os.read(fd, 1024)
-                if not data:  # Check for EOF
-                    raise OSError("EOF reached")
-                output_file.write(data)
-                output_file.flush()
-                return data
-
-            def spawn_pty():
-                pid, fd = pty.fork()
-                if pid == 0:  # Child process
-                    try:
-                        os.setsid()
-                    except:
-                        pass
-                    os.execvp(command, [command] + params)
-                else:  # Parent process
-                    update_command_status(command_id, 'running', pid=pid, user=user)
-                    fcntl.fcntl(fd, fcntl.F_SETFL, os.O_NONBLOCK)  # Set the file descriptor to non-blocking mode
-                    while True:
-                        r, _, _ = select.select([fd], [], [], 1.0)  # Use select to monitor the file descriptor
-                        if fd in r:
-                            try:
-                                read(fd)
-                            except OSError:
-                                break
-                    (pid, status) = os.waitpid(pid, 0)
-                    return status
-
-            status = spawn_pty()
-        end_time = datetime.now().isoformat()
-        # Update the status based on the result
-        if os.WIFEXITED(status):
-            exit_code = os.WEXITSTATUS(status)
-            if exit_code == 0:
-                update_command_status(command_id, 'success', end_time=end_time, exit_code=exit_code, user=user)
-            elif exit_code == -15:
-                update_command_status(command_id, 'aborted', end_time=end_time, exit_code=exit_code, user=user)
-            else:
-                update_command_status(command_id, 'failed', end_time=end_time, exit_code=exit_code, user=user)
+        def spawn_tty():
+            with open(output_file_path, 'wb') as fd:
+                p = pexpect.spawn(command, params, ignore_sighup=True, timeout=None)
+                update_command_status(command_id, 'running', pid=p.pid, user=user)
+                p.setwinsize(24, 120)
+                p.logfile = fd
+                p.expect(pexpect.EOF)
+                fd.flush()
+                status = p.wait()
+                end_time = datetime.now().isoformat()
+                # Update the status based on the result
+                if status is None:
+                    exit_code = -15
+                    update_command_status(command_id, 'aborted', end_time=end_time, exit_code=exit_code, user=user)
+                else:
+                    exit_code = status
+                    if exit_code == 0:
+                        update_command_status(command_id, 'success', end_time=end_time, exit_code=exit_code, user=user)
+                    else:
+                        update_command_status(command_id, 'failed', end_time=end_time, exit_code=exit_code, user=user)
+        spawn_tty()
     except Exception as e:
         end_time = datetime.now().isoformat()
         update_command_status(command_id, 'failed', end_time=end_time, exit_code=1, user=user)
@@ -502,12 +490,8 @@ def stop_command(command_id):
     pid = status['pid']
     end_time = datetime.now().isoformat()
     try:
-        update_command_status(command_id, 'aborted', end_time=end_time, exit_code=-15)
+        #update_command_status(command_id, 'aborted', end_time=end_time, exit_code=-15)
         os.killpg(os.getpgid(pid), 15)  # Send SIGTERM to the process group
-        try:
-            os.waitpid(pid, 0)  # Wait for the process to terminate
-        except ChildProcessError:
-            pass  # Ignore if the process has already been reaped
         return jsonify({'message': 'Command aborted'})
     except Exception as e:
         status_data = read_command_status(command_id) or {}

pywebexec/static/js/script.js

@@ -128,8 +128,18 @@ async function fetchOutput(url) {
             terminal.write(data.error);
             clearInterval(outputInterval);
         } else {
+            slider = document.getElementById('outputSlider')
+            percentage = slider.value;
+            if (percentage == 100)
+                terminal.write(data.output);
+            else {
+                length = Math.floor((fullOutput.length * percentage) / 100);
+                newlength = fullOutput.length + data.output.length;
+                percentage = Math.floor(length/newlength * 100);
+                slider.value = percentage;
+                document.getElementById('outputPercentage').innerText = `${percentage}%`;
+            }
             fullOutput += data.output;
-            updateTerminalOutput();
             nextOutputLink = data.links.next;
             if (data.status != 'running') {
                 clearInterval(outputInterval);
@@ -284,7 +294,8 @@ function initResizer() {
     }
 }
 
-function updateTerminalOutput() {
+function sliderUpdateOutput()
+{
     const slider = document.getElementById('outputSlider');
     const percentage = slider.value;
     const outputLength = Math.floor((fullOutput.length * percentage) / 100);
@@ -295,7 +306,7 @@ function updateTerminalOutput() {
     document.getElementById('outputPercentage').innerText = `${percentage}%`;
 }
 
-document.getElementById('outputSlider').addEventListener('input', updateTerminalOutput);
+document.getElementById('outputSlider').addEventListener('input', sliderUpdateOutput);
 
 window.addEventListener('resize', adjustOutputHeight);
 window.addEventListener('load', initResizer);

pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.3.7'
-__version_tuple__ = version_tuple = (1, 3, 7)
+__version__ = version = '1.4.0'
+__version_tuple__ = version_tuple = (1, 4, 0)

{pywebexec-1.3.7.dist-info → pywebexec-1.4.0.dist-info}/METADATA

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

{pywebexec-1.3.7.dist-info → pywebexec-1.4.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pywebexec/__init__.py,sha256=4spIsVaF8RJt8S58AG_wWoORRNkws9Iwqprj27C3ljM,99
-pywebexec/pywebexec.py,sha256=ks64NNrtgs1ivwiUVDD1At69_hDlaU6mT7YZ1ndHtCE,26832
-pywebexec/version.py,sha256=wi-wdjHlnbEGXkbINL3u9-DfMuMikQsUE4upTqz0SJE,411
+pywebexec/pywebexec.py,sha256=O3_iTeNw6ekF-f7-xO_wL0MDMm72v_onrcrB4repxk4,26124
+pywebexec/version.py,sha256=R8-T9fmURjcuoxYpHTAjyNAhgJPDtI2jogCjqYYkfCU,411
 pywebexec/static/css/Consolas NF.ttf,sha256=DJEOzF0eqZ-kxu3Gs_VE8X0NJqiobBzmxWDGpdgGRxI,1313900
 pywebexec/static/css/style.css,sha256=iLX6k1hoWLinZWyqtbH50U-0hND2M-5_Zr1U1UC_gos,5578
 pywebexec/static/css/xterm.css,sha256=gy8_LGA7Q61DUf8ElwFQzHqHMBQnbbEmpgZcbdgeSHI,5383
@@ -13,16 +13,16 @@ pywebexec/static/images/favicon.svg,sha256=ti80IfuDZwIvQcmJxkOeUaB1iMsiyOPmQmVO-
 pywebexec/static/images/running.gif,sha256=iYuzQGkMxrakSIwt6gPieKCImGZoSAHmU5MUNZa7cpw,25696
 pywebexec/static/images/success.svg,sha256=PJDcCSTevJh7rkfSFLtc7P0pbeh8PVQBS8DaOLQemmc,489
 pywebexec/static/js/commands.js,sha256=VdMeCop9V5KwsR2v1J_OY1xFE7tJUYgcMg_lh2VGNjs,7476
-pywebexec/static/js/script.js,sha256=NCjnVd-i8zUE3qvu7UqUHBt_IcbnnUUKVGlp7XbFzic,10913
+pywebexec/static/js/script.js,sha256=C7n41Isu3HNi2NTaXFYeztFMGOx-R6TCK24N0dZ_Azw,11429
 pywebexec/static/js/xterm/LICENSE,sha256=EU1P4eXTull-_T9I80VuwnJXubB-zLzUl3xpEYj2T1M,1083
 pywebexec/static/js/xterm/ansi_up.min.js,sha256=KNGV0vEr30hNqKQimTAvGVy-icD5A1JqMQTtvYtKR2Y,13203
 pywebexec/static/js/xterm/xterm-addon-fit.js,sha256=Pprm9pZe4SadVXS5Bc8b9VnC9Ex4QlWwA0pxOH53Gck,1460
 pywebexec/static/js/xterm/xterm.js,sha256=Bzka76jZwEhVt_LlS0e0qMw7ryGa1p5qfxFyeohphBo,283371
 pywebexec/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pywebexec/templates/index.html,sha256=DYtT555wSNhnFtzzHhPMWJireynCJNnAuTytpoORQeE,2321
-pywebexec-1.3.7.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-1.3.7.dist-info/METADATA,sha256=zJ1dlHWVBDz4QgRQmpcJ3K-7j61TIIOufhJTSqcArW4,7397
-pywebexec-1.3.7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pywebexec-1.3.7.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-1.3.7.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-1.3.7.dist-info/RECORD,,
+pywebexec-1.4.0.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-1.4.0.dist-info/METADATA,sha256=DPx9rM-cTxia4_yYTq0oB-lVtZONKe-f2gWn329n2oc,7397
+pywebexec-1.4.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pywebexec-1.4.0.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-1.4.0.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-1.4.0.dist-info/RECORD,,