Fixes an issue related to communicating with MATLAB on Windows through the FQDN mode of addressing in certain cloud environments where FQDN resolution is not possible.

Author: Eshan Patel

matlab_proxy/util/__init__.py

@@ -228,18 +228,13 @@ def get_access_url(app):
     access_protocol = "https" if ssl_context else "http"
 
     # When host interface is set to 0.0.0.0, in a windows system, the server will not be accessible.
-    # Setting the value to fqdn, will allow it be remotely and locally accessible.
+    # Setting the value to 127.0.0.1, will allow it be remotely and locally accessible.
 
     # NOTE: When windows container support is introduced this will need to be tweaked accordingly.
     if host_interface == "0.0.0.0" and system.is_windows():
-        import socket
+        host_interface = "127.0.0.1"
 
-        hostname = socket.gethostname()
-        fqdn = socket.getfqdn(hostname)
-
-        url = f"{access_protocol}://{fqdn}:{port}{base_url}"
-    else:
-        url = f"{access_protocol}://{host_interface}:{port}{base_url}"
+    url = f"{access_protocol}://{host_interface}:{port}{base_url}"
 
     return url
 

matlab_proxy/util/mwi/embedded_connector/request.py

@@ -104,7 +104,10 @@ async def get_state(mwi_server_url, headers=None):
 
         if not resp["messages"]["PingResponse"][0]["messageFaults"]:
             return "up"
-    except Exception:
+    except Exception as err:
+        logger.debug(
+            f"{err}: Embbeded connector is currently not responding to ping requests."
+        )
         pass
 
     return "down"

tests/test_app.py

@@ -2,6 +2,7 @@
 
 import asyncio
 import json
+import platform
 import time
 import datetime
 
@@ -657,9 +658,27 @@ def non_default_host_interface_fixture(monkeypatch):
 # First set the default host interface to a non-default value
 # Then set MWI_TEST to false and then create an instance of the test_server
 # This order will set the test_server with appropriate values.
-def test_get_access_url_non_dev(non_default_host_interface, non_test_env, test_server):
-    """Test to check access url to not be 127.0.0.1 in non-dev mode"""
-    assert "127.0.0.1" not in util.get_access_url(test_server.app)
+
+
+@pytest.mark.skipif(
+    platform.system() == "Linux" or platform.system() == "Darwin",
+    reason="Testing the windows access URL",
+)
+def test_get_access_url_non_dev_windows(
+    non_default_host_interface, non_test_env, test_server
+):
+    """Test to check access url to be 127.0.0.1 in non-dev mode on Windows"""
+    assert "127.0.0.1" in util.get_access_url(test_server.app)
+
+
+@pytest.mark.skipif(
+    platform.system() == "Windows", reason="Testing the non-Windows access URL"
+)
+def test_get_access_url_non_dev_posix(
+    non_default_host_interface, non_test_env, test_server
+):
+    """Test to check access url to be 0.0.0.0 in non-dev mode on Linux/Darwin"""
+    assert "0.0.0.0" in util.get_access_url(test_server.app)
 
 
 @pytest.fixture(name="set_licensing_info_mock_fetch_single_entitlement")