From d4c3b788f54a702d9321e0b3a4aa6075bf6af20e Mon Sep 17 00:00:00 2001 From: pascal Date: Thu, 28 May 2026 21:29:05 +0200 Subject: [PATCH] fix linter --- .../internals/modules/reverseproxy/domain/manager/manager.go | 2 +- management/server/context/keys.go | 1 + management/server/group.go | 2 +- management/server/peer.go | 3 +-- management/server/settings/manager.go | 3 +-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/management/internals/modules/reverseproxy/domain/manager/manager.go b/management/internals/modules/reverseproxy/domain/manager/manager.go index edd141fac..3c0f0d73b 100644 --- a/management/internals/modules/reverseproxy/domain/manager/manager.go +++ b/management/internals/modules/reverseproxy/domain/manager/manager.go @@ -187,7 +187,7 @@ func (m Manager) DeleteDomain(ctx context.Context, accountID, userID, domainID s } func (m Manager) ValidateDomain(ctx context.Context, accountID, userID, domainID string) { - ok, ctx, err := m.permissionsManager.ValidateUserPermissions(ctx, accountID, userID, modules.Services, operations.Create) + ok, _, err := m.permissionsManager.ValidateUserPermissions(ctx, accountID, userID, modules.Services, operations.Create) if err != nil { log.WithFields(log.Fields{ "accountID": accountID, diff --git a/management/server/context/keys.go b/management/server/context/keys.go index cd311b8de..7a65afbbd 100644 --- a/management/server/context/keys.go +++ b/management/server/context/keys.go @@ -22,5 +22,6 @@ func RoleFromContext(ctx context.Context) (string, bool) { // WithRole returns a new context carrying the given role. func WithRole(ctx context.Context, role string) context.Context { + //nolint return context.WithValue(ctx, RoleKey, role) } diff --git a/management/server/group.go b/management/server/group.go index ef26a738b..7e02af245 100644 --- a/management/server/group.go +++ b/management/server/group.go @@ -32,7 +32,7 @@ func (e *GroupLinkError) Error() string { // CheckGroupPermissions validates if a user has the necessary permissions to view groups func (am *DefaultAccountManager) CheckGroupPermissions(ctx context.Context, accountID, userID string) error { - allowed, ctx, err := am.permissionsManager.ValidateUserPermissions(ctx, accountID, userID, modules.Groups, operations.Read) + allowed, _, err := am.permissionsManager.ValidateUserPermissions(ctx, accountID, userID, modules.Groups, operations.Read) if err != nil { return err } diff --git a/management/server/peer.go b/management/server/peer.go index 118bb51c6..4942e44c1 100644 --- a/management/server/peer.go +++ b/management/server/peer.go @@ -643,14 +643,13 @@ func (am *DefaultAccountManager) handleUserAddedPeer(ctx context.Context, accoun } if temporary { - allowed, newCtx, err := am.permissionsManager.ValidateUserPermissions(ctx, accountID, userID, modules.Peers, operations.Create) + allowed, _, err := am.permissionsManager.ValidateUserPermissions(ctx, accountID, userID, modules.Peers, operations.Create) if err != nil { return status.NewPermissionValidationError(err) } if !allowed { return status.NewPermissionDeniedError() } - ctx = newCtx } else { config.AccountID = user.AccountID config.GroupsToAdd = user.AutoGroups diff --git a/management/server/settings/manager.go b/management/server/settings/manager.go index fa90f6c07..f84739193 100644 --- a/management/server/settings/manager.go +++ b/management/server/settings/manager.go @@ -59,14 +59,13 @@ func (m *managerImpl) GetExtraSettingsManager() extra_settings.Manager { func (m *managerImpl) GetSettings(ctx context.Context, accountID, userID string) (*types.Settings, error) { if userID != activity.SystemInitiator { - ok, newCtx, err := m.permissionsManager.ValidateUserPermissions(ctx, accountID, userID, modules.Settings, operations.Read) + ok, _, err := m.permissionsManager.ValidateUserPermissions(ctx, accountID, userID, modules.Settings, operations.Read) if err != nil { return nil, status.NewPermissionValidationError(err) } if !ok { return nil, status.NewPermissionDeniedError() } - ctx = newCtx } extraSettings, err := m.extraSettingsManager.GetExtraSettings(ctx, accountID)