Fix linting errors and rebase

Author: mew1033

ctfcli/core/challenge.py

@@ -885,7 +885,10 @@ def lint(self, skip_hadolint=False, flag_format="flag{") -> bool:
                 issues["fields"].append(f"challenge.yml is missing required field: {field}")
 
         # Check that the image field and Dockerfile match
-        if (self.challenge_directory / "Dockerfile").is_file() and challenge.get("image", "") not in [".", "__compose__"]:
+        if (self.challenge_directory / "Dockerfile").is_file() and challenge.get("image", "") not in [
+            ".",
+            "__compose__",
+        ]:
             issues["dockerfile"].append("Dockerfile exists but image field does not point to it or compose")
 
         # Check that Dockerfile exists and is EXPOSE'ing a port

ctfcli/core/deployment/registry.py

@@ -26,9 +26,7 @@ def deploy(self, skip_login=False, *args, **kwargs) -> DeploymentResult:
             return DeploymentResult(False)
 
         if self.challenge.image.compose:
-            click.secho(
-                "Cannot use registry deployer with __compose__ stacks", fg="red"
-            )
+            click.secho("Cannot use registry deployer with __compose__ stacks", fg="red")
             return DeploymentResult(False)
 
         # resolve a location for the image push

ctfcli/core/deployment/ssh.py

@@ -27,12 +27,12 @@ def deploy(self, *args, **kwargs) -> DeploymentResult:
     def _deploy_compose_stack(self, *args, **kwargs) -> DeploymentResult:
         host_url = urlparse(self.host)
         target_path = str(host_url.path)
-        if target_path == '/':  # Don't put challenges in the root of the filesystem.
-            target_path = ''
-        elif target_path == '//':  # If you really want to, add a second slash as part of your path: ssh://1.1.1.1//
-            target_path = '/'
-        elif target_path.startswith('/~/'):  # Support relative paths by starting your path with /~/
-            target_path = target_path.removeprefix('/~/')
+        if target_path == "/":  # Don't put challenges in the root of the filesystem.
+            target_path = ""
+        elif target_path == "//":  # If you really want to, add a second slash as part of your path: ssh://1.1.1.1//
+            target_path = "/"
+        elif target_path.startswith("/~/"):  # Support relative paths by starting your path with /~/
+            target_path = target_path.removeprefix("/~/")
         try:
             subprocess.run(["ssh", host_url.netloc, f"mkdir -p '{target_path}/'"], check=True)
             subprocess.run(
@@ -47,8 +47,7 @@ def _deploy_compose_stack(self, *args, **kwargs) -> DeploymentResult:
                 [
                     "ssh",
                     host_url.netloc,
-                    f"cd {remote_path} && "
-                    "docker compose up -d --build --remove-orphans -y",
+                    f"cd {remote_path} && " "docker compose up -d --build --remove-orphans -y",
                 ],
                 check=True,
             )

ctfcli/core/exceptions.py

@@ -38,9 +38,11 @@ class InvalidChallengeFile(ChallengeException):
 class RemoteChallengeNotFound(ChallengeException):
     pass
 
+
 class ImageException(ChallengeException):
     pass
 
+
 class InvalidComposeOperation(ImageException):
     pass