matlab-proxy 0.14.0__py3-none-any.whl → 0.15.1__py3-none-any.whl

matlab_proxy/app.py

@@ -4,6 +4,7 @@ import asyncio
 import json
 import mimetypes
 import pkgutil
+import secrets
 import sys
 import uuid
 
@@ -18,7 +19,7 @@ from matlab_proxy import constants, settings, util
 from matlab_proxy.app_state import AppState
 from matlab_proxy.util import mwi
 from matlab_proxy.util.mwi import environment_variables as mwi_env
-from matlab_proxy.util.mwi import token_auth
+from matlab_proxy.util.mwi import token_auth, download
 from matlab_proxy.util.mwi.exceptions import AppError, InvalidTokenError, LicensingError
 from matlab_proxy.constants import IS_CONCURRENCY_CHECK_ENABLED
 
@@ -617,21 +618,24 @@ async def matlab_view(req):
         ) as client_session:
             try:
                 req_body = await transform_body(req)
+                req_url = await transform_request_url(
+                    req, matlab_base_url=matlab_base_url
+                )
                 # Set content length in case of modification
                 reqH["Content-Length"] = str(len(req_body))
                 reqH["x-forwarded-proto"] = "http"
 
                 async with client_session.request(
                     req.method,
-                    f"{matlab_base_url}{req.rel_url}",
+                    req_url,
                     headers={**reqH, **{"mwapikey": mwapikey}},
                     allow_redirects=False,
                     data=req_body,
+                    params=None,
                 ) as res:
                     headers = res.headers.copy()
                     body = await res.read()
                     headers.update(req.app["settings"]["mwi_custom_http_headers"])
-
                     return web.Response(headers=headers, status=res.status, body=body)
 
             # Handles any pending HTTP requests from the browser when the MATLAB process is terminated before responding to them.
@@ -652,6 +656,34 @@ async def matlab_view(req):
                 raise web.HTTPNotFound()
 
 
+async def transform_request_url(req, matlab_base_url):
+    """
+    Performs any transformations that may be required on the URL.
+
+    If the request is identified as a download request it transforms the request URL to
+    support downloading the file.
+
+    The original constructed URL is returned, when there are no transformations to be applied.
+
+    Args:
+        req: The request object that contains the relative URL and other request information.
+        matlab_base_url: The base URL of the MATLAB service to which the relative URL should be appended.
+
+    Returns:
+        A string representing the transformed URL, or the original URL.
+    """
+    original_request_url = f"{matlab_base_url}{req.rel_url}"
+
+    if download.is_download_request(req):
+        download_url = await download.get_download_url(req)
+        if download_url:
+            transformed_request_url = f"{matlab_base_url}{download_url}"
+            logger.debug(f"Transformed Request url: {transformed_request_url}")
+            return transformed_request_url
+
+    return original_request_url
+
+
 async def transform_body(req):
     """Transform HTTP POST requests as required by the MATLAB JavaScript Desktop.
 
@@ -764,6 +796,18 @@ def configure_and_start(app):
 
     web_logger = None if not mwi_env.is_web_logging_enabled() else logger
 
+    # Setup the session storage,
+    # Uniqified per session to prevent multiple proxy servers on the same FQDN from interfering with each other.
+    uniqify_session_cookie = secrets.token_hex()
+    fernet_key = fernet.Fernet.generate_key()
+    f = fernet.Fernet(fernet_key)
+    aiohttp_session_setup(
+        app,
+        EncryptedCookieStorage(
+            f, cookie_name="matlab-proxy-session-" + uniqify_session_cookie
+        ),
+    )
+
     # Setup runner
     runner = web.AppRunner(app, logger=web_logger, access_log=web_logger)
     loop.run_until_complete(runner.setup())
@@ -839,13 +883,6 @@ def create_app(config_name=matlab_proxy.get_default_config_name()):
     app.router.add_route("*", f"{base_url}/{{proxyPath:.*}}", matlab_view)
     app.on_cleanup.append(cleanup_background_tasks)
 
-    # Setup the session storage
-    fernet_key = fernet.Fernet.generate_key()
-    f = fernet.Fernet(fernet_key)
-    aiohttp_session_setup(
-        app, EncryptedCookieStorage(f, cookie_name="matlab-proxy-session")
-    )
-
     return app
 
 
@@ -925,3 +962,8 @@ def main():
     desired_configuration_name = util.parse_cli_args()["config"]
 
     create_and_start_app(config_name=desired_configuration_name)
+
+
+# In support of enabling debugging in a Python Debugger (VSCode)
+if __name__ == "__main__":
+    main()

matlab_proxy/constants.py

@@ -21,6 +21,7 @@ SUPPORTED_MATLAB_VERSIONS: Final[List[str]] = [
     "R2022b",
     "R2023a",
     "R2023b",
+    "R2024a",
 ]
 
 # This constant when set to True restricts the number of active sessions to one

matlab_proxy/gui/asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "./static/css/main.47712126.css",
-    "main.js": "./static/js/main.14aa7840.js",
+    "main.js": "./static/js/main.ff1bfd69.js",
     "static/media/mathworks-pictograms.svg?20181009": "./static/media/mathworks-pictograms.f6f087b008b5a9435f26.svg",
     "static/media/MATLAB-env-blur.png": "./static/media/MATLAB-env-blur.4fc94edbc82d3184e5cb.png",
     "static/media/mathworks.svg?20181004": "./static/media/mathworks.80a3218e1ba29f0573fb.svg",
@@ -35,10 +35,10 @@
     "static/media/gripper.svg": "./static/media/gripper.9defbc5e76d0de8bb6e0.svg",
     "static/media/arrow.svg": "./static/media/arrow.0c2968b90bd9a64c8c3f.svg",
     "main.47712126.css.map": "./static/css/main.47712126.css.map",
-    "main.14aa7840.js.map": "./static/js/main.14aa7840.js.map"
+    "main.ff1bfd69.js.map": "./static/js/main.ff1bfd69.js.map"
   },
   "entrypoints": [
     "static/css/main.47712126.css",
-    "static/js/main.14aa7840.js"
+    "static/js/main.ff1bfd69.js"
   ]
 }

matlab_proxy/gui/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="MATLAB"/><meta name="internal_mw_identifier" content="MWI_MATLAB_PROXY_IDENTIFIER"/><link rel="manifest" href="./manifest.json"/><title>MATLAB</title><script defer="defer" src="./static/js/main.14aa7840.js"></script><link href="./static/css/main.47712126.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="MATLAB"/><meta name="internal_mw_identifier" content="MWI_MATLAB_PROXY_IDENTIFIER"/><link rel="manifest" href="./manifest.json"/><title>MATLAB</title><script defer="defer" src="./static/js/main.ff1bfd69.js"></script><link href="./static/css/main.47712126.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>