fluidattacks_core_git 12.2.0__tar.gz → 12.2.1__tar.gz

{fluidattacks_core_git-12.2.0 → fluidattacks_core_git-12.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: fluidattacks_core_git
-Version: 12.2.0
+Version: 12.2.1
 Summary: Fluid Attacks Core Git Library
 Author-email: Development <development@fluidattacks.com>
 License: MPL-2.0

{fluidattacks_core_git-12.2.0 → fluidattacks_core_git-12.2.1}/fluidattacks_core/git/utils.py

@@ -40,6 +40,7 @@ def _replace_netloc_in_url(parsed_url: ParseResult, netloc: str) -> str:
 
 
 def _format_token_for_provider(provider: str | None, token: str, host: str) -> str:
+    token = quote(token, safe="")
     if provider == "BITBUCKET":
         return f"x-token-auth:{token}@{host}"
     if provider:

{fluidattacks_core_git-12.2.0 → fluidattacks_core_git-12.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fluidattacks_core_git"
-version = "12.2.0"
+version = "12.2.1"
 description = "Fluid Attacks Core Git Library"
 authors = [{ name = "Development", email = "development@fluidattacks.com" }]
 license = { text = "MPL-2.0" }

fluidattacks_core_git-12.2.1/tests/test_utils.py

@@ -0,0 +1,64 @@
+from urllib.parse import urlparse
+
+import pytest
+
+from fluidattacks_core.git.utils import format_url
+
+
+@pytest.mark.parametrize(
+    "token",
+    [
+        "internal.svc.local:9200/#",
+        "a/b",
+        "a@b",
+        "a:b",
+        "a#b",
+    ],
+)
+def test_format_url_with_a_token_containing_url_metacharacters_keeps_the_host(
+    token: str,
+) -> None:
+    url = format_url(repo_url="https://github.com/fluidattacks/universe", token=token)
+
+    assert urlparse(url).hostname == "github.com"
+
+
+def test_format_url_with_a_token_percent_encodes_it() -> None:
+    url = format_url(
+        repo_url="https://github.com/fluidattacks/universe",
+        token="internal.svc.local:9200/#",  # noqa: S106
+    )
+
+    assert url == ("https://internal.svc.local%3A9200%2F%23@github.com/fluidattacks/universe")
+
+
+def test_format_url_with_a_bitbucket_provider_token_keeps_the_host() -> None:
+    url = format_url(
+        repo_url="https://bitbucket.org/fluidattacks/universe",
+        token="a/token@with:chars",  # noqa: S106
+        provider="BITBUCKET",
+    )
+
+    assert urlparse(url).hostname == "bitbucket.org"
+    assert url.startswith("https://x-token-auth:")
+
+
+def test_format_url_with_an_oauth_provider_token_keeps_the_host() -> None:
+    url = format_url(
+        repo_url="https://gitlab.com/fluidattacks/universe",
+        token="a/token@with:chars",  # noqa: S106
+        provider="GITLAB",
+    )
+
+    assert urlparse(url).hostname == "gitlab.com"
+    assert url.startswith("https://oauth2:")
+
+
+def test_format_url_with_user_and_password_still_percent_encodes_them() -> None:
+    url = format_url(
+        repo_url="https://github.com/fluidattacks/universe",
+        user="a/user",
+        password="a:pass@word",  # noqa: S106
+    )
+
+    assert urlparse(url).hostname == "github.com"