Skip to content

fix(coderd): ensure correct RBAC when enqueueing notifications #15478

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 9 commits into from
Nov 12, 2024
Merged

fix(coderd): ensure correct RBAC when enqueueing notifications #15478

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6f1edbd
chore(coderd): make fake notifications enqueuer assert RBAC
johnstcn Nov 11, 2024
b39d87c
fix(rbac): update policy to allow provisionerd and autostart to creat…
johnstcn Nov 11, 2024
3a277a5
chore: update tests after previous changes
johnstcn Nov 11, 2024
7dab1de
fixup! chore: update tests after previous changes
johnstcn Nov 11, 2024
c247f4b
fix: add dbauthz.AsNotifier() to a few missing places
johnstcn Nov 11, 2024
962144c
late night cian is not smart
johnstcn Nov 12, 2024
fbd1e4f
adjust locking
johnstcn Nov 12, 2024
15e97bf
found some magic smoke!
johnstcn Nov 12, 2024
fc242db
just in case
johnstcn Nov 12, 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
Prev Previous commit
Next Next commit
adjust locking
  • Loading branch information
@johnstcn
johnstcn committed Nov 12, 2024
commit fbd1e4fb0e9989d19a43858591be4ee0cee49328
16 changes: 5 additions & 11 deletions coderd/notifications/notificationstest/fake_enqueuer.go
View file
Open in desktop
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

review: moved to its own package to avoid import cycle

Original file line number Diff line number Diff line change
Expand Up @@ -55,23 +55,17 @@ func (f *FakeEnqueuer) assertRBACNoLock(ctx context.Context) {
}

func (f *FakeEnqueuer) Enqueue(ctx context.Context, userID, templateID uuid.UUID, labels map[string]string, createdBy string, targets ...uuid.UUID) (*uuid.UUID, error) {
f.mu.Lock()
defer f.mu.Unlock()
f.assertRBACNoLock(ctx)
return f.enqueueWithDataNoLock(ctx, userID, templateID, labels, nil, createdBy, targets...)
return f.EnqueueWithData(ctx, userID, templateID, labels, nil, createdBy, targets...)
}

func (f *FakeEnqueuer) EnqueueWithData(ctx context.Context, userID, templateID uuid.UUID, labels map[string]string, data map[string]any, createdBy string, targets ...uuid.UUID) (*uuid.UUID, error) {
return f.enqueueWithDataLock(ctx, userID, templateID, labels, data, createdBy, targets...)
}

func (f *FakeEnqueuer) enqueueWithDataLock(ctx context.Context, userID, templateID uuid.UUID, labels map[string]string, data map[string]any, createdBy string, targets ...uuid.UUID) (*uuid.UUID, error) {
f.mu.Lock()
defer f.mu.Unlock()
f.assertRBACNoLock(ctx)
return f.enqueueWithDataNoLock(ctx, userID, templateID, labels, data, createdBy, targets...)
}

func (f *FakeEnqueuer) enqueueWithDataNoLock(_ context.Context, userID, templateID uuid.UUID, labels map[string]string, data map[string]any, createdBy string, targets ...uuid.UUID) (*uuid.UUID, error) {
if f.mu.TryLock() {
panic("Developer error: do not call enqueueWithDataNoLock outside of a mutex lock!")
}

f.sent = append(f.sent, &FakeNotification{
UserID: userID,
Expand Down
Loading