Skip to content

[v14] Fix panic on nil value in getPresetRoles() #35463

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
zmb3 merged 2 commits into from
Dec 7, 2023
Merged

[v14] Fix panic on nil value in getPresetRoles() #35463

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1b278c
Fix panic on nil value in `getPresetRoles()`
timothyb89 Dec 7, 2023
dae4bb8
Replace manual deletion with `slices.DeleteFunc`
timothyb89 Dec 7, 2023
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
7 changes: 6 additions & 1 deletion lib/auth/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,7 @@ type PresetRoleManager interface {
// GetPresetRoles returns a list of all preset roles expected to be available on
// this cluster.
func GetPresetRoles() []types.Role {
return []types.Role{
presets := []types.Role{
services.NewPresetGroupAccessRole(),
services.NewPresetEditorRole(),
services.NewPresetAccessRole(),
Expand All @@ -765,6 +765,11 @@ func GetPresetRoles() []types.Role {
services.NewPresetDeviceEnrollRole(),
services.NewPresetRequireTrustedDeviceRole(),
}

// Certain `New$FooRole()` functions will return a nil role if the
// corresponding feature is disabled. They should be filtered out as they
// are not actually made available on the cluster.
return slices.DeleteFunc(presets, func(r types.Role) bool { return r == nil })
}

// createPresetRoles creates preset role resources
Expand Down