pywebexec 1.4.10__tar.gz → 1.4.12__tar.gz

{pywebexec-1.4.10/pywebexec.egg-info → pywebexec-1.4.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 1.4.10
+Version: 1.4.12
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -113,6 +113,18 @@ $ pywebexec --dir ~/myscripts --listen 0.0.0.0 --port 8080 --title myscripts
 $ pywebexec -d ~/myscripts -l 0.0.0.0 -p 8080 -t myscripts
 ```
 
+## Sharing terminals
+
+* start server and share tty in one command
+```shell
+$ pywebexec -d ~/webshare shareterm
+```
+* share tty with an already pywebexec server started
+```shell
+$ pywebexec -d ~/webshare term
+```
+if another user need to share his terminal, he need to have write permission on `<dir>/.web_status` directory.
+
 ## Safe url token
 
 * generate safe url, use the url to access the server

{pywebexec-1.4.10 → pywebexec-1.4.12}/README.md

@@ -51,6 +51,18 @@ $ pywebexec --dir ~/myscripts --listen 0.0.0.0 --port 8080 --title myscripts
 $ pywebexec -d ~/myscripts -l 0.0.0.0 -p 8080 -t myscripts
 ```
 
+## Sharing terminals
+
+* start server and share tty in one command
+```shell
+$ pywebexec -d ~/webshare shareterm
+```
+* share tty with an already pywebexec server started
+```shell
+$ pywebexec -d ~/webshare term
+```
+if another user need to share his terminal, he need to have write permission on `<dir>/.web_status` directory.
+
 ## Safe url token
 
 * generate safe url, use the url to access the server

{pywebexec-1.4.10 → pywebexec-1.4.12}/pywebexec/pywebexec.py

@@ -9,6 +9,7 @@ import argparse
 import random
 import string
 from datetime import datetime, timezone, timedelta
+import time
 import shlex
 from gunicorn.app.base import Application
 import ipaddress
@@ -22,6 +23,7 @@ import signal
 import fcntl
 import termios
 import struct
+import subprocess
 
 
 if os.environ.get('PYWEBEXEC_LDAP_SERVER'):
@@ -40,6 +42,7 @@ app.config['LDAP_BIND_DN'] = os.environ.get('PYWEBEXEC_LDAP_BIND_DN')
 app.config['LDAP_BIND_PASSWORD'] = os.environ.get('PYWEBEXEC_LDAP_BIND_PASSWORD')
 
 # Directory to store the command status and output
+CWD = os.getcwd()
 COMMAND_STATUS_DIR = '.web_status'
 CONFDIR = os.path.expanduser("~/")
 if os.path.isdir(f"{CONFDIR}/.config"):
@@ -216,17 +219,19 @@ def get_last_non_empty_line_of_file(file_path):
     
 
 def start_gunicorn(daemonized=False, baselog=None):
+    pidfile = f"{baselog}.pid"
     if daemonized:
-        errorlog = f"{baselog}.log"
-        accesslog = None # f"{baselog}.access.log"
-        pidfile = f"{baselog}.pid"
         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)
-    else:
+
+    if sys.stdout.isatty():
         errorlog = "-"
         accesslog = None #"-"
-        pidfile = None
+    else:
+        errorlog = f"{baselog}.log"
+        accesslog = None # f"{baselog}.access.log"
+
     options = {
         'bind': '%s:%s' % (args.listen, args.port),
         'workers': 4,
@@ -280,6 +285,19 @@ def daemon_d(action, pidfilepath, silent=False, hostname=None, args=None):
             except Exception as e:
                 print(e)
 
+def start_term():
+    os.environ["PYWEBEXEC"] = " (shared)"
+    os.chdir(CWD)
+    command_id = str(uuid.uuid4())
+    start_time = datetime.now().isoformat()
+    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)
+    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 res
+
 def parseargs():
     global app, args, COMMAND_STATUS_DIR
 
@@ -306,10 +324,10 @@ def parseargs():
     parser.add_argument("-k", "--key", type=str, help="Path to https certificate key")
     parser.add_argument("-g", "--gencert", action="store_true", help="https server self signed cert")
     parser.add_argument("-T", "--tokenurl", action="store_true", help="generate safe url to access")
-    parser.add_argument("action", nargs="?", help="daemon action start/stop/restart/status/term", choices=["start","stop","restart","status","term"])
+    parser.add_argument("action", nargs="?", help="daemon action start/stop/restart/status/shareterm/term",
+                        choices=["start","stop","restart","status","shareterm", "term"])
 
     args = parser.parse_args()
-    cwd = os.getcwd()
     if os.path.isdir(args.dir):
         try:
             os.chdir(args.dir)
@@ -325,21 +343,13 @@ def parseargs():
         os.mkdir(CONFDIR, mode=0o700)
     if args.action == "term":
         COMMAND_STATUS_DIR = f"{os.getcwd()}/{COMMAND_STATUS_DIR}"
-        os.chdir(cwd)
-        command_id = str(uuid.uuid4())
-        start_time = datetime.now().isoformat()
-        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)
-        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)
+        sys.exit(start_term())
     (hostname, ip) = resolve(gethostname()) if args.listen == '0.0.0.0' else resolve(args.listen)
     url_params = ""
 
     if args.tokenurl:
-        token = token_urlsafe()
+        token = os.environ.get("PYWEBEXEC_TOKEN", token_urlsafe())
+        os.environ["PYWEBEXEC_TOKEN"] = token
         app.config["TOKEN_URL"] = token
         url_params = f"?token={token}"
 
@@ -446,7 +456,6 @@ def script(output_file):
         sigwinch_passthrough(None, None)
         signal.signal(signal.SIGWINCH, sigwinch_passthrough)
         p.interact()
-
     
 
 def run_command(command, params, command_id, user):
@@ -688,12 +697,26 @@ def popup(command_id):
     return render_template('popup.html', command_id=command_id)
 
 def main():
+    global COMMAND_STATUS_DIR
     basef = f"{CONFDIR}/pywebexec_{args.listen}:{args.port}"
+    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()
+            time.sleep(1)
+            pywebexec.terminate()
+        sys.exit()
+
+    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:
         return daemon_d(args.action, pidfilepath=basef)
-    return start_gunicorn()
+    return start_gunicorn(baselog=basef)
+
 
 if __name__ == '__main__':
     main()

{pywebexec-1.4.10 → pywebexec-1.4.12}/pywebexec/static/js/popup.js

@@ -47,6 +47,7 @@ async function fetchOutput(url) {
     try {
         const response = await fetch(url);
         if (!response.ok) {
+            document.getElementById('dimmer').style.display = 'none';
             return;
         }
         const data = await response.json();
@@ -72,6 +73,7 @@ async function fetchOutput(url) {
             }
         }
     } catch (error) {
+        document.getElementById('dimmer').style.display = 'block';
         console.log('Error fetching output:', error);
     }
 }

{pywebexec-1.4.10 → pywebexec-1.4.12}/pywebexec/templates/popup.html

@@ -8,6 +8,9 @@
     <link rel="stylesheet" href="/static/css/xterm.css">
 </head>
 <body>
+    <div id="dimmer" class="dimmer">
+        <div class="dimmer-text">Server not available</div>
+    </div>
     <div id="output" class="output"></div>
     <div class="slider-container">
         <input type="range" id="outputSlider" min="0" max="100" value="100">

{pywebexec-1.4.10 → pywebexec-1.4.12}/pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.4.10'
-__version_tuple__ = version_tuple = (1, 4, 10)
+__version__ = version = '1.4.12'
+__version_tuple__ = version_tuple = (1, 4, 12)

{pywebexec-1.4.10 → pywebexec-1.4.12/pywebexec.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 1.4.10
+Version: 1.4.12
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -113,6 +113,18 @@ $ pywebexec --dir ~/myscripts --listen 0.0.0.0 --port 8080 --title myscripts
 $ pywebexec -d ~/myscripts -l 0.0.0.0 -p 8080 -t myscripts
 ```
 
+## Sharing terminals
+
+* start server and share tty in one command
+```shell
+$ pywebexec -d ~/webshare shareterm
+```
+* share tty with an already pywebexec server started
+```shell
+$ pywebexec -d ~/webshare term
+```
+if another user need to share his terminal, he need to have write permission on `<dir>/.web_status` directory.
+
 ## Safe url token
 
 * generate safe url, use the url to access the server