Fix logic when no explicit port is specified

viren-nadkarni · viren-nadkarni · commit e75f0f1a1fb9 · 2024-10-22T20:00:50.000+05:30
diff --git a/localstack-core/localstack/utils/java.py b/localstack-core/localstack/utils/java.py
@@ -26,17 +26,17 @@ def java_system_properties_proxy() -> dict[str, str]:
     """
     props = {}
 
-    for scheme, var in [
-        ("http", config.OUTBOUND_HTTP_PROXY),
-        ("https", config.OUTBOUND_HTTPS_PROXY),
+    for scheme, default_port, var in [
+        ("http", "80", config.OUTBOUND_HTTP_PROXY),
+        ("https", "443", config.OUTBOUND_HTTPS_PROXY),
     ]:
         if var:
             netloc = urlparse(var).netloc
             url = netloc.split(":")
             if len(url) == 2:
                 hostname, port = url
             else:
-                hostname, port = url, 80
+                hostname, port = url[0], default_port
 
             props[f"{scheme}.proxyHost"] = hostname
             props[f"{scheme}.proxyPort"] = port
diff --git a/tests/unit/utils/test_java.py b/tests/unit/utils/test_java.py
@@ -15,18 +15,20 @@ def test_java_system_properties_proxy(monkeypatch):
     assert output["http.proxyPort"] == "69"
 
     monkeypatch.setattr(config, "OUTBOUND_HTTP_PROXY", "")
-    monkeypatch.setattr(config, "OUTBOUND_HTTPS_PROXY", "http://ipsum.com:42")
+    monkeypatch.setattr(config, "OUTBOUND_HTTPS_PROXY", "http://ipsum.com")
     output = java.java_system_properties_proxy()
     assert len(output) == 2
     assert output["https.proxyHost"] == "ipsum.com"
-    assert output["https.proxyPort"] == "42"
+    assert output["https.proxyPort"] == "443"
 
-    monkeypatch.setattr(config, "OUTBOUND_HTTP_PROXY", "http://baz.com:314")
+    # Ensure no explicit port defaults to 80
+    monkeypatch.setattr(config, "OUTBOUND_HTTP_PROXY", "http://baz.com")
+    monkeypatch.setattr(config, "OUTBOUND_HTTPS_PROXY", "http://qux.com:42")
     output = java.java_system_properties_proxy()
     assert len(output) == 4
     assert output["http.proxyHost"] == "baz.com"
-    assert output["http.proxyPort"] == "314"
-    assert output["https.proxyHost"] == "ipsum.com"
+    assert output["http.proxyPort"] == "80"
+    assert output["https.proxyHost"] == "qux.com"
     assert output["https.proxyPort"] == "42"
 
 
