pywebexec 1.6.2__py3-none-any.whl → 1.6.3__py3-none-any.whl

pywebexec/pywebexec.py

@@ -24,6 +24,7 @@ import fcntl
 import termios
 import struct
 import subprocess
+import logging
 
 
 if os.environ.get('PYWEBEXEC_LDAP_SERVER'):
@@ -41,8 +42,14 @@ app.config['LDAP_BASE_DN'] = os.environ.get('PYWEBEXEC_LDAP_BASE_DN')
 app.config['LDAP_BIND_DN'] = os.environ.get('PYWEBEXEC_LDAP_BIND_DN')
 app.config['LDAP_BIND_PASSWORD'] = os.environ.get('PYWEBEXEC_LDAP_BIND_PASSWORD')
 
+# Get the Gunicorn error logger
+gunicorn_logger = logging.getLogger('gunicorn.error')
+app.logger.handlers = gunicorn_logger.handlers
+app.logger.setLevel(logging.INFO)  # Set the logging level to INFO
+
 # Directory to store the command status and output
 CWD = os.getcwd()
+PYWEBEXEC = os.path.abspath(__file__)
 COMMAND_STATUS_DIR = '.web_status'
 CONFDIR = os.path.expanduser("~/").rstrip('/')
 if os.path.isdir(f"{CONFDIR}/.config"):
@@ -219,19 +226,19 @@ def get_last_non_empty_line_of_file(file_path):
     
 
 def start_gunicorn(daemonized=False, baselog=None):
+    check_processes()
     pidfile = f"{baselog}.pid"
     if daemonized:
         if daemon_d('status', pidfilepath=baselog, silent=True):
             print(f"Error: pywebexec already running on {args.listen}:{args.port}", file=sys.stderr)
             return 1
 
-    if sys.stdout.isatty():
+    if daemonized or not sys.stdout.isatty():
+        errorlog = f"{baselog}.log"
+        accesslog = None #f"{baselog}.access.log"
+    else:
         errorlog = "-"
         accesslog = None #"-"
-    else:
-        errorlog = f"{baselog}.log"
-        accesslog = None # f"{baselog}.access.log"
-
     options = {
         'bind': '%s:%s' % (args.listen, args.port),
         'workers': 4,
@@ -323,11 +330,11 @@ def print_urls(command_id=None):
     if token:
         url_params = f"?token={token}"
     if command_id:
-        print(f"{protocol}://{hostname}:{args.port}/dopopup/{command_id}{url_params}")
-        print(f"{protocol}://{ip}:{args.port}/dopopup/{command_id}{url_params}")
+        print(f"{protocol}://{hostname}:{args.port}/dopopup/{command_id}{url_params}", flush=True)
+        print(f"{protocol}://{ip}:{args.port}/dopopup/{command_id}{url_params}", flush=True)
     else:
-        print(f"{protocol}://{hostname}:{args.port}{url_params}")
-        print(f"{protocol}://{ip}:{args.port}{url_params}")
+        print(f"{protocol}://{hostname}:{args.port}{url_params}", flush=True)
+        print(f"{protocol}://{ip}:{args.port}{url_params}", flush=True)
 
 
 def is_port_in_use(address, port):
@@ -473,13 +480,16 @@ def script(output_file):
     with open(output_file, 'wb') as fd:
         p = pexpect.spawn(shell, echo=True)
         p.logfile_read = fd
+        update_command_status(term_command_id, {"pid": p.pid})
         # Set the window size
         sigwinch_passthrough(None, None)
         signal.signal(signal.SIGWINCH, sigwinch_passthrough)
         p.interact()
     
 
-def run_command(command, params, command_id, user):
+def run_command(fromip, user, command, params, command_id):
+    # app.logger.info(f'{fromip} run_command {command_id} {user}: {command} {params}')
+    log_info(fromip, user, f'run_command {command_id}: {command_str(command, params)}')
     start_time = datetime.now().isoformat()
     update_command_status(command_id, {
         'status': 'running',
@@ -512,6 +522,7 @@ def run_command(command, params, command_id, user):
                     'exit_code': exit_code,
                     'user': user
                 })
+                log_info(fromip, user, f'run_command {command_id}: {command_str(command, params)}: command aborted')
             else:
                 exit_code = status
                 if exit_code == 0:
@@ -521,6 +532,7 @@ def run_command(command, params, command_id, user):
                         'exit_code': exit_code,
                         'user': user
                     })
