pywebexec 1.8.4__tar.gz → 1.9.1__tar.gz

{pywebexec-1.8.4/pywebexec.egg-info → pywebexec-1.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 1.8.4
+Version: 1.9.1
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -56,6 +56,7 @@ Requires-Dist: python-daemon>=2.3.2
 Requires-Dist: cryptography>=40.0.2
 Requires-Dist: Flask>=2.0.3
 Requires-Dist: Flask-HTTPAuth>=4.8.0
+Requires-Dist: flask-swagger-ui>=4.11.1
 Requires-Dist: pexpect>=4.9.0
 Requires-Dist: gunicorn>=21.2.0
 Requires-Dist: ldap3>=2.9.1

{pywebexec-1.8.4 → pywebexec-1.9.1}/pyproject.toml

@@ -13,6 +13,7 @@ dependencies = [
   "cryptography>=40.0.2",
   "Flask>=2.0.3",
   "Flask-HTTPAuth>=4.8.0",
+  "flask-swagger-ui>=4.11.1",
   "pexpect>=4.9.0",
   "gunicorn>=21.2.0",
   "ldap3>=2.9.1",

{pywebexec-1.8.4 → pywebexec-1.9.1}/pywebexec/pywebexec.py

@@ -28,6 +28,8 @@ import logging
 from pathlib import Path
 import pyte
 from . import host_ip
+from flask_swagger_ui import get_swaggerui_blueprint  # new import
+import yaml  # new import
 
 if os.environ.get('PYWEBEXEC_LDAP_SERVER'):
     from ldap3 import Server, Connection, ALL, SIMPLE, SUBTREE, Tls
@@ -35,7 +37,6 @@ if os.environ.get('PYWEBEXEC_LDAP_SERVER'):
 app = Flask(__name__)
 app.secret_key = os.urandom(24)  # Secret key for session management
 app.config['SESSION_COOKIE_SAMESITE'] = 'Lax'  # Add SameSite attribute to session cookies
-app.config['SESSION_COOKIE_SECURE'] = True
 app.config['SESSION_COOKIE_HTTPONLY'] = True
 auth = HTTPBasicAuth()
 
@@ -46,6 +47,7 @@ app.config['LDAP_BASE_DN'] = os.environ.get('PYWEBEXEC_LDAP_BASE_DN')
 app.config['LDAP_BIND_DN'] = os.environ.get('PYWEBEXEC_LDAP_BIND_DN')
 app.config['LDAP_BIND_PASSWORD'] = os.environ.get('PYWEBEXEC_LDAP_BIND_PASSWORD')
 
+
 # Get the Gunicorn error logger
 gunicorn_logger = logging.getLogger('gunicorn.error')
 app.logger.handlers = gunicorn_logger.handlers
@@ -590,7 +592,23 @@ def check_processes():
                         'exit_code': -1,
                     })
 
-parseargs()
+args = parseargs()
+if args.cert:
+    app.config['SESSION_COOKIE_SECURE'] = True
+app.config['TITLE'] = f"{args.title} API"
+
+# Register Swagger UI blueprint with safe token included in API_URL
+SWAGGER_URL = '/v0/documentation'
+API_URL = '/swagger.yaml'
+swaggerui_blueprint = get_swaggerui_blueprint(
+    SWAGGER_URL,
+    API_URL,
+    config={
+        'app_name': f"{args.title} API",
+        'layout': 'BaseLayout'
+    }
+)
+app.register_blueprint(swaggerui_blueprint, url_prefix=SWAGGER_URL)
 
 def log_info(fromip, user, message):
     app.logger.info(f"{user} {fromip}: {message}")
@@ -625,10 +643,10 @@ def stop_command(command_id):
 
 @app.before_request
 def check_authentication():
-    # Check for token in URL if TOKEN_URL is set
     token = app.config.get('TOKEN_URL')
     if token and request.endpoint not in ['login', 'static']:
-        if request.args.get('token') == token:
+        if request.args.get('token') == token or session.get('token') == token:
+            session['token'] = token
             return
         return jsonify({'error': 'Forbidden'}), 403
 
