Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 34 additions & 0 deletions lib/auth/auth_with_roles.go
Original file line number Diff line number Diff line change
Expand Up @@ -4341,6 +4341,10 @@ func (a *ServerWithRoles) SetAuthPreference(ctx context.Context, newAuthPref typ
return trace.Wrap(err)
}

if err := authz.AuthorizeAdminAction(ctx, &a.context); err != nil {
return trace.Wrap(err)
}

// check that the given RequireMFAType is supported in this build.
if newAuthPref.GetPrivateKeyPolicy().IsHardwareKeyPolicy() {
if modules.GetModules().BuildType() != modules.BuildEnterprise {
Expand Down Expand Up @@ -4369,6 +4373,10 @@ func (a *ServerWithRoles) ResetAuthPreference(ctx context.Context) error {
return trace.Wrap(err)
}

if err := authz.AuthorizeAdminAction(ctx, &a.context); err != nil {
return trace.Wrap(err)
}

return a.authServer.SetAuthPreference(ctx, types.DefaultAuthPreference())
}

Expand Down Expand Up @@ -4405,6 +4413,10 @@ func (a *ServerWithRoles) SetClusterNetworkingConfig(ctx context.Context, newNet
}
}

if err := authz.AuthorizeAdminAction(ctx, &a.context); err != nil {
return trace.Wrap(err)
}

tst, err := newNetConfig.GetTunnelStrategyType()
if err != nil {
return trace.Wrap(err)
Expand Down Expand Up @@ -4433,6 +4445,10 @@ func (a *ServerWithRoles) ResetClusterNetworkingConfig(ctx context.Context) erro
}
}

if err := authz.AuthorizeAdminAction(ctx, &a.context); err != nil {
return trace.Wrap(err)
}

return a.authServer.SetClusterNetworkingConfig(ctx, types.DefaultClusterNetworkingConfig())
}

Expand All @@ -4459,6 +4475,10 @@ func (a *ServerWithRoles) SetSessionRecordingConfig(ctx context.Context, newRecC
}
}

if err := authz.AuthorizeAdminAction(ctx, &a.context); err != nil {
return trace.Wrap(err)
}

return a.authServer.SetSessionRecordingConfig(ctx, newRecConfig)
}

Expand All @@ -4478,6 +4498,10 @@ func (a *ServerWithRoles) ResetSessionRecordingConfig(ctx context.Context) error
}
}

if err := authz.AuthorizeAdminAction(ctx, &a.context); err != nil {
return trace.Wrap(err)
}

return a.authServer.SetSessionRecordingConfig(ctx, types.DefaultSessionRecordingConfig())
}

Expand Down Expand Up @@ -5370,6 +5394,11 @@ func (a *ServerWithRoles) SetNetworkRestrictions(ctx context.Context, nr types.N
if err := a.action(apidefaults.Namespace, types.KindNetworkRestrictions, types.VerbCreate, types.VerbUpdate); err != nil {
return trace.Wrap(err)
}

if err := authz.AuthorizeAdminAction(ctx, &a.context); err != nil {
return trace.Wrap(err)
}

return a.authServer.SetNetworkRestrictions(ctx, nr)
}

Expand All @@ -5378,6 +5407,11 @@ func (a *ServerWithRoles) DeleteNetworkRestrictions(ctx context.Context) error {
if err := a.action(apidefaults.Namespace, types.KindNetworkRestrictions, types.VerbDelete); err != nil {
return trace.Wrap(err)
}

if err := authz.AuthorizeAdminAction(ctx, &a.context); err != nil {
return trace.Wrap(err)
}

return a.authServer.DeleteNetworkRestrictions(ctx)
}

Expand Down
1 change: 1 addition & 0 deletions lib/auth/auth_with_roles_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1813,6 +1813,7 @@ func serverWithAllowRules(t *testing.T, srv *TestAuthServer, allowRules []types.
localUser := authz.LocalUser{Username: username, Identity: tlsca.Identity{Username: username}}
authContext, err := authz.ContextForLocalUser(ctx, localUser, srv.AuthServer, srv.ClusterName, true /* disableDeviceAuthz */)
require.NoError(t, err)
authContext.AdminActionAuthorized = true

return &ServerWithRoles{
authServer: srv.AuthServer,
Expand Down
Loading