+                    log_info(fromip, user, f'run_command {command_id}: {command_str(command, params)}: completed successfully')
                 else:
                     update_command_status(command_id, {
                         'status': 'failed',
@@ -528,6 +540,8 @@ def run_command(command, params, command_id, user):
                         'exit_code': exit_code,
                         'user': user
                     })
+                    log_info(fromip, user, f'run_command {command_id}: {command_str(command, params)}: exit code {exit_code}')
+
     except Exception as e:
         end_time = datetime.now().isoformat()
         update_command_status(command_id, {
@@ -538,9 +552,78 @@ def run_command(command, params, command_id, user):
         })
         with open(get_output_file_path(command_id), 'a') as output_file:
             output_file.write(str(e))
+        app.logger.error(fromip, user, f'Error running command {command_id}: {e}')
+
+
+def command_str(command, params):
+    try:
+        params = shlex.join(params)
+    except AttributeError:
+        params = " ".join([shlex.quote(p) if " " in p else p for p in params])
+    return f"{command} {params}"
+
+
+def read_commands():
+    commands = []
+    for filename in os.listdir(COMMAND_STATUS_DIR):
+        if filename.endswith('.json'):
+            command_id = filename[:-5]
+            status = read_command_status(command_id)
+            if status:
+                command = command_str(status.get('command', '-'), status.get('params', []))
+                last_line = status.get('last_output_line')
+                if last_line is None:
+                    output_file_path = get_output_file_path(command_id)
+                    if os.path.exists(output_file_path):
+                        last_line = get_last_non_empty_line_of_file(output_file_path)
+                commands.append({
+                    'command_id': command_id,
+                    'status': status['status'],
+                    'start_time': status.get('start_time', 'N/A'),
+                    'end_time': status.get('end_time', 'N/A'),
+                    'command': command,
+                    'exit_code': status.get('exit_code', 'N/A'),
+                    'last_output_line': last_line,
+                })
+    return commands
+
+def is_process_alive(pid):
+    try:
+        os.kill(pid, 0)
+    except ProcessLookupError:
+        return False
+    except PermissionError:
+        return True
+    return True
+
+def check_processes():
+    for filename in os.listdir(COMMAND_STATUS_DIR):
+        if filename.endswith('.json'):
+            command_id = filename[:-5]
+            status = read_command_status(command_id)
+            if status.get('status') == 'running' and 'pid' in status:
+                if not is_process_alive(status['pid']):
+                    end_time = datetime.now().isoformat()
+                    update_command_status(command_id, {
+                        'status': 'aborted',
+                        'end_time': end_time,
+                        'exit_code': -1,
+                    })
+
+parseargs()
+
+def log_info(fromip, user, message):
+    app.logger.info(f"{user} {fromip}: {message}")
+
+def log_error(fromip, user, message):
+    app.logger.error(f"{user} {fromip}: {message}")
+
+def log_request(message):
+    log_info(request.remote_addr, session.get('username', '-'), message)
 
 @app.route('/stop_command/<command_id>', methods=['POST'])
 def stop_command(command_id):
+    log_request(f"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
@@ -559,8 +642,6 @@ def stop_command(command_id):
         })
         return jsonify({'error': 'Failed to terminate command'}), 500
 
-parseargs()
-
 
 @app.before_request
 def check_authentication():
@@ -653,11 +734,12 @@ def run_command_endpoint():
         'status': 'running',
         'command': command,
         'params': params,
