Skip to content

[server/FGA] relationship updates/migration setup #18369

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

Merged
merged 1 commit into from
Jul 28, 2023
Merged

[server/FGA] relationship updates/migration setup #18369

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
3 changes: 2 additions & 1 deletion components/gitpod-protocol/src/protocol.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,8 @@ export interface AdditionalUserData extends Partial<WorkspaceTimeoutSetting> {
// additional user profile data
profile?: ProfileDetails;
shouldSeeMigrationMessage?: boolean;

// fgaRelationshipsVersion is the version of the spicedb relationships
fgaRelationshipsVersion?: number;
// remembered workspace auto start options
workspaceAutostartOptions?: WorkspaceAutostartOption[];
}
Expand Down
4 changes: 4 additions & 0 deletions components/gitpod-protocol/src/teams-projects-protocol.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ export interface Project {
}

export namespace Project {
export function is(data?: any): data is Project {
return typeof data === "object" && ["id", "name", "cloneUrl", "teamId"].every((p) => p in data);
}

export const create = (project: Omit<Project, "id" | "creationTime">): Project => {
return {
...project,
Expand Down
313 changes: 101 additions & 212 deletions components/server/src/authorization/authorizer.ts
View file
Open in desktop

Large diffs are not rendered by default.

273 changes: 271 additions & 2 deletions components/server/src/authorization/definitions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@
* See License.AGPL.txt in the project root for license information.
*/

export const InstallationID = "1";
// This file is generated by the spicedb/codegen/codegen.go. Do not edit manually.

import { v1 } from "@authzed/authzed-node";

const InstallationID = "1";

export type ResourceType = UserResourceType | InstallationResourceType | OrganizationResourceType | ProjectResourceType;

export type Relation = UserRelation | InstallationRelation | OrganizationRelation | ProjectRelation;
Expand All @@ -15,7 +20,7 @@ export type UserResourceType = "user";

export type UserRelation = "self" | "container";

export type UserPermission = "read_info" | "write_info" | "suspend";
export type UserPermission = "read_info" | "write_info" | "suspend" | "make_admin";

export type InstallationResourceType = "installation";

Expand Down Expand Up @@ -50,3 +55,267 @@ export type ProjectResourceType = "project";
export type ProjectRelation = "org" | "editor" | "viewer";

export type ProjectPermission = "read_info" | "write_info" | "delete";

export const rel = {
user(id: string) {
const result: Partial<v1.Relationship> = {
resource: {
objectType: "user",
objectId: id,
},
};
return {
get self() {
const result2 = {
...result,
relation: "self",
};
return {
user(objectId: string) {
return {
...result2,
subject: {
object: {
objectType: "user",
objectId: objectId,
},
},
} as v1.Relationship;
},
};
},

get container() {
const result2 = {
...result,
relation: "container",
};
return {
organization(objectId: string) {
return {
...result2,
subject: {
object: {
objectType: "organization",
objectId: objectId,
},
},
} as v1.Relationship;
},
get installation() {
return {
...result2,
subject: {
object: {
objectType: "installation",
objectId: InstallationID,
},
},
} as v1.Relationship;
},
};
},
};
},

get installation() {
const result: Partial<v1.Relationship> = {
resource: {
objectType: "installation",
objectId: InstallationID,
},
};
return {
get member() {
const result2 = {
...result,
relation: "member",
};
return {
user(objectId: string) {
return {
...result2,
subject: {
object: {
objectType: "user",
objectId: objectId,
},
},
} as v1.Relationship;
},
};
},

get admin() {
const result2 = {
...result,
relation: "admin",
};
return {
user(objectId: string) {
return {
...result2,
subject: {
object: {
objectType: "user",
objectId: objectId,
},
},
} as v1.Relationship;
},
};
},
};
},

organization(id: string) {
const result: Partial<v1.Relationship> = {
resource: {
objectType: "organization",
objectId: id,
},
};
return {
get installation() {
const result2 = {
...result,
relation: "installation",
};
return {
get installation() {
return {
...result2,
subject: {
object: {
objectType: "installation",
objectId: InstallationID,
},
},
} as v1.Relationship;
},
};
},

get member() {
const result2 = {
...result,
relation: "member",
};
return {
user(objectId: string) {
return {
...result2,
subject: {
object: {
objectType: "user",
objectId: objectId,
},
},
} as v1.Relationship;
},
};
},

get owner() {
const result2 = {
...result,
relation: "owner",
};
return {
user(objectId: string) {
return {
...result2,
subject: {
object: {
objectType: "user",
objectId: objectId,
},
},
} as v1.Relationship;
},
};
},
};
},

project(id: string) {
const result: Partial<v1.Relationship> = {
resource: {
objectType: "project",
objectId: id,
},
};
return {
get org() {
const result2 = {
...result,
relation: "org",
};
return {
organization(objectId: string) {
return {
...result2,
subject: {
object: {
objectType: "organization",
objectId: objectId,
},
},
} as v1.Relationship;
},
};
},

get editor() {
const result2 = {
...result,
relation: "editor",
};
return {
user(objectId: string) {
return {
...result2,
subject: {
object: {
objectType: "user",
objectId: objectId,
},
},
} as v1.Relationship;
},
};
},

get viewer() {
const result2 = {
...result,
relation: "viewer",
};
return {
user(objectId: string) {
return {
...result2,
subject: {
object: {
objectType: "user",
objectId: objectId,
},
},
} as v1.Relationship;
},
organization(objectId: string) {
return {
...result2,
subject: {
object: {
objectType: "organization",
objectId: objectId,
},
},
} as v1.Relationship;
},
};
},
};
},
};
Loading