coiled 1.135.3.dev2__tar.gz → 1.135.4.dev4__tar.gz

{coiled-1.135.3.dev2 → coiled-1.135.4.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: coiled
-Version: 1.135.3.dev2
+Version: 1.135.4.dev4
 Summary: Python client for coiled.io dask clusters
 Project-URL: Homepage, https://coiled.io
 Maintainer-email: Coiled <info@coiled.io>

{coiled-1.135.3.dev2 → coiled-1.135.4.dev4}/coiled/software_utils.py

@@ -686,21 +686,25 @@ def get_rattler_keyring_auth(netloc: str) -> tuple[str, str] | None:
 
         return None
 
-    # Try exact match first
-    auth_parts = try_keyring_auth(netloc)
-    if auth_parts:
-        logger.debug(f"Found rattler keyring auth for {netloc}")
-        return auth_parts
-
-    # Try parent domain matches if exact match failed
-    # If looking for foo.example.com, try example.com (but not com)
-    parts = netloc.split(".")
-    for i in range(1, len(parts) - 1):  # Stop before single TLD
-        parent_domain = ".".join(parts[i:])
-
-        auth_parts = try_keyring_auth(parent_domain)
+    # Keyring lookups are by exact key, so unlike the file-based store we can't scan for
+    # wildcards, we have to construct them. rattler tries the exact host, then walks up the
+    # domain trying `*.<domain>` at each level: `pixi auth login prefix.dev` is stored as
+    # `*.prefix.dev` and authenticates any subdomain, e.g. repo.prefix.dev. We also keep
+    # trying bare parent domains, which rattler doesn't do, but which we've always done.
+    candidates = [netloc]
+    domain = netloc
+    while True:
+        candidates.append(f"*.{domain}")
+        if "." not in domain:
+            break
+        domain = domain.split(".", 1)[1]
+        if "." in domain:  # bare parent domain, but never a bare TLD
+            candidates.append(domain)
+
+    for candidate in candidates:
+        auth_parts = try_keyring_auth(candidate)
         if auth_parts:
-            logger.debug(f"Found rattler keyring auth for {parent_domain} (matching {netloc})")
+            logger.debug(f"Found rattler keyring auth for {candidate} (matching {netloc})")
             return auth_parts
 
     logger.debug(f"No rattler keyring auth found for {netloc}")