-        'user': user
+        'user': user,
+        'from': request.remote_addr,
     })
 
     # Run the command in a separate thread
-    thread = threading.Thread(target=run_command, args=(command_path, params, command_id, user))
+    thread = threading.Thread(target=run_command, args=(request.remote_addr, user, command_path, params, command_id))
     thread.start()
 
     return jsonify({'message': 'Command is running', 'command_id': command_id})
@@ -682,32 +764,8 @@ def index():
 
 @app.route('/commands', methods=['GET'])
 def list_commands():
-    commands = []
-    for filename in os.listdir(COMMAND_STATUS_DIR):
-        if filename.endswith('.json'):
-            command_id = filename[:-5]
-            status = read_command_status(command_id)
-            if status:
-                try:
-                    params = shlex.join(status.get('params', []))
-                except AttributeError:
-                    params = " ".join([shlex.quote(p) if " " in p else p for p in status['params']])
-                command = status.get('command', '-') + ' ' + params
-                last_line = status.get('last_output_line')
-                if last_line is None:
-                    output_file_path = get_output_file_path(command_id)
-                    if os.path.exists(output_file_path):
-                        last_line = get_last_non_empty_line_of_file(output_file_path)
-                commands.append({
-                    'command_id': command_id,
-                    'status': status['status'],
-                    'start_time': status.get('start_time', 'N/A'),
-                    'end_time': status.get('end_time', 'N/A'),
-                    'command': command,
-                    'exit_code': status.get('exit_code', 'N/A'),
-                    'last_output_line': last_line,
-                })
     # Sort commands by start_time in descending order
+    commands = read_commands()
     commands.sort(key=lambda x: x['start_time'], reverse=True)
     return jsonify(commands)
 
@@ -737,6 +795,18 @@ def get_command_output(command_id):
         return jsonify(response)
     return jsonify({'error': 'Invalid command_id'}), 404
 
+@app.route('/command_output_raw/<command_id>', methods=['GET'])
+def get_command_output_raw(command_id):
+    offset = int(request.args.get('offset', 0))
+    maxsize = int(request.args.get('maxsize', 10485760))
+    output_file_path = get_output_file_path(command_id)
+    if os.path.exists(output_file_path):
+        with open(output_file_path, 'rb') as output_file:
+            output_file.seek(offset)
+            output = output_file.read(maxsize)
+        return output, 200, {'Content-Type': 'text/plain'}
+    return jsonify({'error': 'Invalid command_id'}), 404
+
 @app.route('/executables', methods=['GET'])
 def list_executables():
     executables = [f for f in os.listdir('.') if os.path.isfile(f) and os.access(f, os.X_OK)]
@@ -774,16 +844,18 @@ def main():
         args.action = "start"
     port_used = is_port_in_use(args.listen, args.port)
     if args.action != "stop":
-        print("Starting server:")
+        print("Starting server:", flush=True)
         print_urls()
     if args.action != "stop" and port_used:
         print(f"Error: port {args.port} already in use", file=sys.stderr)
         return 1
     if args.action == "shareterm":
         COMMAND_STATUS_DIR = f"{os.getcwd()}/{COMMAND_STATUS_DIR}"
+        check_processes()
         sys.argv.remove("shareterm")
-        with open(basef + ".log", "ab+") as log:
-            pywebexec = subprocess.Popen([sys.executable] + sys.argv, stdout=log, stderr=log)
+        sys.argv[0] = PYWEBEXEC
+        with open(basef + ".log", "a") as log:
+            pywebexec = subprocess.Popen([sys.executable] + sys.argv, stdout=log, stderr=log, bufsize=1)
             print_urls(term_command_id)
             res = start_term()
             print("Stopping server")

pywebexec/static/css/style.css

