pywebexec 2.0.10__py3-none-any.whl → 2.0.11__py3-none-any.whl

pywebexec/pywebexec.py

@@ -358,7 +358,8 @@ def parseargs():
     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/shareterm/term",
-                        choices=["start","stop","restart","status","shareterm", "term"])
+                        choices=["start","stop","restart","status","shareterm", "term", "run"])
+    parser.add_argument("command", nargs="*", help="command to run")    
 
     args = parser.parse_args()
     if not os.path.exists(CONFDIR):
@@ -378,6 +379,12 @@ def parseargs():
     if args.action == "term":
         COMMAND_STATUS_DIR = f"{os.getcwd()}/{COMMAND_STATUS_DIR}"
         sys.exit(start_term())
+    elif args.action == "run":
+        command = args.command[0]
+        params = args.command[1:]
+        command_id = term_command_id
+        exit_code = run_command("localhost", args.user, command, params, command_id, tty_rows, tty_cols)
+        sys.exit(exit_code)
 
     (hostname, ip) = host_ip.get_host_ip(args.listen)
 
@@ -483,10 +490,14 @@ def run_command(fromip, user, command, params, command_id, rows, cols):
     # app.logger.info(f'{fromip} run_command {command_id} {user}: {command} {params}')
     log_info(fromip, user, f'run_command {command_id}: {command_str(command, params)}')
     start_time = datetime.now(timezone.utc).isoformat()
+    if user:
+        os.environ['PYWEBEXEC_USER'] = user
     update_command_status(command_id, {
         'command': command,
         'params': params,
         'start_time': start_time,
+        'status': 'running',
+        'from': fromip,
         'user': user,
         'cols': cols,
         'rows': rows,
@@ -539,7 +550,7 @@ def run_command(fromip, user, command, params, command_id, rows, cols):
         with open(get_output_file_path(command_id), 'a') as output_file:
             output_file.write(str(e))
         app.logger.error(fromip, user, f'Error running command {command_id}: {e}')
-
+    return exit_code
 
 def command_str(command, params):
     try:
@@ -603,12 +614,6 @@ def check_processes():
                         'exit_code': -1,
                     })
 
-args = parseargs()
-if args.cert:
-    app.config['SESSION_COOKIE_SECURE'] = True
-app.config['TITLE'] = f"{args.title} API"
-
-
 def log_info(fromip, user, message):
     app.logger.info(f"{user} {fromip}: {message}")
 
@@ -618,6 +623,14 @@ def log_error(fromip, user, message):
 def log_request(message):
     log_info(request.remote_addr, session.get('username', '-'), message)
 
+
+args = parseargs()
+if args.cert:
+    app.config['SESSION_COOKIE_SECURE'] = True
+app.config['TITLE'] = f"{args.title} API"
+
+
+
 def get_executable(cmd):
     if os.path.isfile(cmd) and os.access(cmd, os.X_OK):
         help_file = f"{cmd}.help"

pywebexec/static/css/form.css

@@ -8,152 +8,173 @@
 #schemaForm, .schema-form {
 font-size: 14px;
 
