pywebexec 1.6.10__py3-none-any.whl → 1.6.12__py3-none-any.whl

pywebexec/pywebexec.py

@@ -25,7 +25,7 @@ import termios
 import struct
 import subprocess
 import logging
-
+import pyte
 
 if os.environ.get('PYWEBEXEC_LDAP_SERVER'):
     from ldap3 import Server, Connection, ALL, SIMPLE, SUBTREE, Tls
@@ -181,8 +181,14 @@ class PyWebExec(Application):
     def load(self):
         return self.application
 
-
-ANSI_ESCAPE = re.compile(br'(?:\x1B[@-Z\\-_]|\x1B([(]B|>)|(?:\x1B\[|\x9B)[0-?]*[ -/]*[@-~]|\x1B\[[0-9]{1,2};[0-9]{1,2}[m|K]|\x1B\[[0-9;]*[mGKHF]|[\x00-\x1F\x7F])')
+def get_visible_output(line):
+    screen = pyte.Screen(len(line)+1, 2)
+    stream = pyte.Stream(screen)
+    stream.feed(line)
+    visible_line = screen.display[0]
+    return visible_line
+                                                                                                    #38;2;66;59;165m
+ANSI_ESCAPE = re.compile(br'(?:\x1B[@-Z\\-_]|\x1B([(]B|>)|(?:\x1B\[|\x9B)[0-?]*[ -/]*[@-~]|\x1B\[([0-9]{1,2};){0,4}[0-9]{1,3}[m|K]|\x1B\[[0-9;]*[mGKHF]|[\x00-\x1F\x7F])')
 
 def strip_ansi_control_chars(text):
     """Remove ANSI and control characters from the text."""
@@ -192,7 +198,7 @@ def strip_ansi_control_chars(text):
 def decode_line(line: bytes) -> str:
     """try decode line exception on binary"""
     try:
-        return strip_ansi_control_chars(line).decode().strip(" ")
+        return get_visible_output(line.decode()).strip(" ")
     except UnicodeDecodeError:
         return ""
 
@@ -216,6 +222,8 @@ def last_line(fd, maxsize=500):
             break
         last_pos = fd.tell()
         line = decode_line(fd.readline())
+    if size == maxsize:
+        return ""
     return line.strip()
 
 
@@ -330,11 +338,13 @@ 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}", flush=True)
-        print(f"{protocol}://{ip}:{args.port}/dopopup/{command_id}{url_params}", flush=True)
+        print(f"web popup: {protocol}://{hostname}:{args.port}/dopopup/{command_id}{url_params}", flush=True)
+        print(f"web popup: {protocol}://{ip}:{args.port}/dopopup/{command_id}{url_params}", flush=True)
+        print(f"raw output: {protocol}://{hostname}:{args.port}/command_output_raw/{command_id}{url_params}", flush=True)
+        print(f"raw output: {protocol}://{ip}:{args.port}/command_output_raw/{command_id}{url_params}", flush=True)
     else:
-        print(f"{protocol}://{hostname}:{args.port}{url_params}", flush=True)
-        print(f"{protocol}://{ip}:{args.port}{url_params}", flush=True)
+        print(f"web commands: {protocol}://{hostname}:{args.port}{url_params}", flush=True)
+        print(f"web commands: {protocol}://{ip}:{args.port}{url_params}", flush=True)
 
 
 def is_port_in_use(address, port):
@@ -813,6 +823,7 @@ def get_command_output_raw(command_id):
                             yield chunk
                         status = read_command_status(command_id)
                         if not status or status['status'] != 'running':
+                            yield f"\nEnd of command {command_id} {status.get('status', '')} exit: {status.get('exit_code')}\n"
                             break
         except GeneratorExit:
             return

pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.6.10'
-__version_tuple__ = version_tuple = (1, 6, 10)
+__version__ = version = '1.6.12'
+__version_tuple__ = version_tuple = (1, 6, 12)

{pywebexec-1.6.10.dist-info → pywebexec-1.6.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 1.6.10
+Version: 1.6.12
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -59,6 +59,7 @@ Requires-Dist: Flask-HTTPAuth>=4.8.0
 Requires-Dist: pexpect>=4.9.0
 Requires-Dist: gunicorn>=21.2.0
 Requires-Dist: ldap3>=2.9.1
+Requires-Dist: pyte>=0.8.1
 
 [![Pypi version](https://img.shields.io/pypi/v/pywebexec.svg)](https://pypi.org/project/pywebexec/)
 ![example](https://github.com/joknarf/pywebexec/actions/workflows/python-publish.yml/badge.svg)

{pywebexec-1.6.10.dist-info → pywebexec-1.6.12.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pywebexec/__init__.py,sha256=4spIsVaF8RJt8S58AG_wWoORRNkws9Iwqprj27C3ljM,99
-pywebexec/pywebexec.py,sha256=3T3qSfM9wDLkjlQwj33gJ0KN9J3EwQC0UnFohHOV3M4,32161
-pywebexec/version.py,sha256=Lku74dRhc9EC3uT_BFGpwGtdeZT0GPBqsGw5eMXm9qw,413
+pywebexec/pywebexec.py,sha256=QUz8TzAfi8Oed3Nqsi0CLH0QA2arh-fpB9p5ASyo5DY,32934
+pywebexec/version.py,sha256=dUu2OxelDtAMXjHtstu0l-dD_T_j4hfz4LAPXSgLBBc,413
 pywebexec/static/css/Consolas NF.ttf,sha256=DJEOzF0eqZ-kxu3Gs_VE8X0NJqiobBzmxWDGpdgGRxI,1313900
 pywebexec/static/css/style.css,sha256=MJHUBpjWL4sLxM7a7DxypmPKaFJQbmA_ESNXsbLviNI,8201
 pywebexec/static/css/xterm.css,sha256=uo5phWaUiJgcz0DAzv46uoByLLbJLeetYosL1xf68rY,5559
@@ -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=5h8kLyzAhbvUDU9sEwrGIvD6FxAMcDZLXlN-ldlO8KU,2880
 pywebexec/templates/popup.html,sha256=3ZqQcE9mYs-RXv0Lfb24zntOlvR137ZYI9mtCZNVAo0,1407
-pywebexec-1.6.10.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-1.6.10.dist-info/METADATA,sha256=hM3te7ICelnKxOqnHCTYL9iCeY7gAhZcERYv2aiYiWA,7974
-pywebexec-1.6.10.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pywebexec-1.6.10.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-1.6.10.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-1.6.10.dist-info/RECORD,,
+pywebexec-1.6.12.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-1.6.12.dist-info/METADATA,sha256=eEWP4ACcL7fYNW6RuMNaGbvZL5g85ESH35YdtzKSrL4,8001
+pywebexec-1.6.12.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pywebexec-1.6.12.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-1.6.12.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-1.6.12.dist-info/RECORD,,