Thanks to visit codestin.com
Credit goes to github.com

Skip to content

test: include per-org default roles in rbac user subjects #26003

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
Emyrk merged 1 commit into from
Jun 5, 2026
Merged

test: include per-org default roles in rbac user subjects #26003

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
10 changes: 10 additions & 0 deletions coderd/coderdtest/coderdtest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,6 +908,16 @@ func AuthzUserSubjectWithDB(ctx context.Context, t testing.TB, db database.Store
require.NoError(t, err)
for _, org := range orgs {
roles = append(roles, rbac.ScopedRoleOrgMember(org.ID))
// The implicit role set (organization-member plus the org's
// default_org_member_roles) is unioned at request time by
// GetAuthorizationUserRoles. Subjects built directly here bypass
// that SQL union, so mirror it explicitly.
for _, name := range org.DefaultOrgMemberRoles {
roles = append(roles, rbac.RoleIdentifier{
Name: name,
OrganizationID: org.ID,
})
}
}

//nolint:gocritic // We need to expand DB-backed/system roles. The caller
Expand Down
31 changes: 0 additions & 31 deletions coderd/coderdtest/subjects.go
View file
Open in desktop

This file was deleted.

30 changes: 29 additions & 1 deletion coderd/workspaceconnwatcher/watcher_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import (
"github.com/coder/coder/v2/coderd/database/dbmock"
"github.com/coder/coder/v2/coderd/database/pubsub"
"github.com/coder/coder/v2/coderd/httpmw"
"github.com/coder/coder/v2/coderd/rbac"
"github.com/coder/coder/v2/coderd/rbac/rolestore"
"github.com/coder/coder/v2/coderd/workspaceconnwatcher"
"github.com/coder/coder/v2/coderd/wspubsub"
"github.com/coder/coder/v2/codersdk"
Expand Down Expand Up @@ -72,7 +74,7 @@ func (h *harness) Dial(ctx context.Context, url string) (*wsjson.Decoder[workspa
Handler: http.HandlerFunc(h.watcher.WorkspaceAgentConnectionWatch),
CtxMutator: func(ctx context.Context) context.Context {
ctx = httpmw.WithWorkspaceParam(ctx, h.workspace)
ctx = dbauthz.As(ctx, coderdtest.MemberSubject(userID, orgID))
ctx = dbauthz.As(ctx, memberSubject(userID, orgID))
return ctx
},
Logger: h.logger.Named("roundtripper"),
Expand Down Expand Up @@ -470,3 +472,29 @@ func TestWatcher_ClosedAfterDial(t *testing.T) {
}
testutil.TryReceive(ctx, t, closed)
}

// memberSubject builds an RBAC subject scoped as a basic org member, used to
// drive the watcher handler through dbauthz checks. Kept local to this test
// because no other package needs it.
func memberSubject(userID, orgID uuid.UUID) rbac.Subject {
memberRole, err := rbac.RoleByName(rbac.RoleMember())
if err != nil {
panic(err)
}
orgMember, err := rolestore.TestingGetSystemRole(
rbac.RoleOrgMember(),
orgID,
rbac.OrgSettings{ShareableWorkspaceOwners: rbac.ShareableWorkspaceOwnersNone},
)
if err != nil {
panic(err)
}
return rbac.Subject{
FriendlyName: "coderdtest-member",
Email: "[email protected]",
Type: rbac.SubjectTypeUser,
ID: userID.String(),
Roles: rbac.Roles{memberRole, orgMember},
Scope: rbac.ScopeAll,
}.WithCachedASTValue()
}
2 changes: 1 addition & 1 deletion testutil/websocket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
// Handler: MyHandler,
// CtxMutator: func(ctx context.Context) context.Context {
// ctx = httpmw.WithWorkspaceParam(ctx, ws)
// ctx = dbauthz.As(ctx, coderdtest.MemberSubject(userID, orgID))
// ctx = dbauthz.As(ctx, mySubject(userID, orgID))
// return ctx
// },
// Logger: logger.Named("roundtripper"),
Expand Down
Loading