Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitfc20adb

Browse files
committed
remove dbauthz system usage
1 parentc501cf9 commitfc20adb

File tree

3 files changed

+24
-23
lines changed

3 files changed

+24
-23
lines changed

‎coderd/coderdtest/coderdtest.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ func NewOptions(t testing.TB, options *Options) (func(http.Handler), context.Can
284284

285285
ifoptions.PushNotifier==nil {
286286
// nolint:gocritic // Gets/sets VAPID keys.
287-
pushNotifier,err:=push.New(dbauthz.AsSystemRestricted(context.Background()),options.Logger,options.Database)
287+
pushNotifier,err:=push.New(dbauthz.AsNotifier(context.Background()),options.Logger,options.Database)
288288
iferr!=nil {
289289
panic(xerrors.Errorf("failed to create push notifier: %w",err))
290290
}

‎coderd/database/dbauthz/dbauthz.go‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,10 @@ var (
281281
Identifier: rbac.RoleIdentifier{Name:"notifier"},
282282
DisplayName:"Notifier",
283283
Site:rbac.Permissions(map[string][]policy.Action{
284-
rbac.ResourceNotificationMessage.Type: {policy.ActionCreate,policy.ActionRead,policy.ActionUpdate,policy.ActionDelete},
285-
rbac.ResourceInboxNotification.Type: {policy.ActionCreate},
284+
rbac.ResourceNotificationMessage.Type: {policy.ActionCreate,policy.ActionRead,policy.ActionUpdate,policy.ActionDelete},
285+
rbac.ResourceInboxNotification.Type: {policy.ActionCreate},
286+
rbac.ResourceNotificationPushSubscription.Type: {policy.ActionCreate,policy.ActionRead,policy.ActionUpdate,policy.ActionDelete},
287+
rbac.ResourceDeploymentConfig.Type: {policy.ActionRead,policy.ActionUpdate},// To read and upsert VAPID keys
286288
}),
287289
Org:map[string][]rbac.Permission{},
288290
User: []rbac.Permission{},
@@ -317,25 +319,24 @@ var (
317319
Identifier: rbac.RoleIdentifier{Name:"system"},
318320
DisplayName:"Coder",
319321
Site:rbac.Permissions(map[string][]policy.Action{
320-
rbac.ResourceWildcard.Type: {policy.ActionRead},
321-
rbac.ResourceApiKey.Type:rbac.ResourceApiKey.AvailableActions(),
322-
rbac.ResourceGroup.Type: {policy.ActionCreate,policy.ActionUpdate},
323-
rbac.ResourceAssignRole.Type:rbac.ResourceAssignRole.AvailableActions(),
324-
rbac.ResourceAssignOrgRole.Type:rbac.ResourceAssignOrgRole.AvailableActions(),
325-
rbac.ResourceSystem.Type: {policy.WildcardSymbol},
326-
rbac.ResourceOrganization.Type: {policy.ActionCreate,policy.ActionRead},
327-
rbac.ResourceOrganizationMember.Type: {policy.ActionCreate,policy.ActionDelete,policy.ActionRead},
328-
rbac.ResourceProvisionerDaemon.Type: {policy.ActionCreate,policy.ActionRead,policy.ActionUpdate},
329-
rbac.ResourceUser.Type:rbac.ResourceUser.AvailableActions(),
330-
rbac.ResourceWorkspaceDormant.Type: {policy.ActionUpdate,policy.ActionDelete,policy.ActionWorkspaceStop},
331-
rbac.ResourceWorkspace.Type: {policy.ActionUpdate,policy.ActionDelete,policy.ActionWorkspaceStart,policy.ActionWorkspaceStop,policy.ActionSSH},
332-
rbac.ResourceWorkspaceProxy.Type: {policy.ActionCreate,policy.ActionUpdate,policy.ActionDelete},
333-
rbac.ResourceDeploymentConfig.Type: {policy.ActionCreate,policy.ActionUpdate,policy.ActionDelete},
334-
rbac.ResourceNotificationMessage.Type: {policy.ActionCreate,policy.ActionRead,policy.ActionUpdate,policy.ActionDelete},
335-
rbac.ResourceNotificationPreference.Type: {policy.ActionCreate,policy.ActionUpdate,policy.ActionDelete},
336-
rbac.ResourceNotificationTemplate.Type: {policy.ActionCreate,policy.ActionUpdate,policy.ActionDelete},
337-
rbac.ResourceNotificationPushSubscription.Type: {policy.ActionCreate,policy.ActionUpdate,policy.ActionDelete},
338-
rbac.ResourceCryptoKey.Type: {policy.ActionCreate,policy.ActionUpdate,policy.ActionDelete},
322+
rbac.ResourceWildcard.Type: {policy.ActionRead},
323+
rbac.ResourceApiKey.Type:rbac.ResourceApiKey.AvailableActions(),
324+
rbac.ResourceGroup.Type: {policy.ActionCreate,policy.ActionUpdate},
325+
rbac.ResourceAssignRole.Type:rbac.ResourceAssignRole.AvailableActions(),
326+
rbac.ResourceAssignOrgRole.Type:rbac.ResourceAssignOrgRole.AvailableActions(),
327+
rbac.ResourceSystem.Type: {policy.WildcardSymbol},
328+
rbac.ResourceOrganization.Type: {policy.ActionCreate,policy.ActionRead},
329+
rbac.ResourceOrganizationMember.Type: {policy.ActionCreate,policy.ActionDelete,policy.ActionRead},
330+
rbac.ResourceProvisionerDaemon.Type: {policy.ActionCreate,policy.ActionRead,policy.ActionUpdate},
331+
rbac.ResourceUser.Type:rbac.ResourceUser.AvailableActions(),
332+
rbac.ResourceWorkspaceDormant.Type: {policy.ActionUpdate,policy.ActionDelete,policy.ActionWorkspaceStop},
333+
rbac.ResourceWorkspace.Type: {policy.ActionUpdate,policy.ActionDelete,policy.ActionWorkspaceStart,policy.ActionWorkspaceStop,policy.ActionSSH},
334+
rbac.ResourceWorkspaceProxy.Type: {policy.ActionCreate,policy.ActionUpdate,policy.ActionDelete},
335+
rbac.ResourceDeploymentConfig.Type: {policy.ActionCreate,policy.ActionUpdate,policy.ActionDelete},
336+
rbac.ResourceNotificationMessage.Type: {policy.ActionCreate,policy.ActionRead,policy.ActionUpdate,policy.ActionDelete},
337+
rbac.ResourceNotificationPreference.Type: {policy.ActionCreate,policy.ActionUpdate,policy.ActionDelete},
338+
rbac.ResourceNotificationTemplate.Type: {policy.ActionCreate,policy.ActionUpdate,policy.ActionDelete},
339+
rbac.ResourceCryptoKey.Type: {policy.ActionCreate,policy.ActionUpdate,policy.ActionDelete},
339340
}),
340341
Org:map[string][]rbac.Permission{},
341342
User: []rbac.Permission{},

‎coderd/notifications/push/push.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ func (n *Notifier) Dispatch(ctx context.Context, userID uuid.UUID, notification
135135

136136
iflen(cleanupSubscriptions)>0 {
137137
// nolint:gocritic // These are known to be invalid subscriptions.
138-
err=n.store.DeleteNotificationPushSubscriptions(dbauthz.AsSystemRestricted(ctx),cleanupSubscriptions)
138+
err=n.store.DeleteNotificationPushSubscriptions(dbauthz.AsNotifier(ctx),cleanupSubscriptions)
139139
iferr!=nil {
140140
n.log.Error(ctx,"failed to delete stale push subscriptions",slog.Error(err))
141141
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp