didericis
d3e08cf039
The egress addon now selects each request's Config by the calling bottle's
source IP, so one shared sidecar serves every bottle. Opt-in and fail-closed;
single-tenant behaviour is unchanged.
Orchestrator side (source-IP-primary attribution, per the PRD invariant):
* registry: `by_source_ip` (the single active bottle at a source IP —
network-layer attribution); `attribute` now composes it + the token.
* service: `resolve(source_ip, token="")` — with a token, strict
attribution; without, source IP alone.
* control_plane: `POST /resolve`'s identity_token is now OPTIONAL (absent
→ source-IP-only); split cleanly from the token-required `/attribute`.
* policy_resolver: `resolve` token now optional.
Egress side:
* egress_addon_core: `resolve_client_config(resolver, client_ip, token)` —
fetches + parses the client's Config, **fail-closed**: unattributed, a
resolver error, or an unparseable policy all yield deny-all (no routes).
Host-testable; `PolicyResolverLike` Protocol keeps it import-free.
* egress_addon: consolidated mode when `BOT_BOTTLE_ORCHESTRATOR_URL` is
set → `_active_config(flow)` resolves per client IP (reads + strips the
`x-bot-bottle-identity` header); `request()` uses it. Unset → the static
routes file, exactly as before. `PolicyResolver` added to the bundle.
Security note: source-IP-only resolution is safe where the IP is unspoofable
(Firecracker /31 + nft) AND the control plane is reachable only by the
trusted sidecar; the identity token, when the agent injects it, strengthens
it on weaker backends.
Scope note: the egress data plane is now multi-tenant. Remaining to be fully
live: the network topology routing every bottle's proxy to the one shared
sidecar, git-gate multitenancy, and agent-side identity-token injection.
Tests: registry by_source_ip; orchestrator resolve (with/without token);
control-plane /resolve token-optional; resolver token-optional;
resolve_client_config fail-closed matrix. All 182 egress tests still pass
(single-tenant unchanged). Full suite green.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01WBMWTEtQdJ4W5UrWuLHCck
77 lines
3.0 KiB
Python
77 lines
3.0 KiB
Python
"""Unit tests for the sidecar-side PolicyResolver (PRD 0070). HTTP mocked."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
import unittest
|
|
import urllib.error
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
from bot_bottle.policy_resolver import PolicyResolveError, PolicyResolver
|
|
|
|
_URLOPEN = "bot_bottle.policy_resolver.urllib.request.urlopen"
|
|
|
|
|
|
def _resp(payload: object) -> MagicMock:
|
|
"""A urlopen() return value: a context manager whose read() yields JSON."""
|
|
m = MagicMock()
|
|
m.__enter__.return_value.read.return_value = json.dumps(payload).encode()
|
|
return m
|
|
|
|
|
|
def _http_error(code: int) -> urllib.error.HTTPError:
|
|
return urllib.error.HTTPError("http://x/resolve", code, "err", {}, None) # type: ignore[arg-type]
|
|
|
|
|
|
class TestPolicyResolver(unittest.TestCase):
|
|
def setUp(self) -> None:
|
|
self.r = PolicyResolver("http://orch:8080")
|
|
|
|
def test_resolve_returns_policy(self) -> None:
|
|
with patch(_URLOPEN, return_value=_resp({"bottle_id": "b1", "policy": "P"})):
|
|
self.assertEqual("P", self.r.resolve("10.243.0.1", "tok"))
|
|
|
|
def test_resolve_always_fetches_fresh(self) -> None:
|
|
# No cache — every resolve hits the orchestrator so revocations /
|
|
# policy changes are honored immediately.
|
|
with patch(_URLOPEN, return_value=_resp({"policy": "P"})) as m:
|
|
self.r.resolve("10.243.0.1", "tok")
|
|
self.r.resolve("10.243.0.1", "tok")
|
|
self.assertEqual(2, m.call_count)
|
|
|
|
def test_unattributed_403_is_none_fail_closed(self) -> None:
|
|
with patch(_URLOPEN, side_effect=_http_error(403)):
|
|
self.assertIsNone(self.r.resolve("10.243.0.9", "tok"))
|
|
|
|
def test_other_http_error_raises(self) -> None:
|
|
with patch(_URLOPEN, side_effect=_http_error(500)):
|
|
with self.assertRaises(PolicyResolveError):
|
|
self.r.resolve("10.243.0.1", "tok")
|
|
|
|
def test_unreachable_raises(self) -> None:
|
|
with patch(_URLOPEN, side_effect=urllib.error.URLError("refused")):
|
|
with self.assertRaises(PolicyResolveError):
|
|
self.r.resolve("10.243.0.1", "tok")
|
|
|
|
def test_missing_policy_field_is_empty(self) -> None:
|
|
with patch(_URLOPEN, return_value=_resp({"bottle_id": "b1"})):
|
|
self.assertEqual("", self.r.resolve("10.243.0.1", "tok"))
|
|
|
|
def test_posts_source_ip_and_token(self) -> None:
|
|
with patch(_URLOPEN, return_value=_resp({"policy": "P"})) as m:
|
|
self.r.resolve("10.243.0.7", "the-token")
|
|
req = m.call_args.args[0]
|
|
self.assertTrue(req.full_url.endswith("/resolve"))
|
|
sent = json.loads(req.data)
|
|
self.assertEqual("10.243.0.7", sent["source_ip"])
|
|
self.assertEqual("the-token", sent["identity_token"])
|
|
|
|
def test_resolve_without_token_sends_empty(self) -> None:
|
|
with patch(_URLOPEN, return_value=_resp({"policy": "P"})) as m:
|
|
self.r.resolve("10.243.0.7") # token optional
|
|
self.assertEqual("", json.loads(m.call_args.args[0].data)["identity_token"])
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|