forked from kubernetes/kubernetes
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1172 from sanchezl/apirequestcounts-panic
Bug 2051985: UPSTREAM: <carry>: An APIRequestCount without dots in the name can cause a panic
- Loading branch information
Showing
7 changed files
with
179 additions
and
18 deletions.
There are no files selected for viewing
108 changes: 108 additions & 0 deletions
108
...-apiserver/admission/customresourcevalidation/apirequestcount/validate_apirequestcount.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| package apirequestcount | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "io" | ||
| "strings" | ||
|
|
||
| apiv1 "github.com/openshift/api/apiserver/v1" | ||
| "k8s.io/apimachinery/pkg/api/validation" | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
| "k8s.io/apimachinery/pkg/runtime/schema" | ||
| "k8s.io/apimachinery/pkg/util/validation/field" | ||
| "k8s.io/apiserver/pkg/admission" | ||
| "k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation" | ||
| ) | ||
|
|
||
| const PluginName = "config.openshift.io/ValidateAPIRequestCount" | ||
|
|
||
| // Register registers a plugin | ||
| func Register(plugins *admission.Plugins) { | ||
| plugins.Register(PluginName, func(config io.Reader) (admission.Interface, error) { | ||
| return newValidateAPIRequestCount() | ||
| }) | ||
| } | ||
|
|
||
| func newValidateAPIRequestCount() (admission.Interface, error) { | ||
| return customresourcevalidation.NewValidator( | ||
| map[schema.GroupResource]bool{ | ||
| apiv1.GroupVersion.WithResource("apirequestcounts").GroupResource(): true, | ||
| }, | ||
| map[schema.GroupVersionKind]customresourcevalidation.ObjectValidator{ | ||
| apiv1.GroupVersion.WithKind("APIRequestCount"): apiRequestCountV1{}, | ||
| }) | ||
| } | ||
|
|
||
| type apiRequestCountV1 struct { | ||
| } | ||
|
|
||
| func toAPIRequestCountV1(uncastObj runtime.Object) (*apiv1.APIRequestCount, field.ErrorList) { | ||
| obj, ok := uncastObj.(*apiv1.APIRequestCount) | ||
| if !ok { | ||
| return nil, field.ErrorList{ | ||
| field.NotSupported(field.NewPath("kind"), fmt.Sprintf("%T", uncastObj), []string{"APIRequestCount"}), | ||
| field.NotSupported(field.NewPath("apiVersion"), fmt.Sprintf("%T", uncastObj), []string{"apiserver.openshift.io/v1"}), | ||
| } | ||
| } | ||
|
|
||
| return obj, nil | ||
| } | ||
|
|
||
| func (a apiRequestCountV1) ValidateCreate(uncastObj runtime.Object) field.ErrorList { | ||
| obj, errs := toAPIRequestCountV1(uncastObj) | ||
| if len(errs) > 0 { | ||
| return errs | ||
| } | ||
| errs = append(errs, validation.ValidateObjectMeta(&obj.ObjectMeta, false, requireNameGVR, field.NewPath("metadata"))...) | ||
| return errs | ||
| } | ||
|
|
||
| // requireNameGVR is a name validation function that requires the name to be of the form 'resource.version.group'. | ||
| func requireNameGVR(name string, _ bool) []string { | ||
| if _, err := NameToResource(name); err != nil { | ||
| return []string{err.Error()} | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| // NameToResource parses a name of the form 'resource.version.group'. | ||
| func NameToResource(name string) (schema.GroupVersionResource, error) { | ||
| segments := strings.SplitN(name, ".", 3) | ||
| result := schema.GroupVersionResource{Resource: segments[0]} | ||
| switch len(segments) { | ||
| case 3: | ||
| result.Group = segments[2] | ||
| fallthrough | ||
| case 2: | ||
| result.Version = segments[1] | ||
| default: | ||
| return schema.GroupVersionResource{}, fmt.Errorf("apirequestcount %s: name must be of the form 'resource.version.group'", name) | ||
| } | ||
| return result, nil | ||
| } | ||
|
|
||
| func (a apiRequestCountV1) ValidateUpdate(uncastObj runtime.Object, uncastOldObj runtime.Object) field.ErrorList { | ||
| obj, errs := toAPIRequestCountV1(uncastObj) | ||
| if len(errs) > 0 { | ||
| return errs | ||
| } | ||
| oldObj, errs := toAPIRequestCountV1(uncastOldObj) | ||
| if len(errs) > 0 { | ||
| return errs | ||
| } | ||
| errs = append(errs, validation.ValidateObjectMetaUpdate(&obj.ObjectMeta, &oldObj.ObjectMeta, field.NewPath("metadata"))...) | ||
| return errs | ||
| } | ||
|
|
||
| func (a apiRequestCountV1) ValidateStatusUpdate(uncastObj runtime.Object, uncastOldObj runtime.Object) field.ErrorList { | ||
| obj, errs := toAPIRequestCountV1(uncastObj) | ||
| if len(errs) > 0 { | ||
| return errs | ||
| } | ||
| oldObj, errs := toAPIRequestCountV1(uncastOldObj) | ||
| if len(errs) > 0 { | ||
| return errs | ||
| } | ||
| errs = append(errs, validation.ValidateObjectMetaUpdate(&obj.ObjectMeta, &oldObj.ObjectMeta, field.NewPath("metadata"))...) | ||
| return errs | ||
| } |
34 changes: 34 additions & 0 deletions
34
...erver/admission/customresourcevalidation/apirequestcount/validate_apirequestcount_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| package apirequestcount | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| apiv1 "github.com/openshift/api/apiserver/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| ) | ||
|
|
||
| func TestApiRequestCountV1_ValidateCreate(t *testing.T) { | ||
| testCases := []struct { | ||
| name string | ||
| errExpected bool | ||
| }{ | ||
| {"nogood", true}, | ||
| {"resource.version", false}, | ||
| {"resource.groupnonsense", false}, | ||
| {"resource.version.group", false}, | ||
| {"resource.version.group.with.dots", false}, | ||
| } | ||
| for _, tc := range testCases { | ||
| t.Run(tc.name, func(t *testing.T) { | ||
| errs := apiRequestCountV1{}.ValidateCreate(&apiv1.APIRequestCount{ObjectMeta: metav1.ObjectMeta{Name: tc.name}}) | ||
| if tc.errExpected != (len(errs) != 0) { | ||
| s := "did not expect " | ||
| if tc.errExpected { | ||
| s = "expected " | ||
| } | ||
| t.Errorf("%serrors, but got %d errors: %v", s, len(errs), errs) | ||
| } | ||
| }) | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters