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

pywebexec/pywebexec.py

@@ -44,7 +44,7 @@ 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("~/")
+CONFDIR = os.path.expanduser("~/").rstrip('/')
 if os.path.isdir(f"{CONFDIR}/.config"):
     CONFDIR += '/.config'
 CONFDIR += "/.pywebexec"
@@ -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"""
@@ -285,10 +286,9 @@ 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]
     update_command_status(command_id, 'running', command="term", params=[user,os.ttyname(sys.stdout.fileno())], start_time=start_time, user=user)
@@ -296,10 +296,25 @@ def start_term():
     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
+    return command_id
+
+
+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 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')
@@ -311,7 +326,7 @@ def parseargs():
         "-p", "--port", type=int, default=8080, help="HTTP server listen port"
     )
     parser.add_argument(
-        "-d", "--dir", type=str, default=os.getcwd(), help="Serve target directory"
+        "-d", "--dir", type=str, help=f"Serve target directory. default {CONFDIR}"
     )
     parser.add_argument(
         "-t",
@@ -328,6 +343,9 @@ def parseargs():
                         choices=["start","stop","restart","status","shareterm", "term"])
 
     args = parser.parse_args()
+    if not os.path.exists(CONFDIR):
+        os.mkdir(CONFDIR, mode=0o700)
+    args.dir = args.dir or CONFDIR
     if os.path.isdir(args.dir):
         try:
             os.chdir(args.dir)
@@ -338,20 +356,17 @@ def parseargs():
         print(f"Error: {args.dir} not found", file=sys.stderr)
         sys.exit(1)
     if not os.path.exists(COMMAND_STATUS_DIR):
-        os.makedirs(COMMAND_STATUS_DIR)
-    if not os.path.exists(CONFDIR):
-        os.mkdir(CONFDIR, mode=0o700)
+        os.mkdir(COMMAND_STATUS_DIR, mode=0o700)
     if args.action == "term":
         COMMAND_STATUS_DIR = f"{os.getcwd()}/{COMMAND_STATUS_DIR}"
-        sys.exit(start_term())
+        start_term(str(uuid.uuid4()))
+        sys.exit(0)
     (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"
@@ -376,10 +391,7 @@ def parseargs():
 
     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}")
-
+        print_urls()
     return args
 
 def get_status_file_path(command_id):
@@ -703,7 +715,9 @@ def main():
         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)
             time.sleep(1)
             pywebexec.terminate()
         sys.exit()
@@ -719,5 +733,5 @@ def main():
 
 
 if __name__ == '__main__':
-    main()
+    sys.exit(main())
     # app.run(host='0.0.0.0', port=5000)

pywebexec/static/css/style.css

@@ -267,14 +267,12 @@ span {
     width: 100%;
 }
 .popup-button {
-    background: none;
-    border: none;
+    background-color: transparent;
+    background-image: url("/static/images/popup.svg");
     cursor: pointer;
+    border: none;
     padding: 0;
-    margin-left: 5px;
     vertical-align: middle;
-}
-.popup-button img {
     width: 16px;
     height: 16px;
 }

pywebexec/static/js/script.js

@@ -111,9 +111,7 @@ async function fetchCommands() {
                     ${command.command.startsWith('term') ? '' : command.status === 'running' ? `<button onclick="stopCommand('${command.command_id}', event)">Stop</button>` : `<button onclick="relaunchCommand('${command.command_id}', event)">Run</button>`}
                 </td>
                 <td class="monospace outcol">
-                    <button class="popup-button" onclick="openPopup('${command.command_id}', event)">
-                        <img src="/static/images/popup.svg" alt="Popup">
-                    </button>
+                    <button class="popup-button" onclick="openPopup('${command.command_id}', event)"></button>
                     ${command.last_output_line || ''}
                 </td>
             `;

pywebexec/version.py

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 1.4.12
+Version: 1.4.14
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -76,8 +76,14 @@ $ pip install pywebexec
 
 ## Quick start
 
-* put in a directory the scripts/commands/links to commands you want to expose
-* start http server serving current directory executables listening on 0.0.0.0 port 8080
+* share terminal
+```shell
+$ pywebexec shareterm
+```
+
+* serve executables
+  * put in a directory the scripts/commands/links to commands you want to expose
+  * start http server serving current directory executables listening on 0.0.0.0 port 8080
 ```shell
 $ pywebexec -d <dir>
 ```

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

@@ -1,8 +1,8 @@
 pywebexec/__init__.py,sha256=4spIsVaF8RJt8S58AG_wWoORRNkws9Iwqprj27C3ljM,99
-pywebexec/pywebexec.py,sha256=bo_rh0wsEkcOXltOZMiZlojqABCAQqDM33cJGUUmnrU,26922
-pywebexec/version.py,sha256=Zv4TpC5V6FOmlNNowuZivqOrr2E0lJ1Gpdzj7o5gDYw,413
+pywebexec/pywebexec.py,sha256=-wnb1KGTGKHRZUipcvZMwb8yQkidkhs_J_jMR6f84o4,27419
+pywebexec/version.py,sha256=LXsHxD5FW3f8CmcjK3voP4WqE9lpQQNN_tpUuI6VMfI,413
 pywebexec/static/css/Consolas NF.ttf,sha256=DJEOzF0eqZ-kxu3Gs_VE8X0NJqiobBzmxWDGpdgGRxI,1313900
-pywebexec/static/css/style.css,sha256=sDBhZ-csW5THIKfTDsHqxCSg6rIJ91Oh15sjw_HjJo4,5702
+pywebexec/static/css/style.css,sha256=cGJHPFj23SQ_bFpesfUaFA3VFxhXtpRUOL_zzx3x_X8,5726
 pywebexec/static/css/xterm.css,sha256=gy8_LGA7Q61DUf8ElwFQzHqHMBQnbbEmpgZcbdgeSHI,5383
 pywebexec/static/images/aborted.svg,sha256=_mP43hU5QdRLFZIknBgjx-dIXrHgQG23-QV27ApXK2A,381
 pywebexec/static/images/copy.svg,sha256=d9OwtGh5GzzZHzYcDrLfNxZYLth1Q64x7bRyYxu4Px0,622
@@ -15,7 +15,7 @@ pywebexec/static/images/running.gif,sha256=iYuzQGkMxrakSIwt6gPieKCImGZoSAHmU5MUN
 pywebexec/static/images/success.svg,sha256=PJDcCSTevJh7rkfSFLtc7P0pbeh8PVQBS8DaOLQemmc,489
 pywebexec/static/js/commands.js,sha256=8JDb3Q55EJOYf2Q9Uy6qEuqAnn1oGjM0RndgQ4aOjqo,7725
 pywebexec/static/js/popup.js,sha256=i7BPBh6oS0Q6H528DwP6KwJ8CKh7ULwm1rLHSbyvDhk,4656
-pywebexec/static/js/script.js,sha256=QlYuIdvolTwxkJtgp7-X1IRM9Hr8D08iQCyCzZjv3hk,12255
+pywebexec/static/js/script.js,sha256=x3YJn61YOpV5bSum3nrV7MRP7lMAAWv1-mhWBJen2nE,12161
 pywebexec/static/js/xterm/LICENSE,sha256=EU1P4eXTull-_T9I80VuwnJXubB-zLzUl3xpEYj2T1M,1083
 pywebexec/static/js/xterm/ansi_up.min.js,sha256=KNGV0vEr30hNqKQimTAvGVy-icD5A1JqMQTtvYtKR2Y,13203
 pywebexec/static/js/xterm/xterm-addon-fit.js,sha256=Pprm9pZe4SadVXS5Bc8b9VnC9Ex4QlWwA0pxOH53Gck,1460
@@ -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.12.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-1.4.12.dist-info/METADATA,sha256=cCiJmWvh3DHBVJa0uRdM6-oMEBFyU3g0nSNxrhz5Y1I,7724
-pywebexec-1.4.12.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pywebexec-1.4.12.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-1.4.12.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-1.4.12.dist-info/RECORD,,
+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,,