fix logs

canonical · Mar 15, 2024 · 3b7dc27 · 3b7dc27
1 parent 68048fe
commit 3b7dc27
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/cloudinit/url_helper.py b/cloudinit/url_helper.py
@@ -135,10 +135,27 @@ def read_ftps(url: str, timeout: float = 5.0, **kwargs: dict) -> "FtpResponse":
                     url=url,
                 ) from e
             LOG.debug("Attempting to login with user [%s]", user)
-            ftp_tls.login(
-                user=user,
-                passwd=url_parts.password or "",
-            )
+            try:
+                ftp_tls.login(
+                    user=user,
+                    passwd=url_parts.password or "",
+                )
+            except ftplib.error_perm as e:
+                LOG.warning(
+                    "Attempted to connect to insecure ftp server but used"
+                    "a scheme of ftps://, which is not allowed. Use ftp://"
+                    "to allow connecting to insecure ftp servers."
+                )
+                raise UrlError(
+                    cause=(
+                        "Attempted to connect to insecure ftp server but used"
+                        "a scheme of ftps://, which is not allowed. Use ftp://"
+                        "to allow connecting to insecure ftp servers."
+                    ),
+                    code=500,
+                    headers=None,
+                    url=url,
+                ) from e
             LOG.debug("Creating a secure connection")
             ftp_tls.prot_p()
             LOG.debug("Reading file: %s", url_parts.path)

diff --git a/tests/integration_tests/datasources/test_nocloud.py b/tests/integration_tests/datasources/test_nocloud.py
@@ -398,15 +398,14 @@ def test_nocloud_ftps_unencrypted_server_fails(
         """
         cmdline = "ds=nocloud;seedfrom=ftps://localhost:2121"
         self._boot_with_cmdline(cmdline, client)
-        log = client.read_from_file("/var/log/cloud-init.log")
-        assert "Reading file from server over tls failed for url" in log
         verify_clean_boot(
             client,
             ignore_warnings=self.expected_warnings,
             require_warnings=[
                 "Getting data from <class 'cloudinit.sources.DataSourc"
                 "eNoCloud.DataSourceNoCloudNet'> failed",
                 "Used fallback datasource",
+                "Reading file from server over tls failed for url",
             ],
         )