Merge ~ltrager/maas:lp1914165 into maas:master

[Lee Trager]

LP: #1914165 - Allow a custom port to be used with the Proxmox driver.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1914165 lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 3be0738b110274f8f97dc20607f9905239f82a9e

review: Approve

[Adam Collard (adam-collard)]

The query parameters need URL encoding - see https://paste.ubuntu.com/p/9mBnzYsK9g/

review: Needs Fixing

bf94255... by Lee Trager on 2021-02-03

Merge branch 'master' into lp1914165

ea9848c... by Lee Trager on 2021-02-03

Apply patch from adam-collard

[Lee Trager (ltrager)]

Thanks for the patch!

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1914165 lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: ea9848c4dbd6ce1003212ad0696f899e644246f5

review: Approve

[Adam Collard (adam-collard)]

review: Approve

diff --git a/src/provisioningserver/drivers/power/proxmox.py b/src/provisioningserver/drivers/power/proxmox.py
index c0e6ca1..7e141e9 100644
--- a/src/provisioningserver/drivers/power/proxmox.py
+++ b/src/provisioningserver/drivers/power/proxmox.py
@@ -5,11 +5,13 @@
 
 from io import BytesIO
 import json
+from urllib.parse import urlencode, urlparse
 
 from twisted.internet.defer import inlineCallbacks, succeed
 from twisted.web.client import FileBodyProducer
 
 from provisioningserver.drivers import (
+    IP_EXTRACTOR_PATTERNS,
     make_ip_extractor,
     make_setting_field,
     SETTING_SCOPE,
@@ -62,16 +64,30 @@ class ProxmoxPowerDriver(WebhookPowerDriver):
         ),
     ]
 
-    ip_extractor = make_ip_extractor("power_address")
+    ip_extractor = make_ip_extractor(
+        "power_address", IP_EXTRACTOR_PATTERNS.URL
+    )
 
     def _get_url(self, context, endpoint, params=None):
-        uri = f"https://{context['power_address']}:8006/api2/json/{endpoint}"
+        url = urlparse(context["power_address"])
+        if not url.scheme:
+            # When the scheme is not included in the power address
+            # urlparse puts the url into path.
+            url = url._replace(scheme="https", netloc=url.path, path="")
+        if not url.port:
+            if url.netloc:
+                url = url._replace(netloc="%s:8006" % url.netloc)
+            else:
+                # Similar to above, we need to swap netloc and path.
+                url = url._replace(netloc="%s:8006" % url.path, path="")
         if params:
-            uri = "%s?%s" % (
-                uri,
-                "&".join([f"{key}={value}" for key, value in params.items()]),
-            )
-        return uri.encode()
+            query = urlencode(params)
+        else:
+            query = ""
+        url = url._replace(
+            path="/api2/json/%s" % endpoint, query=query, fragment=""
+        )
+        return url.geturl().encode()
 
     def _login(self, system_id, context):
         power_token_name = context.get("power_token_name")
diff --git a/src/provisioningserver/drivers/power/tests/test_proxmox.py b/src/provisioningserver/drivers/power/tests/test_proxmox.py
index 7c32b78..881ac5f 100644
--- a/src/provisioningserver/drivers/power/tests/test_proxmox.py
+++ b/src/provisioningserver/drivers/power/tests/test_proxmox.py
@@ -52,6 +52,26 @@ class TestProxmoxPowerDriver(MAASTestCase):
             ),
         )
 
+    def test_get_url_funky_params(self):
+        power_address = factory.make_name("power_address")
+        endpoint = factory.make_name("endpoint")
+        params = {"test": "? /"}
+        params_str = "test=%3F+%2F"
+        self.assertEqual(
+            f"https://{power_address}:8006/api2/json/{endpoint}?{params_str}".encode(),
+            self.proxmox._get_url(
+                {"power_address": power_address}, endpoint, params
+            ),
+        )
+
+    def test_get_url_allows_custom_port(self):
+        power_address = "%s:443" % factory.make_name("power_address")
+        endpoint = factory.make_name("endpoint")
+        self.assertEqual(
+            f"https://{power_address}/api2/json/{endpoint}".encode(),
+            self.proxmox._get_url({"power_address": power_address}, endpoint),
+        )
+
     @inlineCallbacks
     def test_login(self):
         system_id = factory.make_name("system_id")