matlab-proxy 0.13.1__py3-none-any.whl → 0.15.0__py3-none-any.whl

matlab_proxy/app.py

@@ -18,7 +18,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
 
@@ -546,7 +546,9 @@ async def matlab_view(req):
         await ws_server.prepare(req)
 
         async with aiohttp.ClientSession(
-            cookies=req.cookies, connector=aiohttp.TCPConnector(verify_ssl=False)
+            trust_env=True,
+            cookies=req.cookies,
+            connector=aiohttp.TCPConnector(verify_ssl=False),
         ) as client_session:
             try:
                 async with client_session.ws_connect(
@@ -610,25 +612,29 @@ async def matlab_view(req):
     else:
         # Proxy, injecting request header
         async with aiohttp.ClientSession(
+            trust_env=True,
             connector=aiohttp.TCPConnector(verify_ssl=False),
         ) 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.
@@ -649,6 +655,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.
 
@@ -846,7 +880,29 @@ def create_app(config_name=matlab_proxy.get_default_config_name()):
     return app
 
 
+def configure_no_proxy_in_env():
+    """Update the environment variable no_proxy to allow communication between processes on the local machine."""
+    import os
+
+    no_proxy_whitelist = ["0.0.0.0", "localhost", "127.0.0.1"]
+
+    no_proxy_env = os.environ.get("no_proxy")
+    if no_proxy_env is None:
+        os.environ["no_proxy"] = ",".join(no_proxy_whitelist)
+    else:
+        # Create set with leading and trailing whitespaces stripped
+        existing_no_proxy_env = [
+            val.lstrip().rstrip() for val in no_proxy_env.split(",")
+        ]
+        os.environ["no_proxy"] = ",".join(
+            set(existing_no_proxy_env + no_proxy_whitelist)
+        )
+    logger.info(f"Setting no_proxy to: {os.environ.get('no_proxy')}")
+
+
 def create_and_start_app(config_name):
+    configure_no_proxy_in_env()
+
     # Create, configure and start the app.
     app = create_app(config_name)
     app = configure_and_start(app)
@@ -884,7 +940,7 @@ def print_version_and_exit():
     """prints the version of the package and exits"""
     from importlib.metadata import version
 
-    matlab_proxy_version = version("matlab-proxy")
+    matlab_proxy_version = version(__name__.split(".")[0])
     print(f"{matlab_proxy_version}")
     sys.exit(0)
 
@@ -900,3 +956,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.0fcee5e5.js",
+    "main.js": "./static/js/main.14aa7840.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.0fcee5e5.js.map": "./static/js/main.0fcee5e5.js.map"
+    "main.14aa7840.js.map": "./static/js/main.14aa7840.js.map"
   },
   "entrypoints": [
     "static/css/main.47712126.css",
-    "static/js/main.0fcee5e5.js"
+    "static/js/main.14aa7840.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.0fcee5e5.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.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>