jaaql-middleware-python 4.33.13__tar.gz → 4.33.15__tar.gz

{jaaql_middleware_python-4.33.13 → jaaql_middleware_python-4.33.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jaaql-middleware-python
-Version: 4.33.13
+Version: 4.33.15
 Summary: The jaaql package, allowing for rapid development and deployment of RESTful HTTP applications
 Home-page: https://github.com/JAAQL/JAAQL-middleware-python
 Author: Software Quality Measurement and Improvement bv

{jaaql_middleware_python-4.33.13 → jaaql_middleware_python-4.33.15}/jaaql/constants.py

@@ -208,5 +208,5 @@ ROLE__postgres = "postgres"
 
 PROTOCOL__postgres = "postgresql://"
 
-VERSION = "4.33.13"
+VERSION = "4.33.15"
 

{jaaql_middleware_python-4.33.13 → jaaql_middleware_python-4.33.15}/jaaql/documentation/documentation_public.py

@@ -176,6 +176,25 @@ DOCUMENTATION__webhook = SwaggerDocumentation(
     ]
 )
 
+DOCUMENTATION__secure_webhook = SwaggerDocumentation(
+    tags="Webhook",
+    security=True,  # Security is handled at the webhook implementation itself
+    methods=[
+        SwaggerMethod(
+            name="Receive Webhook GET",
+            description="Receives a webhook as a GET",
+            method=REST__GET,
+            arguments=ARG_RES__proc + [ARG_RES__parameters]
+        ),
+        SwaggerMethod(
+            name="Receive Webhook POST",
+            description="Receives a webhook as a POST",
+            method=REST__POST,
+            arguments=ARG_RESP__allow_all
+        )
+    ]
+)
+
 EXAMPLE__document_id = "b47dc954-d608-4e1b-8a8c-d8b754ee554b"
 
 ARG_RES__document_id = SwaggerArgumentResponse(

{jaaql_middleware_python-4.33.13 → jaaql_middleware_python-4.33.15}/jaaql/mvc/base_controller.py

@@ -1,5 +1,6 @@
 import threading
 import traceback
+from werkzeug.datastructures import Headers
 import uuid
 from functools import wraps
 
@@ -667,9 +668,15 @@ class BaseJAAQLController:
                     if jaaql_resp.raw_response is not None:
                         resp = jaaql_resp.raw_response
                     if jaaql_resp.is_binary:
-                        resp = Response(resp, mimetype=jaaql_resp.response_type, status=jaaql_resp.response_code)
+                        hdrs = Headers(jaaql_resp.raw_headers or {})
+                        content_type = hdrs.pop("Content-Type", None)
+                        try:
+                            del jaaql_resp.raw_headers["Content-Type"]
+                        except:
+                            pass
+                        resp = Response(resp, status=jaaql_resp.response_code, content_type=content_type or "application/octet-stream")
                     else:
-                        resp = Response(resp, status=jaaql_resp.response_code)
+                        resp = Response(resp, mimetype=jaaql_resp.response_type, status=jaaql_resp.response_code)
 
                 for key, val in jaaql_resp.raw_headers.items():
                     resp.headers.add(key, val)

{jaaql_middleware_python-4.33.13 → jaaql_middleware_python-4.33.15}/jaaql/mvc/controller.py

@@ -151,7 +151,12 @@ class JAAQLController(BaseJAAQLController):
 
         @self.publish_route('/webhook/<application>/<name>', DOCUMENTATION__webhook)
         def handle_webhook(application: str, name: str, body: bytes, headers: dict, args: dict, response: JAAQLResponse):
-            self.model.handle_webhook(application, name, body, headers, args, response)
+            self.model.handle_webhook(application, name, body, headers, args, response, None)
+
+        @self.publish_route('/secure/<application>/<name>', DOCUMENTATION__secure_webhook)
+        def handle_secure_webhook(application: str, name: str, body: bytes, headers: dict, args: dict,
+                                  response: JAAQLResponse, account_id: str):
+            self.model.handle_webhook(application, name, body, headers, args, response, account_id)
 
         @self.publish_route('/remote_procedure', DOCUMENTATION__remote_procedures)
         def handle_remote_procedure(http_inputs: dict, is_the_anonymous_user: bool, auth_token: str, username: str, ip_address: str, account_id: str):

{jaaql_middleware_python-4.33.13 → jaaql_middleware_python-4.33.15}/jaaql/mvc/model.py

@@ -1647,7 +1647,7 @@ WHERE
             raise HttpStatusException("Could not intepret remote procedure result", HTTPStatus.INTERNAL_SERVER_ERROR)
 
     def handle_webhook(self, application: str, name: str, body: bytes, headers: dict, args: dict,
-                       response: JAAQLResponse):
+                       response: JAAQLResponse, account_id: str | None):
         rpc = remote_procedure__select(self.jaaql_lookup_connection, application, name)
         if rpc[KG__remote_procedure__access] != RPC_ACCESS__webhook:
             raise HttpStatusException("Procedure type is not type webhook")
@@ -1668,6 +1668,8 @@ WHERE
 
         argv = shlex.split(base_cmd)  # ["node","--import","./__imports__.js","RemoteProcedures/...entrypoint.js"]
         argv += [encoded_headers, encoded_args, encoded_body]
+        if account_id is not None:
+            argv += [account_id]
 
         # No shell; pass argv list. Capture output as text.
         result = subprocess.run(

{jaaql_middleware_python-4.33.13 → jaaql_middleware_python-4.33.15}/jaaql_middleware_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jaaql-middleware-python
-Version: 4.33.13
+Version: 4.33.15
 Summary: The jaaql package, allowing for rapid development and deployment of RESTful HTTP applications
 Home-page: https://github.com/JAAQL/JAAQL-middleware-python
 Author: Software Quality Measurement and Improvement bv