[migmartri]

Fixes #3264

What

OrgInvitationUseCase.Create accepted any caller-supplied role verbatim. The Casbin authz middleware gates OrgInvitationService/Create with PolicyOrganizationInvitationsCreate (admin/owner only), but RoleAdmin.IsAdmin() short-circuits the middleware — so an Admin could invite a new external email as MEMBERSHIP_ROLE_ORG_OWNER. AcceptPendingInvitations then auto-creates an Owner membership, bypassing PolicyOrganizationManageOwners (the Owner-only manage-owners gate) and bootstrapping a fresh Owner via the invitation path.

Change

• When the requested invitation role is RoleOwner, the biz layer now enforces PolicyOrganizationManageOwners against the caller's authz subject. The check is shared with the existing owner-scoped guards in MembershipUseCase.UpdateRole / DeleteOther through a single enforceManageOwners helper, with the denial messages defined once. Non-owner callers receive ErrUnauthorized("only organization owners can invite owners").
• The service layer passes the caller's authz subject (org role for users, api-token:<id> for API tokens) down via a new callerRole parameter; the group/project invitation flows pass the requester's membership role.
• This intentionally also applies to instance admins: they hold PolicyOrganizationInvitationsCreate but deliberately not PolicyOrganizationManageOwners, so they can no longer seed owners into organizations they administer.
• GroupUseCase.handleNonExistingUser now guards against a nil requester membership instead of dereferencing it.

Parts of this change were produced with AI assistance (Claude Code); see the commit trailers.

🤖 Posted by Maximus bot (Claude Code) on behalf of @migmartri

[cubic-dev-ai]

No issues found across 8 files

_{Re-trigger cubic}

[migmartri]

Re: the behavior-change note on instance-admin / owner distinction — in practice Admin and Owner currently behave the same in Chainloop, so this distinction has historically been moot. However, we have plans to enable explicit Owner-only features downstream (e.g. billing, org deletion, SSO management), so we're tightening the boundary now so the PolicyOrganizationManageOwners gate is consistently enforced across both MembershipUseCase.UpdateRole/DeleteOther and OrgInvitationUseCase.Create. The new behavior (only Owners can invite Owners) is the intended forward-looking invariant.

🤖 Posted by Maximus bot (Claude Code) on behalf of @migmartri

[chainloop-platform]

AI Session Analysis

Avg score	Sessions	Failing policies	Attribution	Files	Lines	Total Duration
🟢 87%	1	⚠️ 1	100% AI / 0% Human	4	+218 / -238	2h54m31s

🟢 87% — 100% AI — ⚠️ 1 policies failing

Jul 5, 2026 17:27 UTC · 2h54m31s · $118.22 · 766.9k in / 385.4k out · claude-code 2.1.201 (claude-fable-5)

View session details ↗

Change Summary

• Shares the manage-owners guard between membership and org-invitation flows.
• Adds a nil-membership guard in group.go.
• Reworks org invitation integration tests into table-driven role and API-token cases.

AI Session Overall Score

🟢 87% — Verified, aligned change with one gap: no human confirmation after the autonomous finish.

AI Session Analysis Breakdown

🟢 94% · scope-discipline

🟢 The commit staged only four relevant files and left unrelated WIP out. · High Impact

🟢 90% · alignment

No notes.

🟢 90% · solution-quality

No notes.

🟢 88% · context-and-planning

🟢 AI restated findings 3–7 before edits, and /simplify added structured cleanup guidance. · Medium Impact

🟢 88% · user-trust-signal

No notes.

🟡 78% · verification

🟢 The owner-guard tests were expanded and rerun successfully. · High Impact

🟠 After the autonomous finish, no user turn confirmed the behavior worked; verification relied entirely on automated checks. · Medium Severity

💡 When the session turns autonomous, capture one concrete manual or reviewer-facing validation note before declaring completion.

---

File Attribution

████████████████████ 100% AI / 0% Human

Status	Attribution	File	Lines
modified	ai	app/controlplane/pkg/biz/orginvitation_integration_test.go	+195 / -214
modified	ai	app/controlplane/pkg/biz/membership.go	+15 / -6
modified	ai	app/controlplane/pkg/biz/orginvitation.go	+1 / -17
modified	ai	app/controlplane/pkg/biz/group.go	+7 / -1

---

Policies (4, 1 failing)

Status	Policy	Material	Messages
✅ Passed	ai-config-ai-agents-allowed	ai-coding-session-321ef4	-
✅ Passed	ai-config-no-dangerous-commands	ai-coding-session-321ef4	-
⚠️ Failed	ai-config-no-secrets	ai-coding-session-321ef4	Potential secret (Quoted API key/password) found in session content [turn=114, source=queue-operation, line=25, value=token:' ...ns '] Potential secret (Quoted API key/password) found in session content [turn=116, source=user-message, line=25, value=token:' ...ns '] Potential secret (Quoted API key/password) found in session content [turn=132, source=tool_result, line=22, value=token:")...b, "] Potential secret (Quoted API key/password) found in session content [turn=132, source=tool_result, line=23, value=token:")...hat']
✅ Passed	ai-config-mcp-servers-allowed	ai-coding-session-321ef4	-

---

Powered by Chainloop and Chainloop Trace

[matiasinsaurralde]

LGTM