Skip to content

feat: add API key scopes and application_connect scope #4067

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 11 commits into from
Sep 19, 2022
Merged

feat: add API key scopes and application_connect scope #4067

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f4c5190
feat: add apikey scopes
deansheather Sep 14, 2022
db015ef
devurls -> application_connect
deansheather Sep 15, 2022
ee3b3c9
chore: add rbac scope tests
deansheather Sep 15, 2022
9c06467
feat: add WorkspaceApplicationConnect permission
deansheather Sep 15, 2022
f125172
Merge branch 'main' into dean/token-scopes
deansheather Sep 16, 2022
6bd2398
fixup! Merge branch 'main' into dean/token-scopes
deansheather Sep 16, 2022
a87d6e1
chore: rename ApiKeyScope with sqlc and move migrations code
deansheather Sep 19, 2022
dee284f
Merge branch 'main' into dean/token-scopes
deansheather Sep 19, 2022
f7707a8
chore: migrations.MigrateUp -> migrations.Up
deansheather Sep 19, 2022
49059d1
chore: improve rbac scope tests
deansheather Sep 19, 2022
2b37954
fixup! chore: improve rbac scope tests
deansheather Sep 19, 2022
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
Prev Previous commit
Next Next commit
fixup! Merge branch 'main' into dean/token-scopes
  • Loading branch information
@deansheather
deansheather committed Sep 16, 2022
commit 6bd2398be60a39d408a46a7d60d9ec6cfb010b96
22 changes: 3 additions & 19 deletions coderd/database/modelmethods.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,14 @@
package database

import (
"golang.org/x/xerrors"

"github.com/coder/coder/coderd/rbac"
)

var validAPIKeyScopes = map[string]ApiKeyScope{
string(ApiKeyScopeAny): ApiKeyScopeAny,
string(ApiKeyScopeApplicationConnect): ApiKeyScopeApplicationConnect,
}

func ToAPIKeyScope(v string) (ApiKeyScope, error) {
scope, ok := validAPIKeyScopes[v]
if !ok {
return ApiKeyScope(""), xerrors.Errorf("invalid token scope: %s", v)
}

return scope, nil
}

func (s ApiKeyScope) ToRBAC() rbac.Scope {
switch {
case s == ApiKeyScopeAny:
switch s {
case ApiKeyScopeAny:
return rbac.ScopeAny
case s == ApiKeyScopeApplicationConnect:
case ApiKeyScopeApplicationConnect:
return rbac.ScopeApplicationConnect
default:
panic("developer error: unknown scope type " + string(s))
Expand Down