Merge ~tshinn/snap-store-proxy-charm:compare_hostname_instead_of_full_url into snap-store-proxy-charm:main

[Tong Shinn]

self._stored.domain contains the full URL (including http:// or https://) and thus directly comparing it to the CN or SAN of certificates does not work. Extract the hostname from the URL so that we can make the comparison.

With this change, we can now set the "certificate" and "private_key" configurations of snap-store-proxy via juju and the certificates will correctly match the configured domain of the proxy.

[Wouter van Bommel (woutervb)]

lgtm

review: Approve

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/snap-store-proxy-charm/39/

diff --git a/setup.cfg b/setup.cfg
index 8e3f700..c59d487 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -9,6 +9,7 @@ exclude:
   *.egg_info
 extend-ignore =
   E203
+  W503
 
 [coverage:report]
 # Regexes for lines to exclude from consideration
diff --git a/src/charm.py b/src/charm.py
index 4a64d8f..3bdbca1 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -319,7 +319,7 @@ class SnapstoreProxyCharm(CharmBase):
                 str(ip) for ip in san.value.get_values_for_type(x509.IPAddress)
             )
 
-        domain = getattr(self._stored, "domain")
+        domain = urlparse(getattr(self._stored, "domain")).hostname
         if domain not in cert_names:
             logger.warning(f"Could not find {domain} in list {cert_names}")
             return "Certificate does not contain the proxy's registered name"
diff --git a/tests/test_charm.py b/tests/test_charm.py
index eff60e8..43d6364 100644
--- a/tests/test_charm.py
+++ b/tests/test_charm.py
@@ -627,7 +627,7 @@ class TestTLSCertificate(CharmTest):
         # Test for correct handling of missing private key
         domain = "http://test.domain.just.invented"
         harness.charm._stored.domain = domain
-        cert, key = self.create_x509_certificate(domain, san)
+        cert, key = self.create_x509_certificate("test.domain.just.invented", san)
 
         # Since valid values will be pushed on to the proxy, we need to stub that here
         with patch("charm.configure_proxy") as m_configure, patch(