@@ -830,6 +848,20 @@ def do_popup(command_id):
     </html>
     """
 
+@app.route('/swagger.yaml')
+def swagger_yaml():
+    swagger_path = os.path.join(os.path.dirname(__file__), 'swagger.yaml')
+    try:
+        with open(swagger_path, 'r') as f:
+            swagger_spec_str = f.read()
+        swagger_spec = yaml.safe_load(swagger_spec_str)
+        # Set title dynamically using the app configuration
+        swagger_spec['info']['title'] = app.config.get('TITLE', 'PyWebExec API')
+        swagger_spec_str = yaml.dump(swagger_spec)
+        return Response(swagger_spec_str, mimetype='application/yaml')
+    except Exception as e:
+        return Response(f"Error reading swagger spec: {e}", status=500)
+
 def main():
     global COMMAND_STATUS_DIR
     basef = f"{CONFDIR}/pywebexec_{args.listen}:{args.port}"

{pywebexec-1.8.4 → pywebexec-1.9.1}/pywebexec/static/css/style.css

@@ -91,10 +91,13 @@ form {
     vertical-align: middle;
 }
 .title-icon {
-    width: 30px;
+    display: inline;
     height: 30px;
     background-image: url("/static/images/favicon.svg");
+    background-size: 30px 30px;
+    background-repeat: no-repeat;
     vertical-align: bottom;
+    padding-left: 35px;
 }
 #thStatus {
     cursor: pointer;
@@ -383,4 +386,8 @@ span {
 
 .xterm-accessibility {
     display: none;
+}
+.swaggerlink {
+    text-decoration: none;
+    font-size: 10px;
 }

pywebexec-1.9.1/pywebexec/swagger.yaml

@@ -0,0 +1,54 @@
+swagger: "2.0"
+info:
+  title: PyWebExec API
+  version: "1.0"
+paths:
+  /run_command:
+    post:
+      summary: "Run a command"
+      consumes:
+        - application/json
+      produces:
+        - application/json
+      parameters:
+        - in: body
+          name: commandRequest
+          schema:
+            type: object
+            properties:
+              command:
+                type: string
+              params:
+                type: array
+                items:
+                  type: string
+              rows:
+                type: integer
+              cols:
+                type: integer
+      responses:
+        "200":
+          description: "Command started"
+  /command_status/{command_id}:
+    get:
+      summary: "Get command status"
+      parameters:
+        - in: path
+          name: command_id
+          required: true
+          type: string
+      responses:
+        "200":
+          description: "Command status returned"
+  /commands:
+    get:
+      summary: "List commands"
+      responses:
+        "200":
+          description: "List of all commands"
+  /executables:
+    get:
+      summary: "List executables"
+      responses:
+        "200":
+          description: "List of executables returned as an array of executable names"

{pywebexec-1.8.4 → pywebexec-1.9.1}/pywebexec/templates/index.html

@@ -11,7 +11,7 @@
     <div id="dimmer" class="dimmer">
         <div class="dimmer-text">Server not available</div>
     </div>
-    <h2><span class="status-icon title-icon"></span>{{ title }}</h2>
+    <h2><span class="status-icon title-icon">{{ title }}&nbsp;<a class="swaggerlink" href="/v0/documentation" target="_blank">swagger</a></span></h2>
     <form id="launchForm" class="form-inline">
         <label for="command">Command</label>
         <div class="input-group">

{pywebexec-1.8.4 → pywebexec-1.9.1}/pywebexec/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.8.4'
-__version_tuple__ = version_tuple = (1, 8, 4)
+__version__ = version = '1.9.1'
+__version_tuple__ = version_tuple = (1, 9, 1)

{pywebexec-1.8.4 → pywebexec-1.9.1/pywebexec.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 1.8.4
+Version: 1.9.1
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -56,6 +56,7 @@ Requires-Dist: python-daemon>=2.3.2
 Requires-Dist: cryptography>=40.0.2
 Requires-Dist: Flask>=2.0.3
 Requires-Dist: Flask-HTTPAuth>=4.8.0
+Requires-Dist: flask-swagger-ui>=4.11.1
 Requires-Dist: pexpect>=4.9.0
 Requires-Dist: gunicorn>=21.2.0
 Requires-Dist: ldap3>=2.9.1

{pywebexec-1.8.4 → pywebexec-1.9.1}/pywebexec.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ setup.cfg
 pywebexec/__init__.py
 pywebexec/host_ip.py
 pywebexec/pywebexec.py
+pywebexec/swagger.yaml
 pywebexec/version.py
 pywebexec.egg-info/PKG-INFO
 pywebexec.egg-info/SOURCES.txt

{pywebexec-1.8.4 → pywebexec-1.9.1}/pywebexec.egg-info/requires.txt

@@ -2,6 +2,7 @@ python-daemon>=2.3.2
 cryptography>=40.0.2
 Flask>=2.0.3
 Flask-HTTPAuth>=4.8.0
+flask-swagger-ui>=4.11.1
 pexpect>=4.9.0
 gunicorn>=21.2.0
 ldap3>=2.9.1