@@ -14,7 +14,7 @@ body {
     position: relative;
     border-radius: 10px;
     border: 1px solid #aaa;
-    box-shadow: 0 0 10px rgba(0, 0, 0, 0.30);
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.40);
 }
 table {
     width: 100%;
@@ -54,6 +54,7 @@ select { /* Safari bug */
     border: 1px solid #ccc;
     border-radius: 10px;
     overflow-y: hidden;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.60);
 }
 .copy-icon {
     cursor: pointer;
@@ -90,6 +91,9 @@ form {
     align-items: center;
     gap: 10px;
 }
+#commandStatus {
+    vertical-align: bottom;
+}
 .status-icon {
     display: inline-block;
     width: 16px;

pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.6.2'
-__version_tuple__ = version_tuple = (1, 6, 2)
+__version__ = version = '1.6.3'
+__version_tuple__ = version_tuple = (1, 6, 3)

{pywebexec-1.6.2.dist-info → pywebexec-1.6.3.dist-info}/METADATA

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

{pywebexec-1.6.2.dist-info → pywebexec-1.6.3.dist-info}/RECORD

@@ -1,8 +1,8 @@
 pywebexec/__init__.py,sha256=4spIsVaF8RJt8S58AG_wWoORRNkws9Iwqprj27C3ljM,99
-pywebexec/pywebexec.py,sha256=S24FSD4XywesMvM6nqJMdS8E1lF9mklN4nUlnZUp9Zs,28760
-pywebexec/version.py,sha256=ay9A4GSmtr3NioHirRgXvWfXtjwRjzXIO_WPuFobCoI,411
+pywebexec/pywebexec.py,sha256=6roMSuUnfNx5fj9-gg0E1WEUEDbX82XYNIHzxsjoreE,31701
+pywebexec/version.py,sha256=mQ_8947spH9F9E4bJgRMJ3LZK_sGORi1ak9UVDzTrr8,411
 pywebexec/static/css/Consolas NF.ttf,sha256=DJEOzF0eqZ-kxu3Gs_VE8X0NJqiobBzmxWDGpdgGRxI,1313900
-pywebexec/static/css/style.css,sha256=iIKpNvKDjQ6YL7LGGzk5ZpTujZ36Zuv7fg48f2TKX94,8182
+pywebexec/static/css/style.css,sha256=oSMdSvQnjGa75p4666qkiekfzvD_cdAVxpCCjvqTApg,8275
 pywebexec/static/css/xterm.css,sha256=uo5phWaUiJgcz0DAzv46uoByLLbJLeetYosL1xf68rY,5559
 pywebexec/static/images/aborted.svg,sha256=_mP43hU5QdRLFZIknBgjx-dIXrHgQG23-QV27ApXK2A,381
 pywebexec/static/images/copy.svg,sha256=d9OwtGh5GzzZHzYcDrLfNxZYLth1Q64x7bRyYxu4Px0,622
@@ -33,9 +33,9 @@ pywebexec/static/js/xterm/xterm.js.map,sha256=Y7O2Pb-fIS7Z8AC1D5s04_aiW_Jf1f4mCf
 pywebexec/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pywebexec/templates/index.html,sha256=3XAXlpluzmTxC75KLzHDI4aJvQyQrOShB_weJ27PE2U,2815
 pywebexec/templates/popup.html,sha256=6FfzMjxuAC_xwyMGPf3p5tm6iPVY0QCsqY80eotD0z8,1362
-pywebexec-1.6.2.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-1.6.2.dist-info/METADATA,sha256=N5cjPjpSWpmYTiqiKjcrqjXhoVW6q-mUxKmot1hX7k8,7801
-pywebexec-1.6.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pywebexec-1.6.2.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-1.6.2.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-1.6.2.dist-info/RECORD,,
+pywebexec-1.6.3.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-1.6.3.dist-info/METADATA,sha256=u1r62zAugZzXBTjXCCcE6dryvFdpbRBwkioDtFVDYbw,7801
+pywebexec-1.6.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pywebexec-1.6.3.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-1.6.3.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-1.6.3.dist-info/RECORD,,