-.glyphicon-plus-sign:before {
-  content: "\e081";
-}
-.glyphicon-minus-sign:before {
-  content: "\e082";
-}
-
-.glyphicon {
-  position: relative;
-  top: 1px;
-  display: inline-block;
-  font-family: 'Glyphicons Halflings';
-  font-style: normal;
-  font-weight: normal;
-  line-height: 1;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
+  .glyphicon-plus-sign:before {
+    content: "\e081";
+  }
+  .glyphicon-minus-sign:before {
+    content: "\e082";
+  }
 
-.btn {
-  font-size: 14px;
-  font-weight: normal;
-  text-align: center;
-  white-space: nowrap;
-  cursor: pointer;
-  padding: 3px 13px;
-  border: 1px solid transparent;
-  border-radius: 15px;
-  font-family: Arial, Helvetica, sans-serif;
-}
-.btn-primary {
-  position: relative;
-  margin-bottom: 10px;
-  height: 24px;
-  top: 20px;
-  color: #fff;
-  background-color: #337ab7;
-  border-color: #2e6da4;    
-}
-.btn-primary:hover {
-  background-color: #286090;
-  border-color: #204d74;  
-}
-.btn-default {
-  background-color: transparent;
-  padding: 3px 5px 2px 5px;
-  color: #333;
-  /* border: 1px solid #ccc; */
-  /* color: #eee; */
-}
+  .glyphicon {
+    position: relative;
+    top: 1px;
+    display: inline-block;
+    font-family: 'Glyphicons Halflings';
+    font-style: normal;
+    font-weight: normal;
+    line-height: 1;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+  }
 
+  .btn {
+    font-size: 14px;
+    font-weight: normal;
+    text-align: center;
+    white-space: nowrap;
+    cursor: pointer;
+    padding: 3px 13px;
+    border: 1px solid transparent;
+    border-radius: 15px;
+    font-family: Arial, Helvetica, sans-serif;
+  }
+  .btn-primary {
+    position: relative;
+    margin-bottom: 10px;
+    height: 24px;
+    top: 20px;
+    color: #fff;
+    background-color: #337ab7;
+    border-color: #2e6da4;    
+  }
+  .btn-primary:hover {
+    background-color: #286090;
+    border-color: #204d74;  
+  }
+  .btn-default {
+    background-color: transparent;
+    padding: 3px 5px 2px 5px;
+    color: #333;
+    /* border: 1px solid #ccc; */
+    /* color: #eee; */
+  }
 
-/* Custom Style */
-.help-block {
-  font-size: 12px;
-  color: #808080;
-  display: block;
-  margin-top: 5px;
-  margin-bottom: 10px;
-}
-.form-control {
-  font-size: 14px;
-  font-weight: normal;
-  line-height: 1.42857143;
-  color: #555;
-  background-color: #fff;
-  background-image: none;
-  border: 1px solid #ccc;
-  display: inline-block;
-  width: auto;
-  vertical-align: middle;
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);  
-  transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-  box-sizing: border-box;
-  padding: 3px 10px;
-  height: 24px;
-  border-radius: 15px;
-  margin: 0;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-  -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
-  -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-  transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-}
-.form-control:focus {
-  border-color: #66afe9;
-  outline: 0;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
-          box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
-}
 
-.jsonform-required > label:after {
-  content: ' *';
-  color: red;
-}
-label {
-  display: inline-block;
-  max-width: 100%;
-  margin-bottom: 5px;
-  font-weight: bold;
-  color: #444;
-  margin-left: 5px;
-  font-size: 14px;
-}
-.form-inline {
-  align-items: unset;
-  display: flex;
-  flex-flow: wrap;
-  gap: 10px;
-}
-.form-inline .checkbox {
-  margin-top: 0px;
-  margin-bottom: 1px;
-  padding: 0;
-}
-input[type="checkbox"] {
-  display: block;
-  position: relative;
-  margin: 0;
-  top: 5px;
-}
-li > div > label {
-  display: none;
-}
-ul {
-  padding: 0;
-  margin: 0;
-}
-li {
-  display: flex;
-}
-input, select {
-  min-width: unset;
-  max-width: unset;
-  width: auto;
-}
-input[type="number"] {
-  max-width: 100px;
-  text-align: right;
-}
-select {
-  -webkit-appearance: auto;
-  -moz-appearance: auto;
-  appearance: auto;
-}
+  /* Custom Style */
+  .help-block {
+    font-size: 12px;
+    color: #808080;
+    display: block;
+    margin-top: 5px;
+    margin-bottom: 10px;
+  }
+  .form-control {
+    font-size: 14px;
+    font-weight: normal;
+    line-height: 1.42857143;
+    color: #555;
+    background-color: #fff;
+    background-image: none;
+    border: 1px solid #ccc;
+    display: inline-block;
+    width: auto;
+    vertical-align: middle;
+    box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);  
+    transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+    box-sizing: border-box;
+    padding: 3px 10px;
+    height: 24px;
+    border-radius: 15px;
+    margin: 0;
+    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+    box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+    -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
+    -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+    transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+  }
+  .form-control:focus {
+    border-color: #66afe9;
+    outline: 0;
+    -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
+            box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
+  }
 
