Skip to content

fix(identity): preserve revoked model offering access #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
idunara21 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(identity): preserve revoked model offering access #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions packages/backend/src/identity/identity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1675,13 +1675,13 @@ export class IdentityService {
for (let suffix = 2; slugTaken.get(id); suffix += 1) id = `${base}-${suffix}`;
insertOffering.run(id, modelId, connection.id, modelId, owner.id, now, now);
offering = { id };
}
const grants = oldGrants.all(connection.id, modelId) as Array<{
subjectType: "user" | "team";
subjectId: string;
}>;
for (const grant of grants) {
copyGrant.run(offering.id, grant.subjectType, grant.subjectId, owner.id, now);
const grants = oldGrants.all(connection.id, modelId) as Array<{
subjectType: "user" | "team";
subjectId: string;
}>;
for (const grant of grants) {
copyGrant.run(offering.id, grant.subjectType, grant.subjectId, owner.id, now);
}
}
}
}
Expand Down
20 changes: 20 additions & 0 deletions packages/backend/src/identity/roles-model-offerings.integration.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,26 @@ describe("roles, capabilities, and model offerings", () => {
expect(company).not.toHaveProperty("backendId");
expect(company).not.toHaveProperty("upstreamModelId");

expect(offerings).toContainEqual(expect.objectContaining({ id: "allowed-model" }));
expect(
(
await backend.app.request(
"http://localhost/api/identity/model-offerings/allowed-model/entitlements",
{
method: "PUT",
headers: headers(owner.token, true),
body: JSON.stringify({ entitlements: [] }),
},
)
).status,
).toBe(200);
const afterRevocation = await value<Array<{ id: string }>>(
await backend.app.request("http://localhost/api/host/model-offerings", {
headers: headers(member.token),
}),
);
expect(afterRevocation.map((offering) => offering.id)).not.toContain("allowed-model");

// Re-running migration is idempotent and cannot widen the exact legacy grant.
await backend.app.request("http://localhost/api/host/models", {
headers: headers(member.token),
Expand Down