pywebexec 1.3.3__py3-none-any.whl → 1.3.5__py3-none-any.whl

pywebexec/pywebexec.py

@@ -17,8 +17,9 @@ from socket import gethostname, gethostbyname_ex, gethostbyaddr, inet_aton, inet
 import ssl
 import re
 import pwd
-import platform
 from secrets import token_urlsafe
+import pty
+import select
 
 if os.environ.get('PYWEBEXEC_LDAP_SERVER'):
     from ldap3 import Server, Connection, ALL, SIMPLE, SUBTREE, Tls
@@ -328,12 +329,7 @@ def parseargs():
         user = pwd.getpwuid(os.getuid())[0]
         update_command_status(command_id, 'running', command="term", params=[user,os.ttyname(sys.stdout.fileno())], start_time=start_time, user=user)
         output_file_path = get_output_file_path(command_id)
-        if platform.system() == 'Darwin':
-            script_opt = '-F'
-        else:
-            script_opt = '-f'
-        res = os.system(f"script {script_opt} {output_file_path}")
-
+        res = script(output_file_path)
         end_time = datetime.now().isoformat()
         update_command_status(command_id, status="success", end_time=end_time, exit_code=res)
         sys.exit(res)
@@ -431,36 +427,88 @@ def read_command_status(command_id):
     
     return status_data
 
-# Dictionary to store the process objects
-processes = {}
+
+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 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)
     try:
         output_file_path = get_output_file_path(command_id)
-        with open(output_file_path, 'w') as output_file:
-            # Run the command with parameters and redirect stdout and stderr to the file
-            process = subprocess.Popen([command] + params, stdout=output_file, stderr=output_file, bufsize=0) #text=True)
-            update_command_status(command_id, 'running', pid=process.pid, user=user)
-            processes[command_id] = process
-            process.wait()
-            processes.pop(command_id, None)
-
+        with open(output_file_path, 'wb') as output_file:
+            def read(fd):
+                data = os.read(fd, 1024)
+                output_file.write(data)
+                output_file.flush()
+                return data
+
+            def spawn_pty():
+                pid, fd = pty.fork()
+                if pid == 0: # children
+                    try:
+                        os.setsid()
+                    except:
+                        pass
+                    os.execvp(command, [command] + params)
+                else:
+                    update_command_status(command_id, 'running', pid=pid, user=user)
+                    while True:
+                        try:
+                            read(fd)
+                        except OSError:
+                            break
+                    (pid, status) = os.waitpid(pid, 0)
+                    print(status)
+                    return status
+            status = spawn_pty()
         end_time = datetime.now().isoformat()
         # Update the status based on the result
-        if process.returncode == 0:
-            update_command_status(command_id, 'success', end_time=end_time, exit_code=process.returncode, user=user)
-        elif process.returncode == -15:
-            update_command_status(command_id, 'aborted', end_time=end_time, exit_code=process.returncode, user=user)
-        else:
-            update_command_status(command_id, 'failed', end_time=end_time, exit_code=process.returncode, user=user)
+        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)
     except Exception as e:
         end_time = datetime.now().isoformat()
         update_command_status(command_id, 'failed', end_time=end_time, exit_code=1, user=user)
         with open(get_output_file_path(command_id), 'a') as output_file:
             output_file.write(str(e))
 
+@app.route('/stop_command/<command_id>', methods=['POST'])
+def stop_command(command_id):
+    status = read_command_status(command_id)
+    if not status or 'pid' not in status:
+        return jsonify({'error': 'Invalid command_id or command not running'}), 400
+
+    pid = status['pid']
+    end_time = datetime.now().isoformat()
+    try:
+        os.killpg(os.getpgid(pid), 15)  # Send SIGTERM to the process group
+        #os.waitpid(pid, 0)  # Wait for the process to terminate
+        #update_command_status(command_id, 'aborted', end_time=end_time, exit_code=-15)
+        return jsonify({'message': 'Command aborted'})
+    except Exception as e:
+        status_data = read_command_status(command_id) or {}
+        status_data['status'] = 'failed'
+        status_data['end_time'] = end_time
+        status_data['exit_code'] = 1
+        with open(get_status_file_path(command_id), 'w') as f:
+            json.dump(status_data, f)
+        with open(get_output_file_path(command_id), 'a') as output_file:
+            output_file.write(str(e))
+        return jsonify({'error': 'Failed to terminate command'}), 500
 
 parseargs()
 
@@ -563,29 +611,6 @@ def run_command_endpoint():
 
     return jsonify({'message': 'Command is running', 'command_id': command_id})
 
-@app.route('/stop_command/<command_id>', methods=['POST'])
-def stop_command(command_id):
-    status = read_command_status(command_id)
-    if not status or 'pid' not in status:
-        return jsonify({'error': 'Invalid command_id or command not running'}), 400
-
-    pid = status['pid']
-    end_time = datetime.now().isoformat()
-    try:
-        os.kill(pid, 15)  # Send SIGTERM
-        #update_command_status(command_id, 'aborted', end_time=end_time, exit_code=-15)
-        return jsonify({'message': 'Command aborted'})
-    except Exception as e:
-        status_data = read_command_status(command_id) or {}
-        status_data['status'] = 'failed'
-        status_data['end_time'] = end_time
-        status_data['exit_code'] = 1
-        with open(get_status_file_path(command_id), 'w') as f:
-            json.dump(status_data, f)
-        with open(get_output_file_path(command_id), 'a') as output_file:
-            output_file.write(str(e))
-        return jsonify({'error': 'Failed to terminate command'}), 500
-
 @app.route('/command_status/<command_id>', methods=['GET'])
 def get_command_status(command_id):
     status = read_command_status(command_id)

pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.3.3'
-__version_tuple__ = version_tuple = (1, 3, 3)
+__version__ = version = '1.3.5'
+__version_tuple__ = version_tuple = (1, 3, 5)

{pywebexec-1.3.3.dist-info → pywebexec-1.3.5.dist-info}/METADATA

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

{pywebexec-1.3.3.dist-info → pywebexec-1.3.5.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pywebexec/__init__.py,sha256=4spIsVaF8RJt8S58AG_wWoORRNkws9Iwqprj27C3ljM,99
-pywebexec/pywebexec.py,sha256=b-lypYr27O-t-YTUJs0pIWiDPsBE0eSQwSBqfNdkYR4,25618
-pywebexec/version.py,sha256=VriGPi1kVXIBM0YGAuhpE803XR-FNq1JvTW1Kz2us08,411
+pywebexec/pywebexec.py,sha256=zZRaHVUoWqX6IHCesfrboCjcjKGYnOq3jZpos7h9JEI,26333
+pywebexec/version.py,sha256=FcYWgM5oYgqvidiF8nHnDFf0uLGibSe_Bdaq7MY6S4U,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
@@ -20,9 +20,9 @@ pywebexec/static/js/xterm/xterm-addon-fit.js,sha256=Pprm9pZe4SadVXS5Bc8b9VnC9Ex4
 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.3.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-1.3.3.dist-info/METADATA,sha256=A69MhlrTDRfLv8tzyDJSdVFccYSaHNFsE5JHq_Qz8rM,7397
-pywebexec-1.3.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pywebexec-1.3.3.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-1.3.3.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-1.3.3.dist-info/RECORD,,
+pywebexec-1.3.5.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-1.3.5.dist-info/METADATA,sha256=rNB2fBP4AMqwoDaR9tE2yq3EDr1mKs6zW6neFJ87aRM,7397
+pywebexec-1.3.5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pywebexec-1.3.5.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-1.3.5.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-1.3.5.dist-info/RECORD,,