Skip to content

add mapping from method to roles that are allowed to call it #75

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

Closed
iljarotar wants to merge 1 commit into from
Closed

add mapping from method to roles that are allowed to call it #75

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
50 changes: 32 additions & 18 deletions generate/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ func servicePermissions(root string) (*permissions.ServicePermissions, error) {
serverReflectionInfov1alpha1: true,
serverReflectionInfo: true,
}
visibility = permissions.Visibility{
methodRoles = permissions.MethodRoles{}
visibility = permissions.Visibility{
Public: map[string]bool{
// Allow service reflection to list available methods
serverReflectionInfov1alpha1: true,
Expand Down Expand Up @@ -136,56 +137,68 @@ func servicePermissions(root string) (*permissions.ServicePermissions, error) {
for _, method := range serviceDesc.GetMethod() {
methodName := fmt.Sprintf("/%s.%s/%s", *fd.Package, *serviceDesc.Name, *method.Name)
methodOpts := method.Options.GetUninterpretedOption()
methodRoles[methodName] = []string{}
for _, methodOpt := range methodOpts {
for _, namePart := range methodOpt.Name {
if !*namePart.IsExtension {
continue
}
auditable[methodName] = true
// Tenant
switch *methodOpt.IdentifierValue {
switch role := *methodOpt.IdentifierValue; role {
case v1.TenantRole_TENANT_ROLE_OWNER.String():
roles.Tenant[v1.TenantRole_TENANT_ROLE_OWNER.String()] = append(roles.Tenant[v1.TenantRole_TENANT_ROLE_OWNER.String()], methodName)
roles.Tenant[role] = append(roles.Tenant[role], methodName)
visibility.Tenant[methodName] = true
methodRoles[methodName] = append(methodRoles[methodName], role)
case v1.TenantRole_TENANT_ROLE_EDITOR.String():
roles.Tenant[v1.TenantRole_TENANT_ROLE_EDITOR.String()] = append(roles.Tenant[v1.TenantRole_TENANT_ROLE_EDITOR.String()], methodName)
roles.Tenant[role] = append(roles.Tenant[role], methodName)
visibility.Tenant[methodName] = true
methodRoles[methodName] = append(methodRoles[methodName], role)
case v1.TenantRole_TENANT_ROLE_VIEWER.String():
roles.Tenant[v1.TenantRole_TENANT_ROLE_VIEWER.String()] = append(roles.Tenant[v1.TenantRole_TENANT_ROLE_VIEWER.String()], methodName)
roles.Tenant[role] = append(roles.Tenant[role], methodName)
visibility.Tenant[methodName] = true
methodRoles[methodName] = append(methodRoles[methodName], role)
case v1.TenantRole_TENANT_ROLE_GUEST.String():
roles.Tenant[v1.TenantRole_TENANT_ROLE_GUEST.String()] = append(roles.Tenant[v1.TenantRole_TENANT_ROLE_GUEST.String()], methodName)
roles.Tenant[role] = append(roles.Tenant[role], methodName)
visibility.Tenant[methodName] = true
methodRoles[methodName] = append(methodRoles[methodName], role)
case v1.TenantRole_TENANT_ROLE_UNSPECIFIED.String():
// noop
// Project
case v1.ProjectRole_PROJECT_ROLE_OWNER.String():
roles.Project[v1.ProjectRole_PROJECT_ROLE_OWNER.String()] = append(roles.Project[v1.ProjectRole_PROJECT_ROLE_OWNER.String()], methodName)
roles.Project[role] = append(roles.Project[role], methodName)
visibility.Project[methodName] = true
methodRoles[methodName] = append(methodRoles[methodName], role)
case v1.ProjectRole_PROJECT_ROLE_EDITOR.String():
visibility.Project[methodName] = true
roles.Project[v1.ProjectRole_PROJECT_ROLE_EDITOR.String()] = append(roles.Project[v1.ProjectRole_PROJECT_ROLE_EDITOR.String()], methodName)
roles.Project[role] = append(roles.Project[role], methodName)
methodRoles[methodName] = append(methodRoles[methodName], role)
case v1.ProjectRole_PROJECT_ROLE_VIEWER.String():
visibility.Project[methodName] = true
roles.Project[v1.ProjectRole_PROJECT_ROLE_VIEWER.String()] = append(roles.Project[v1.ProjectRole_PROJECT_ROLE_VIEWER.String()], methodName)
roles.Project[role] = append(roles.Project[role], methodName)
methodRoles[methodName] = append(methodRoles[methodName], role)
case v1.ProjectRole_PROJECT_ROLE_UNSPECIFIED.String():
// noop
// Admin
case v1.AdminRole_ADMIN_ROLE_EDITOR.String():
roles.Admin[v1.AdminRole_ADMIN_ROLE_EDITOR.String()] = append(roles.Admin[v1.AdminRole_ADMIN_ROLE_EDITOR.String()], methodName)
roles.Admin[role] = append(roles.Admin[role], methodName)
visibility.Admin[methodName] = true
methodRoles[methodName] = append(methodRoles[methodName], role)
case v1.AdminRole_ADMIN_ROLE_VIEWER.String():
roles.Admin[v1.AdminRole_ADMIN_ROLE_VIEWER.String()] = append(roles.Admin[v1.AdminRole_ADMIN_ROLE_VIEWER.String()], methodName)
roles.Admin[role] = append(roles.Admin[role], methodName)
visibility.Admin[methodName] = true
methodRoles[methodName] = append(methodRoles[methodName], role)
case v1.AdminRole_ADMIN_ROLE_UNSPECIFIED.String():
// noop
// Infra
case v1.InfraRole_INFRA_ROLE_EDITOR.String():
roles.Infra[v1.InfraRole_INFRA_ROLE_EDITOR.String()] = append(roles.Infra[v1.InfraRole_INFRA_ROLE_EDITOR.String()], methodName)
roles.Infra[role] = append(roles.Infra[role], methodName)
visibility.Infra[methodName] = true
methodRoles[methodName] = append(methodRoles[methodName], role)
case v1.InfraRole_INFRA_ROLE_VIEWER.String():
roles.Infra[v1.InfraRole_INFRA_ROLE_VIEWER.String()] = append(roles.Infra[v1.InfraRole_INFRA_ROLE_VIEWER.String()], methodName)
roles.Infra[role] = append(roles.Infra[role], methodName)
visibility.Infra[methodName] = true
methodRoles[methodName] = append(methodRoles[methodName], role)
case v1.InfraRole_INFRA_ROLE_UNSPECIFIED.String():
// noop
// Visibility
Expand Down Expand Up @@ -215,11 +228,12 @@ func servicePermissions(root string) (*permissions.ServicePermissions, error) {
}
slices.Sort(services)
sp := &permissions.ServicePermissions{
Roles: roles,
Methods: methods,
Visibility: visibility,
Auditable: auditable,
Services: services,
Roles: roles,
Methods: methods,
Visibility: visibility,
Auditable: auditable,
Services: services,
MethodRoles: methodRoles,
}

return sp, nil
Expand Down
11 changes: 10 additions & 1 deletion generate/go_servicepermissions.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,15 @@ func GetServicePermissions() *ServicePermissions {
Methods: map[string]bool{
{{- range $key, $value := .Methods }}
"{{ $key }}": {{ $value }} ,
{{- end }}
},
MethodRoles: map[string][]string{
{{- range $method, $roles := .MethodRoles }}
"{{ $method }}": {
{{- range $role := $roles }}
"{{ $role }}" ,
{{- end }}
} ,
{{- end }}
},
Visibility: Visibility{
Expand Down Expand Up @@ -153,4 +162,4 @@ func GetProjectFromRequest(req connect.AnyRequest) (string, bool) {
return rq.GetProject(), true
}
return "", false
}
}
15 changes: 8 additions & 7 deletions go/permissions/permissions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@ import (

type (
ServicePermissions struct {
Roles Roles `json:"roles"`
Methods Methods `json:"methods"`
Visibility Visibility `json:"visibility"`
Auditable Auditable `json:"auditable,omitempty"`
Services []string `json:"services,omitempty"`
Roles Roles `json:"roles"`
Methods Methods `json:"methods"`
Visibility Visibility `json:"visibility"`
Auditable Auditable `json:"auditable,omitempty"`
Services []string `json:"services,omitempty"`
MethodRoles MethodRoles `json:"methodroles,omitempty"`
}

Methods map[string]bool
Methods map[string]bool
MethodRoles map[string][]string

Chargeable map[string]bool
Auditable map[string]bool
Expand All @@ -23,7 +25,6 @@ type (
Tenant map[string][]string
Project map[string][]string

// Roles
Roles struct {
Admin Admin `json:"admin,omitempty"`
Infra Infra `json:"infra,omitempty"`
Expand Down
Loading
Loading