+  .jsonform-required > label:after {
+    content: ' *';
+    color: red;
+  }
+  label {
+    display: inline-block;
+    max-width: 100%;
+    margin-bottom: 5px;
+    font-weight: bold;
+    color: #444;
+    margin-left: 5px;
+    font-size: 14px;
+  }
+  .form-inline {
+    align-items: unset;
+    display: flex;
+    flex-flow: wrap;
+    gap: 10px;
+  }
+  .form-inline .checkbox {
+    margin-top: 0px;
+    margin-bottom: 1px;
+    padding: 0;
+  }
+  input[type="checkbox"] {
+    display: block;
+    position: relative;
+    margin: 0;
+    top: 5px;
+  }
+  li > div > label {
+    display: none;
+  }
+  ul {
+    padding: 0;
+    margin: 0;
+  }
+  li {
+    display: flex;
+  }
+  input, select {
+    min-width: unset;
+    max-width: unset;
+    width: auto;
+  }
+  input[type="number"] {
+    max-width: 100px;
+    text-align: right;
+  }
+  select {
+    -webkit-appearance: auto;
+    -moz-appearance: auto;
+    appearance: auto;
+  }
+  textarea {
+    min-height: 24px;
+    max-height: 300px;
+    overflow-y: auto;
+    resize: vertical;
+    border-radius: 5px;
+    border: 1px solid #ccc;
+    padding: 3px;
+    margin: 0px;
+    width: unset;
+    line-height: 1.15;
+    font-weight: normal;
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 14px;
+    box-sizing: border-box;
+  }
+  textarea:focus {
+    border-color: #66afe9;
+    outline: 0;
+    -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
+            box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
+  }
 }
 
 .swagger-ui textarea {

pywebexec/static/css/style.css

@@ -440,6 +440,7 @@ body.dimmed * {
   text-overflow: ellipsis;
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
   font-size: 14px;
+  display: inline-block;
 }
 
 .nbrunning {

pywebexec/static/js/executables.js

@@ -297,7 +297,7 @@ paramsInput.addEventListener('focus', () => {
         });
         setHelpDivPosition();
         paramsContainer.style.display = 'block';
-        const input1 = schemaFormPW.querySelector('input[type="text"]');
+        const input1 = schemaFormPW.querySelector('input, select, textarea');
         if (input1) {
             input1.focus();
         }

pywebexec/static/js/schemaform.js

@@ -54,6 +54,16 @@ function createSchemaForm(form, schema, onSubmit) {
         btn.addEventListener('click', formInputHandle);
     });
     formInputHandle();
+
+    form[0].querySelectorAll('textarea').forEach(txt => {
+      txt.style.height = "0";
+      txt.style.height = txt.scrollHeight + "px";
+      txt.addEventListener("input", (e) => {
+        e.target.style.height = "0";
+        e.target.style.height = (e.target.scrollHeight+2) + "px";
+      });
+    });
+    
     return jsform;
 }
 
