feat: ensure Bitbucket repo URLs use HTTPS scheme

src/phylum/ci/ci_bitbucket.py

@@ -220,7 +220,16 @@ def repo_url(self) -> Optional[str]:
         # This is the "URL for the origin", which uses `HTTP:` instead of
         # `HTTPS:`, even though the value redirects to the `HTTPS:` site.
         # Ref: https://support.atlassian.com/bitbucket-cloud/docs/variables-and-secrets/
-        return os.getenv("BITBUCKET_GIT_HTTP_ORIGIN")
+        origin_url = os.getenv("BITBUCKET_GIT_HTTP_ORIGIN")
+        if origin_url is None:
+            LOG.warning("Repository URL not found at `BITBUCKET_GIT_HTTP_ORIGIN`")
+            return None
+
+        # Ensure the repository URL uses the HTTPS scheme
+        parsed_url = urllib.parse.urlparse(origin_url)
+        if parsed_url.scheme == "http":
+            parsed_url = parsed_url._replace(scheme="https")
+        return parsed_url.geturl()
 
     def post_output(self) -> None:
         """Post the output of the analysis.

src/phylum/init/cli.py

@@ -249,7 +249,7 @@ def get_archive_url(tag_name: str, archive_name: str) -> str:
     return archive_url
 
 
-def is_token_set(phylum_settings_path, token=None):
+def is_token_set(phylum_settings_path: Path, token: Optional[str] = None) -> bool:
     """Check if any token is already set in the given CLI configuration file.
 
     Optionally, check if a specific given `token` is set.
@@ -260,13 +260,14 @@ def is_token_set(phylum_settings_path, token=None):
         return False
 
     yaml = YAML()
-    settings_dict = yaml.load(settings_data)
-    configured_token = settings_dict.get("auth_info", {}).get("offline_access")
+    settings_dict: dict = yaml.load(settings_data)
+    auth_info_dict: dict = settings_dict.get("auth_info", {})
+    configured_token = auth_info_dict.get("offline_access")
 
     if configured_token is None:
         return False
-    if token is not None and token != configured_token:
-        return False
+    if token is not None:
+        return token == configured_token
 
     return True