didericis/bot-bottle
1
0
Fork 0
Code Issues 26 Pull Requests 22 Actions 1 Packages Projects Releases Wiki Activity

feat(orchestrator): slice 6 — source-IP-keyed multi-tenant policy #361

Open
didericis-claude wants to merge 1 commits from orchestrator-slice6 into orchestrator-slice5
pull from: orchestrator-slice6
merge into: didericis:orchestrator-slice5
Conversation 0 Commits 1 Files Changed 6
+166 -18
didericis-claude commented 2026-07-13 17:09:48 -04:00
Collaborator
Copy Link
Copy Source

Slice 6 of PRD 0070, stacked on #360. The orchestrator side of the multi-tenant consolidated sidecar: hold each bottle's sidecar policy and serve it by verified source IP, with live reload — so one shared sidecar can get per-bottle config keyed on who's calling.

  • registry.py — a policy column (migration v3; opaque JSON the sidecar interprets) on BottleRecord; register(..., policy=), set_policy(id, policy) (live), and attribute returns it (the source-IP-keyed resolution).
  • service.py — launch_bottle(..., policy=) + set_policy.
  • control_plane.py — POST /bottles accepts policy; PUT /bottles/<id>/policy live-reloads it; POST /resolve returns {bottle_id, policy} for a verified (source_ip, token) — the per-request call the multi-tenant sidecar makes. /attribute stays identity-only.

Scope note (honest): this is the control-plane / state half. The data-plane half — the egress mitmproxy addon (and git-gate) selecting allowlist / DLP / token-injection per client IP by calling /resolve — is the next slice (route agent bottles through the shared sidecar, #7). The orchestrator stays policy-agnostic: stores + serves the blob verbatim.

Tests: registry policy store/update/persist; Orchestrator launch-with-policy + live set_policy; control-plane /resolve returns policy (403 on bad token), PUT policy updates / 404 / 400. Verified live over HTTP (launch → resolve → PUT reload → resolve reflects). Full suite green.

Merge order: #352 → #356 → #357 → #358 → #360 → this.

🤖 Generated with Claude Code

Slice 6 of PRD 0070, **stacked on #360**. The orchestrator side of the multi-tenant consolidated sidecar: hold each bottle's sidecar policy and **serve it by verified source IP, with live reload** — so one shared sidecar can get per-bottle config keyed on who's calling. - **`registry.py`** — a `policy` column (migration v3; opaque JSON the sidecar interprets) on `BottleRecord`; `register(..., policy=)`, `set_policy(id, policy)` (live), and `attribute` returns it (the source-IP-keyed resolution). - **`service.py`** — `launch_bottle(..., policy=)` + `set_policy`. - **`control_plane.py`** — `POST /bottles` accepts `policy`; **`PUT /bottles/<id>/policy`** live-reloads it; **`POST /resolve`** returns `{bottle_id, policy}` for a verified `(source_ip, token)` — the per-request call the multi-tenant sidecar makes. `/attribute` stays identity-only. **Scope note (honest):** this is the **control-plane / state half**. The **data-plane half** — the egress mitmproxy addon (and git-gate) selecting allowlist / DLP / token-injection *per client IP* by calling `/resolve` — is the next slice (route agent bottles through the shared sidecar, #7). The orchestrator stays policy-agnostic: stores + serves the blob verbatim. **Tests:** registry policy store/update/persist; Orchestrator launch-with-policy + live `set_policy`; control-plane `/resolve` returns policy (403 on bad token), `PUT` policy updates / 404 / 400. Verified live over HTTP (launch → resolve → PUT reload → resolve reflects). Full suite green. Merge order: #352 → #356 → #357 → #358 → #360 → this. 🤖 Generated with [Claude Code](https://claude.com/claude-code)
didericis-claude added 1 commit 2026-07-13 17:09:49 -04:00
feat(orchestrator): slice 6 — source-IP-keyed multi-tenant policy (#352)
lint / lint (push) Successful in 2m1s
Details
test / unit (pull_request) Successful in 1m5s
Details
test / integration (pull_request) Successful in 21s
Details
test / coverage (pull_request) Successful in 1m16s
Details
f754c575d7 
The orchestrator side of the multi-tenant consolidated sidecar: hold each
bottle's sidecar policy and serve it by verified source IP, with live
reload. One shared sidecar can now get per-bottle config keyed on who's
calling.

  * registry.py — a `policy` column (migration v3, opaque JSON the sidecar
    interprets) on BottleRecord; `register(..., policy=)` stores it,
    `set_policy(bottle_id, policy)` updates it live, and `attribute` returns
    it (the source-IP-keyed resolution).
  * service.py — `launch_bottle(..., policy=)` and `set_policy`.
  * control_plane.py — `POST /bottles` accepts `policy`; `PUT
    /bottles/<id>/policy` live-reloads it; `POST /resolve` returns
    {bottle_id, policy} for a verified (source_ip, token) — the per-request
    call the multi-tenant sidecar makes; `/attribute` stays identity-only.

Scope note: this is the control-plane / state half. The data-plane half —
the egress mitmproxy addon (and git-gate) selecting allowlist / DLP /
token-injection per client IP by calling `/resolve` — is the next slice
(route agent bottles through the shared sidecar). The orchestrator stays
policy-agnostic: it stores and serves the blob verbatim.

Tests: registry policy store/update/persist; Orchestrator launch-with-policy
+ live set_policy; control-plane resolve returns policy (403 on bad token),
PUT policy updates / 404 / 400. Verified live over HTTP (launch -> resolve
-> PUT reload -> resolve reflects). Full suite green.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01WBMWTEtQdJ4W5UrWuLHCck
didericis approved these changes 2026-07-13 17:14:50 -04:00
didericis left a comment
Owner
Copy Link
Copy Source

Should probably change the policy to be a structured type, but is fine for now.

Should probably change the policy to be a structured type, but is fine for now.
Some checks are pending
lint / lint (push) Successful in 2m1s
Details
test / unit (pull_request) Successful in 1m5s
Details
test / integration (pull_request) Successful in 21s
Details
test / coverage (pull_request) Successful in 1m16s
Details
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin orchestrator-slice6:orchestrator-slice6
git checkout orchestrator-slice6
Sign in to join this conversation.
Reviewers
No Reviewers
didericis
Labels
Clear labels
Compat/Breaking
Breaking change that won't be backward compatible
 Kind/Bug
Something is not working
 Kind/Documentation
Documentation changes
 Kind/Enhancement
Improve existing functionality
 Kind/Feature
New functionality
 Kind/Security
This is security issue
 Kind/Testing
Issue or pull request related to testing
Priority
Critical
1
The priority is critical
Priority
High
2
The priority is high
Priority
Low
4
The priority is low
Priority
Medium
3
The priority is medium
Reviewed
Confirmed
1
Issue has been confirmed
Reviewed
Duplicate
2
This issue or pull request already exists
Reviewed
Invalid
3
Invalid issue
Reviewed
Won't Fix
3
This issue won't be fixed
Status
Abandoned
3
Somebody has started to work on this but abandoned work
Status
Blocked
1
Something is blocking this issue or pull request
Status
Need More Info
2
Feedback is required to reproduce issue or to continue work
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
didericis-claude (didericis (claude)) didericis-codex (didericis (codex)) didericis-gemma (gemma) didericis
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: didericis/bot-bottle#361
Delete Branch "orchestrator-slice6"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?