@@ -88,3 +98,5 @@ async function getPostParametersSchema() {
 
 let schemaForm;
 let inputHandlers = [];
+
+

pywebexec/static/js/swagger-form.js

@@ -92,7 +92,7 @@ window.onload = function() {
             // form.addEventListener("input", formInput(node, jsform)); 
             form.addEventListener("input", addFormInputListener(node, jsform));
             node.parentNode.insertBefore(form, node.nextSibling);
-            item1 = form.querySelector("input, select");
+            item1 = form.querySelector("input, select, textarea");
             if (item1) {
               item1.focus();
             }

pywebexec/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.0.10'
-__version_tuple__ = version_tuple = (2, 0, 10)
+__version__ = version = '2.0.11'
+__version_tuple__ = version_tuple = (2, 0, 11)

{pywebexec-2.0.10.dist-info → pywebexec-2.0.11.dist-info}/METADATA

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

{pywebexec-2.0.10.dist-info → pywebexec-2.0.11.dist-info}/RECORD

@@ -1,11 +1,11 @@
 pywebexec/__init__.py,sha256=197fHJy0UDBwTTpGCGortZRr-w2kTaD7MxqdbVmTEi0,61
 pywebexec/host_ip.py,sha256=Ud_HTflWVQ8789aoQ2RZdT1wGI-ccvrwSWGz_c7T3TI,1241
-pywebexec/pywebexec.py,sha256=bC9mOWBsOEVX_70BfJl6tF-4T0tm2WXcBvxcLprN4rw,40738
+pywebexec/pywebexec.py,sha256=7lSu1C5BBA1dGzVnDG3uFcYrNriPzOs2xJrjvpOMmP4,41219
 pywebexec/swagger.yaml,sha256=j-KZnU4rGR-Fsk8y_EbqYzqVgtAZ8EjZIKAqZSxyyc0,5858
-pywebexec/version.py,sha256=k3kmXVcNdfTujv6I0gru1zPY77Etf2309Ww3Ree-ogg,513
-pywebexec/static/css/form.css,sha256=qYbZM-3vPszy4nRHroejvUwFuGtEbP1v4IhYlKOu0VU,3598
+pywebexec/version.py,sha256=ezqxaA_NJjcV2_xyyCKbUv0Hzhb-fF2wEhuUihfV7qo,513
+pywebexec/static/css/form.css,sha256=FSSFfw_-w4Yb9jUlXmgpLhXQsJj--vI2IyEY99tGvHA,4480
 pywebexec/static/css/markdown.css,sha256=3RzUnpVBdF6cQuB_NXV7hMTc0quYU8sfyuZcpsREj6A,1939
-pywebexec/static/css/style.css,sha256=UGkHGA2z_25kUAiamfzxz0IfZBt8y0zsGMR13Kp6R9I,9809
+pywebexec/static/css/style.css,sha256=KmHUDRwl-d-DE15-RmzY3PqPITIUnupVdiTKXUCZ5IY,9834
 pywebexec/static/css/swagger-ui.css,sha256=xhXN8fnUaIACGHuPIEIr9-qmyYr6Zx0k2wv4Qy7Bg1Y,154985
 pywebexec/static/css/swagger-ui.css.map,sha256=dJy-xBn_htK4BNupTMIl33ddse7BXsrCdDJWlTJodnw,258842
 pywebexec/static/css/xterm.css,sha256=uo5phWaUiJgcz0DAzv46uoByLLbJLeetYosL1xf68rY,5559
@@ -33,11 +33,11 @@ pywebexec/static/images/resume.svg,sha256=99LP1Ya2JXakRCO9kW8JMuT_4a_CannF65Eiuw
 pywebexec/static/images/running.svg,sha256=fBCYwYb2O9K4N3waC2nURP25NRwZlqR4PbDZy6JQMww,610
 pywebexec/static/images/success.svg,sha256=NVwezvVMplt46ElW798vqGfrL21Mw_DWHUp_qiD_FU8,489
 pywebexec/static/images/swagger-ui.svg,sha256=FR0yeOVwe4zCYKZAjCGcT_m0Mf25NexIVaSXifIkoU0,2117
-pywebexec/static/js/executables.js,sha256=iltgIJXWVUxAUhBfXGCHSP8mK8cQdtg-AagbGe7Hv9o,11762
+pywebexec/static/js/executables.js,sha256=3HfOsrrurtnVd-AAHpkAtvnbJDB8k7nxRwtZXRQTzuI,11767
 pywebexec/static/js/popup.js,sha256=0fr3pp4j9D2fXEVnHyQrx2bPWFHfgbb336dbewgH1d8,9023
-pywebexec/static/js/schemaform.js,sha256=bd874Geg9vri1c_seUGVynxZswGb5IcyWLZxYlcryCA,2784
+pywebexec/static/js/schemaform.js,sha256=U19pjVht7XwaSKojxwABZyJ98HvVn1LaK9SLsTlwT70,3096
 pywebexec/static/js/script.js,sha256=fwTo9Iz4xsl6wGs-Nm8-Ng8aXzDfvews5cHfzhSfg_0,17987
-pywebexec/static/js/swagger-form.js,sha256=mreGChUkous8mqizrozDEMb2Tw5HBvwZ2N6k0CuaF4U,3796
+pywebexec/static/js/swagger-form.js,sha256=uTRGKrcyBqq910RLmdlV-HpFri3RaAXpqUPSQSyoe6o,3806
 pywebexec/static/js/js-yaml/LICENSE,sha256=oHvCRGi5ZUznalR9R6LbKC0HcztxXbTHOpi9Y5YflVA,1084
 pywebexec/static/js/js-yaml/js-yaml.min.js,sha256=Rdw90D3AegZwWiwpibjH9wkBPwS9U4bjJ51ORH8H69c,39430
 pywebexec/static/js/marked/LICENSE.md,sha256=jjo_gvWaYJWPVsoI9EVkfDKkcz3HymwsRvbriYRxq5w,2942
@@ -66,9 +66,9 @@ pywebexec/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 pywebexec/templates/index.html,sha256=KeNLBH9PN_ZuGhzwrjvRTj2oBtbINv_SbwGQpOahNWo,3820
 pywebexec/templates/popup.html,sha256=3kpMccKD_OLLhJ4Y9KRw6Ny8wQWjVaRrUfV9y5-bDiQ,1580
 pywebexec/templates/swagger_ui.html,sha256=9ngyldkyEdLonBjl97mbIZUlVk-jxwcHrvFzMSrveyU,1067
-pywebexec-2.0.10.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-2.0.10.dist-info/METADATA,sha256=VWHiIxuNxdhQaIzwnZDLHYLJVXjWpIXPyBkAwEot1iU,11645
-pywebexec-2.0.10.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-pywebexec-2.0.10.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-2.0.10.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-2.0.10.dist-info/RECORD,,
+pywebexec-2.0.11.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-2.0.11.dist-info/METADATA,sha256=iaooCY4aWcnRzcPZoI2dp0GKidIMoGxU0Evn6d38OpA,11645
+pywebexec-2.0.11.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+pywebexec-2.0.11.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-2.0.11.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-2.0.11.dist-info/RECORD,,