Skip to content

feat: implement custom site-wide roles in the database #13289

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
wants to merge 26 commits into from
Closed

feat: implement custom site-wide roles in the database #13289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
5640dc8
chore: add migration to create a custom_roles table
Emyrk May 15, 2024
60274ad
add custom role expansion from db
Emyrk May 15, 2024
863f477
commit back querier.go, whoops!
Emyrk May 15, 2024
27e90cd
Add route to insert new roles
Emyrk May 15, 2024
3ad641c
adding esclation and validation checks on custom roles
Emyrk May 15, 2024
e0b7070
add test for custom roles
Emyrk May 16, 2024
5eaf6b0
add comment
Emyrk May 16, 2024
8fb8a1b
add dbauthz test
Emyrk May 16, 2024
8107dc7
add custom role esclation tests
Emyrk May 16, 2024
f5cd901
add built in role validation tests
Emyrk May 16, 2024
ce87f77
add test comment
Emyrk May 16, 2024
d41e95a
update comment
Emyrk May 16, 2024
171dbf0
cleanup
Emyrk May 16, 2024
52e097c
fixup rolename expansion
Emyrk May 16, 2024
71db49d
fmt
Emyrk May 16, 2024
1c6939e
add db fixture
Emyrk May 16, 2024
ea9b9be
typo
Emyrk May 16, 2024
aa85df1
Make gen
Emyrk May 16, 2024
2b0cba6
thread safe role cache'
Emyrk May 16, 2024
0d91366
More lint
Emyrk May 16, 2024
06a17c1
graphite pulled code from another branch??
Emyrk May 16, 2024
8ccf30c
unsure how to nolint this use of the owner
Emyrk May 16, 2024
490e9d9
fix gen
Emyrk May 16, 2024
1eec6e2
fmt.Errorf to xerrors
Emyrk May 16, 2024
5803346
fix imports
Emyrk May 16, 2024
3c8f79f
add import
Emyrk May 16, 2024
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
87 changes: 82 additions & 5 deletions coderd/apidoc/docs.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

87 changes: 82 additions & 5 deletions coderd/apidoc/swagger.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions coderd/audit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,12 +196,12 @@ func (api *API) convertAuditLog(ctx context.Context, dblog database.GetAuditLogs
CreatedAt: dblog.UserCreatedAt.Time,
Status: codersdk.UserStatus(dblog.UserStatus.UserStatus),
},
Roles: []codersdk.Role{},
Roles: []codersdk.SlimRole{},
}

for _, roleName := range dblog.UserRoles {
rbacRole, _ := rbac.RoleByName(roleName)
user.Roles = append(user.Roles, db2sdk.Role(rbacRole))
user.Roles = append(user.Roles, db2sdk.SlimRole(rbacRole))
}
}

Expand Down
2 changes: 2 additions & 0 deletions coderd/coderd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ import (
"github.com/coder/coder/v2/coderd/provisionerdserver"
"github.com/coder/coder/v2/coderd/rbac"
"github.com/coder/coder/v2/coderd/rbac/policy"
"github.com/coder/coder/v2/coderd/rbac/rolestore"
"github.com/coder/coder/v2/coderd/schedule"
"github.com/coder/coder/v2/coderd/telemetry"
"github.com/coder/coder/v2/coderd/tracing"
Expand Down Expand Up @@ -631,6 +632,7 @@ func New(options *Options) *API {
httpmw.AttachRequestID,
httpmw.ExtractRealIP(api.RealIPConfig),
httpmw.Logger(api.Logger),
rolestore.CustomRoleMW,
prometheusMW,
// Build-Version is helpful for debugging.
func(next http.Handler) http.Handler {
Expand Down
Loading
Loading