gargoyle-receipts 0.5.0.dev0__tar.gz → 0.5.1.dev0__tar.gz

{gargoyle_receipts-0.5.0.dev0/gargoyle_receipts.egg-info → gargoyle_receipts-0.5.1.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gargoyle-receipts
-Version: 0.5.0.dev0
+Version: 0.5.1.dev0
 Summary: Signed, single-use, argument-bound receipts and human-approval holds for agent tool calls.
 Author: Justin LaPorte
 License-Expression: Apache-2.0
@@ -59,7 +59,7 @@ your MCP server and lets through only what both agreed to.
 
 [![PyPI](https://img.shields.io/pypi/v/gargoyle-receipts)](https://pypi.org/project/gargoyle-receipts/)
 
-Status: pre-release (`0.5.0.dev0`, on PyPI as `gargoyle-receipts`). The wire format is `gargoyle/3` and may
+Status: pre-release (`0.5.1.dev0`, on PyPI as `gargoyle-receipts`). The wire format is `gargoyle/3` and may
 still change before the first release; it is specified in [SPEC.md](SPEC.md).
 
 ## What a receipt gives you

{gargoyle_receipts-0.5.0.dev0 → gargoyle_receipts-0.5.1.dev0}/README.md

@@ -21,7 +21,7 @@ your MCP server and lets through only what both agreed to.
 
 [![PyPI](https://img.shields.io/pypi/v/gargoyle-receipts)](https://pypi.org/project/gargoyle-receipts/)
 
-Status: pre-release (`0.5.0.dev0`, on PyPI as `gargoyle-receipts`). The wire format is `gargoyle/3` and may
+Status: pre-release (`0.5.1.dev0`, on PyPI as `gargoyle-receipts`). The wire format is `gargoyle/3` and may
 still change before the first release; it is specified in [SPEC.md](SPEC.md).
 
 ## What a receipt gives you

{gargoyle_receipts-0.5.0.dev0 → gargoyle_receipts-0.5.1.dev0}/gargoyle/entra_login.py

@@ -69,10 +69,24 @@ class TokenCache:
                 pass
 
 
+def public_roots_http():
+    """A requests session that trusts the public CA roots (certifi) whatever
+    REQUESTS_CA_BUNDLE says. A deployment pins the issuer's private CA with
+    that variable; Entra's endpoints are not signed by it, so the two trust
+    domains must not share one setting. Proxies from the environment still
+    apply."""
+    import certifi
+    import requests
+    s = requests.Session()
+    s.verify = certifi.where()
+    return s
+
+
 def _app(tenant: str, client_id: str, cache: TokenCache, app_factory: Optional[Callable] = None) -> Any:
     if app_factory is not None:
         return app_factory(client_id=client_id, authority=AUTHORITY.format(tenant=tenant), token_cache=cache.cache)
-    return _msal().PublicClientApplication(client_id, authority=AUTHORITY.format(tenant=tenant), token_cache=cache.cache)
+    return _msal().PublicClientApplication(client_id, authority=AUTHORITY.format(tenant=tenant), token_cache=cache.cache,
+                                           http_client=public_roots_http())
 
 
 def device_code_login(tenant: str, client_id: str, scope: str, cache_path: str, *,
@@ -105,8 +119,26 @@ class EntraTokenSource:
     def __init__(self, tenant: str, client_id: str, scope: str, cache_path: str, *,
                  app_factory: Optional[Callable] = None, msal_module: Any = None) -> None:
         self.scope = scope
-        self._cache = TokenCache(cache_path, msal_module)
-        self._app = _app(tenant, client_id, self._cache, app_factory)
+        self._args = (tenant, client_id, cache_path, app_factory, msal_module)
+        self._cache: Optional[TokenCache] = None
+        self._app_obj: Any = None
+
+    @property
+    def _app(self) -> Any:
+        # Built on first use: MSAL fetches the tenant's OpenID configuration
+        # when the application object is created, and that must not happen
+        # while the MCP client is starting the middleware, nor kill it if
+        # the network is down. A failure here surfaces as LoginRequired on
+        # the call, which the middleware turns into a refusal.
+        if self._app_obj is None:
+            tenant, client_id, cache_path, app_factory, msal_module = self._args
+            self._cache = TokenCache(cache_path, msal_module)
+            try:
+                self._app_obj = _app(tenant, client_id, self._cache, app_factory)
+            except Exception as exc:
+                raise LoginRequired("Entra could not be reached to validate the sign-in: %s: %s"
+                                    % (type(exc).__name__, str(exc)[:200])) from exc
+        return self._app_obj
 
     def token(self) -> str:
         accounts: List[Dict[str, Any]] = self._app.get_accounts()
@@ -121,7 +153,10 @@ class EntraTokenSource:
 
     @property
     def principal(self) -> Optional[str]:
-        accounts = self._app.get_accounts()
+        try:
+            accounts = self._app.get_accounts()
+        except LoginRequired:
+            return None
         return accounts[0].get("username") if accounts else None
 
 

{gargoyle_receipts-0.5.0.dev0 → gargoyle_receipts-0.5.1.dev0/gargoyle_receipts.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gargoyle-receipts
-Version: 0.5.0.dev0
+Version: 0.5.1.dev0
 Summary: Signed, single-use, argument-bound receipts and human-approval holds for agent tool calls.
 Author: Justin LaPorte
 License-Expression: Apache-2.0
@@ -59,7 +59,7 @@ your MCP server and lets through only what both agreed to.
 
 [![PyPI](https://img.shields.io/pypi/v/gargoyle-receipts)](https://pypi.org/project/gargoyle-receipts/)
 
-Status: pre-release (`0.5.0.dev0`, on PyPI as `gargoyle-receipts`). The wire format is `gargoyle/3` and may
+Status: pre-release (`0.5.1.dev0`, on PyPI as `gargoyle-receipts`). The wire format is `gargoyle/3` and may
 still change before the first release; it is specified in [SPEC.md](SPEC.md).
 
 ## What a receipt gives you

{gargoyle_receipts-0.5.0.dev0 → gargoyle_receipts-0.5.1.dev0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gargoyle-receipts"
-version = "0.5.0.dev0"
+version = "0.5.1.dev0"
 description = "Signed, single-use, argument-bound receipts and human-approval holds for agent tool calls."
 readme = "README.md"
 requires-python = ">=3.12"

{gargoyle_receipts-0.5.0.dev0 → gargoyle_receipts-0.5.1.dev0}/tests/test_entra_login.py

@@ -124,3 +124,38 @@ def test_login_command_rewrites_the_client_config(tmp_path, monkeypatch, capsys)
     # Everything the middleware needs to pick the Entra source is there.
     for k in ("GARGOYLE_MCP_ENTRA_TENANT", "GARGOYLE_MCP_ENTRA_CLIENT_ID", "GARGOYLE_MCP_ENTRA_SCOPE", "GARGOYLE_MCP_ENTRA_TOKEN_CACHE"):
         assert env[k] and mcp[k] == env[k]
+
+
+def test_msal_gets_a_public_roots_http_client_and_is_built_lazily(tmp_path, monkeypatch):
+    """REQUESTS_CA_BUNDLE pins the issuer's private CA for the middleware; MSAL
+    must still trust the public roots. And nothing touches the network until
+    the first token is asked for."""
+    from gargoyle import entra_login
+    import certifi
+    built = []
+
+    class CapturingMsal(FakeMsal):
+        class PublicClientApplication:
+            def __init__(self, client_id, authority, token_cache, http_client=None):
+                built.append(http_client)
+                self.inner = FakeApp(client_id, authority, token_cache)
+            def get_accounts(self): return self.inner.get_accounts()
+            def acquire_token_silent(self, scopes, account): return self.inner.acquire_token_silent(scopes, account)
+    monkeypatch.setattr(entra_login, "_msal", lambda: CapturingMsal)
+    monkeypatch.setenv("REQUESTS_CA_BUNDLE", str(tmp_path / "private-ca.crt"))
+    cache = tmp_path / "cache.json"
+    device_code_login("t", "c", "s", str(cache), app_factory=FakeApp, msal_module=FakeMsal, prompt=lambda m: None)
+    src = EntraTokenSource("t", "c", "s", str(cache), msal_module=CapturingMsal)
+    assert built == []                                   # constructed nothing yet
+    assert src.token() == "at-refreshed"
+    assert len(built) == 1 and built[0].verify == certifi.where()   # public roots, not the private CA
+
+    # A tenant that cannot be reached is a refusal at call time, not a crash at startup.
+    class Unreachable(FakeMsal):
+        class PublicClientApplication:
+            def __init__(self, *a, **k): raise OSError("name resolution failed")
+    monkeypatch.setattr(entra_login, "_msal", lambda: Unreachable)
+    off = EntraTokenSource("t", "c", "s", str(cache), msal_module=Unreachable)
+    with pytest.raises(LoginRequired, match="could not be reached"):
+        off.token()
+    assert off.principal is None