pywebexec 1.4.13__py3-none-any.whl → 1.4.15__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
@@ -223,7 +223,7 @@ def start_gunicorn(daemonized=False, baselog=None):
     if daemonized:
         if daemon_d('status', pidfilepath=baselog, silent=True):
             print(f"Error: pywebexec already running on {args.listen}:{args.port}", file=sys.stderr)
-            sys.exit(1)
+            return 1
 
     if sys.stdout.isatty():
         errorlog = "-"
@@ -244,6 +244,7 @@ def start_gunicorn(daemonized=False, baselog=None):
         'pidfile': pidfile,
     }
     PyWebExec(app, options=options).run()
+    return 0
 
 def daemon_d(action, pidfilepath, silent=False, hostname=None, args=None):
     """start/stop daemon"""
@@ -254,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()
@@ -285,21 +291,42 @@ def daemon_d(action, pidfilepath, silent=False, hostname=None, args=None):
             except Exception as e:
                 print(e)
 
-def start_term():
+def start_term(command_id):
     os.environ["PYWEBEXEC"] = " (shared)"
     os.chdir(CWD)
-    command_id = str(uuid.uuid4())
     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)
+    print("Terminal session ended")
     return res
 
+
+def print_urls(command_id=None):
+    protocol = 'https' if args.cert else 'http'
+    url_params = ""
+    token = os.environ.get("PYWEBEXEC_TOKEN")
+    if token:
+        url_params = f"?token={token}"
+    if command_id:
+        print(f"{protocol}://{hostname}:{args.port}/popup/{command_id}{url_params}")
+        print(f"{protocol}://{ip}:{args.port}/popup/{command_id}{url_params}")
+    else:
+        print(f"{protocol}://{hostname}:{args.port}{url_params}")
+        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
+    global app, args, COMMAND_STATUS_DIR, hostname, ip
 
     parser = argparse.ArgumentParser(description='Run the command execution server.')
     parser.add_argument('-u', '--user', help='Username for basic auth')
@@ -344,15 +371,14 @@ def parseargs():
         os.mkdir(COMMAND_STATUS_DIR, mode=0o700)
     if args.action == "term":
         COMMAND_STATUS_DIR = f"{os.getcwd()}/{COMMAND_STATUS_DIR}"
-        sys.exit(start_term())
+        sys.exit(start_term(str(uuid.uuid4())))
+
     (hostname, ip) = resolve(gethostname()) if args.listen == '0.0.0.0' else resolve(args.listen)
-    url_params = ""
 
     if args.tokenurl:
         token = os.environ.get("PYWEBEXEC_TOKEN", token_urlsafe())
         os.environ["PYWEBEXEC_TOKEN"] = token
         app.config["TOKEN_URL"] = token
-        url_params = f"?token={token}"
 
     if args.gencert:
         args.cert = args.cert or f"{CONFDIR}/pywebexec.crt"
@@ -375,12 +401,6 @@ def parseargs():
         app.config['USER'] = None
         app.config['PASSWORD'] = None
 
-    if args.action != 'stop':
-        print("Starting server:")
-        protocol = 'https' if args.cert else 'http'
-        print(f"{protocol}://{hostname}:{args.port}{url_params}")
-        print(f"{protocol}://{ip}:{args.port}{url_params}")
-
     return args
 
 def get_status_file_path(command_id):
@@ -700,18 +720,28 @@ 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}"
         with open(basef + ".log", "ab+") as log:
             pywebexec = subprocess.Popen([sys.executable] + sys.argv[:-1], stdout=log, stderr=log)
-            start_term()
+            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:
@@ -720,5 +750,5 @@ def main():
 
 
 if __name__ == '__main__':
-    main()
+    sys.exit(main())
     # app.run(host='0.0.0.0', port=5000)

pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.4.13'
-__version_tuple__ = version_tuple = (1, 4, 13)
+__version__ = version = '1.4.15'
+__version_tuple__ = version_tuple = (1, 4, 15)

{pywebexec-1.4.13.dist-info → pywebexec-1.4.15.dist-info}/METADATA

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

{pywebexec-1.4.13.dist-info → pywebexec-1.4.15.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pywebexec/__init__.py,sha256=4spIsVaF8RJt8S58AG_wWoORRNkws9Iwqprj27C3ljM,99
-pywebexec/pywebexec.py,sha256=KNRO31L0ArCxkS9Ph98YKzMumn0j41-ocr9TkQgKMmQ,26977
-pywebexec/version.py,sha256=bhORB-auReBqhWH8Z8Dx1LQ8cW3mTgChFk4qt6yE3rs,413
+pywebexec/pywebexec.py,sha256=KDvV9_Gbp016p_3clO_-b59j0fSyk4nbPNJK1ehfKsc,28102
+pywebexec/version.py,sha256=GV6XwJnZtaCHeM6MpSSHX9ZtGIZAtVvtA-5uewZQic0,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.13.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-1.4.13.dist-info/METADATA,sha256=vbf7BnbahIuCrkt8wGfyAo25vU5PqIGHgaor4L8uV2Y,7801
-pywebexec-1.4.13.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pywebexec-1.4.13.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-1.4.13.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-1.4.13.dist-info/RECORD,,
+pywebexec-1.4.15.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-1.4.15.dist-info/METADATA,sha256=kak3uf5US-34yqqjx7GsyY_tW1AiUF9yJMDSs5n6TLY,7801
+pywebexec-1.4.15.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pywebexec-1.4.15.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-1.4.15.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-1.4.15.dist-info/RECORD,,