github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-02-22 07:03:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #133575 from aerosouund/fix-nil-selectors

Browse Source 
[BUG] [Selectors]: Return an error in case nil selectors are passed to the matcher functions
This commit is contained in:
Kubernetes Prow Robot
2025-09-04 19:21:16 -07:00
committed by GitHub
parent 8085d5c458 f1d0c5dbc3
commit ab220a42c8
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/generic/policy_matcher.go
View File

@@ -45,6 +45,8 @@ type PolicyMatcher interface {
GetNamespace(name string) (*corev1.Namespace, error)
}
var errNilSelector = "a nil %s selector was passed, please ensure selectors are initialized properly"
type matcher struct {
Matcher *matching.Matcher
}
@@ -66,6 +68,13 @@ func (c *matcher) DefinitionMatches(a admission.Attributes, o admission.ObjectIn
if constraints == nil {
return false, schema.GroupVersionResource{}, schema.GroupVersionKind{}, fmt.Errorf("policy contained no match constraints, a required field")
}
if constraints.NamespaceSelector == nil {
return false, schema.GroupVersionResource{}, schema.GroupVersionKind{}, fmt.Errorf(errNilSelector, "namespace")
}
if constraints.ObjectSelector == nil {
return false, schema.GroupVersionResource{}, schema.GroupVersionKind{}, fmt.Errorf(errNilSelector, "object")
}
criteria := matchCriteria{constraints: constraints}
return c.Matcher.Matches(a, o, &criteria)
}
@@ -76,6 +85,12 @@ func (c *matcher) BindingMatches(a admission.Attributes, o admission.ObjectInter
if matchResources == nil {
return true, nil
}
if matchResources.NamespaceSelector == nil {
return false, fmt.Errorf(errNilSelector, "namespace")
}
if matchResources.ObjectSelector == nil {
return false, fmt.Errorf(errNilSelector, "object")
}
criteria := matchCriteria{constraints: matchResources}
isMatch, _, _, err := c.Matcher.Matches(a, o, &criteria)