pywebexec 1.4.14__py3-none-any.whl → 1.4.16__py3-none-any.whl

pywebexec/pywebexec.py

@@ -13,7 +13,7 @@ import time
 import shlex
 from gunicorn.app.base import Application
 import ipaddress
-from socket import gethostname, gethostbyname_ex, gethostbyaddr, inet_aton, inet_ntoa
+from socket import socket, gethostname, gethostbyname_ex, gethostbyaddr, inet_aton, inet_ntoa, AF_INET, SOCK_STREAM
 import ssl
 import re
 import pwd
@@ -255,10 +255,15 @@ def daemon_d(action, pidfilepath, silent=False, hostname=None, args=None):
         if pidfile.is_locked():
             pid = pidfile.read_pid()
             print(f"Stopping server pid {pid}")
-            try:
-                os.kill(pid, signal.SIGINT)
-            except:
-                return False
+            n = 20
+            while n > 0:
+                try:
+                    os.kill(pid, signal.SIGINT)
+                    time.sleep(0.25)
+                    n -= 1
+                except ProcessLookupError:
+                    return True
+            print("Failed to stop server", file=sys.stderr)    
             return True
     elif action == "status":
         status = pidfile.is_locked()
@@ -291,12 +296,14 @@ def start_term(command_id):
     os.chdir(CWD)
     start_time = datetime.now().isoformat()
     user = pwd.getpwuid(os.getuid())[0]
+    print(f"Starting terminal session for {user} : {command_id}")
     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)
     res = script(output_file_path)
     end_time = datetime.now().isoformat()
     update_command_status(command_id, status="success", end_time=end_time, exit_code=res)
-    return command_id
+    print("Terminal session ended")
+    return res
 
 
 def print_urls(command_id=None):
@@ -313,6 +320,11 @@ def print_urls(command_id=None):
         print(f"{protocol}://{ip}:{args.port}{url_params}")
 
 
+def is_port_in_use(address, port):
+    with socket(AF_INET, SOCK_STREAM) as s:
+        return s.connect_ex((address, port)) == 0
+
+
 def parseargs():
     global app, args, COMMAND_STATUS_DIR, hostname, ip
 
@@ -359,8 +371,8 @@ def parseargs():
         os.mkdir(COMMAND_STATUS_DIR, mode=0o700)
     if args.action == "term":
         COMMAND_STATUS_DIR = f"{os.getcwd()}/{COMMAND_STATUS_DIR}"
-        start_term(str(uuid.uuid4()))
-        sys.exit(0)
+        sys.exit(start_term(str(uuid.uuid4())))
+
     (hostname, ip) = resolve(gethostname()) if args.listen == '0.0.0.0' else resolve(args.listen)
 
     if args.tokenurl:
@@ -389,9 +401,6 @@ def parseargs():
         app.config['USER'] = None
         app.config['PASSWORD'] = None
 
-    if args.action != 'stop':
-        print("Starting server:")
-        print_urls()
     return args
 
 def get_status_file_path(command_id):
@@ -711,20 +720,29 @@ def popup(command_id):
 def main():
     global COMMAND_STATUS_DIR
     basef = f"{CONFDIR}/pywebexec_{args.listen}:{args.port}"
+    if args.action == "restart":
+        daemon_d('stop', pidfilepath=basef)
+        args.action = "start"
+    port_used = is_port_in_use(args.listen, args.port)
+    if args.action != "stop":
+        print("Starting server:")
+        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}"
+        sys.argv.remove("shareterm")
         with open(basef + ".log", "ab+") as log:
-            pywebexec = subprocess.Popen([sys.executable] + sys.argv[:-1], stdout=log, stderr=log)
+            pywebexec = subprocess.Popen([sys.executable] + sys.argv, stdout=log, stderr=log)
             command_id = str(uuid.uuid4())
             print_urls(command_id)
             res = start_term(command_id)
+            print("Stopping server")
             time.sleep(1)
             pywebexec.terminate()
-        sys.exit()
+        sys.exit(res)
 
-    if args.action == "restart":
-        daemon_d('stop', pidfilepath=basef)
-        args.action = "start"
     if args.action == "start":
         return start_gunicorn(daemonized=True, baselog=basef)
     if args.action:

pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.4.14'
-__version_tuple__ = version_tuple = (1, 4, 14)
+__version__ = version = '1.4.16'
+__version_tuple__ = version_tuple = (1, 4, 16)

{pywebexec-1.4.14.dist-info → pywebexec-1.4.16.dist-info}/METADATA

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

{pywebexec-1.4.14.dist-info → pywebexec-1.4.16.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pywebexec/__init__.py,sha256=4spIsVaF8RJt8S58AG_wWoORRNkws9Iwqprj27C3ljM,99
-pywebexec/pywebexec.py,sha256=-wnb1KGTGKHRZUipcvZMwb8yQkidkhs_J_jMR6f84o4,27419
-pywebexec/version.py,sha256=LXsHxD5FW3f8CmcjK3voP4WqE9lpQQNN_tpUuI6VMfI,413
+pywebexec/pywebexec.py,sha256=095dLydKEtrihG4ld78yqy5QIbFIWO_JdugtHj10FzI,28134
+pywebexec/version.py,sha256=sKRJPUEh1laY8OT9vcLeuQ7G3PQC7WcvaaimRXuCRuo,413
 pywebexec/static/css/Consolas NF.ttf,sha256=DJEOzF0eqZ-kxu3Gs_VE8X0NJqiobBzmxWDGpdgGRxI,1313900
 pywebexec/static/css/style.css,sha256=cGJHPFj23SQ_bFpesfUaFA3VFxhXtpRUOL_zzx3x_X8,5726
 pywebexec/static/css/xterm.css,sha256=gy8_LGA7Q61DUf8ElwFQzHqHMBQnbbEmpgZcbdgeSHI,5383
@@ -23,9 +23,9 @@ pywebexec/static/js/xterm/xterm.js,sha256=Bzka76jZwEhVt_LlS0e0qMw7ryGa1p5qfxFyeo
 pywebexec/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pywebexec/templates/index.html,sha256=DYtT555wSNhnFtzzHhPMWJireynCJNnAuTytpoORQeE,2321
 pywebexec/templates/popup.html,sha256=T6_tAOUoA58sA1oxB5pb8i42RenoMdCsH8T86Gccb6Q,945
-pywebexec-1.4.14.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-1.4.14.dist-info/METADATA,sha256=70sAlcFCe8Lx83npHf3snGV36Ez3OPtfVISxo9IrfaE,7801
-pywebexec-1.4.14.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pywebexec-1.4.14.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-1.4.14.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-1.4.14.dist-info/RECORD,,
+pywebexec-1.4.16.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-1.4.16.dist-info/METADATA,sha256=O_TD8MqU1G4_EpqVrGmj9Vj9LSkLwmvbQr6Ui4IpwNo,7801
+pywebexec-1.4.16.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pywebexec-1.4.16.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-1.4.16.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-1.4.16.dist-info/RECORD,,