forked from kubernetes/kubernetes
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add validation to rbac group and apply small cleanups
- Loading branch information
Eric Chiang
committed
May 25, 2016
1 parent
a3467a0
commit e3604e2
Showing
14 changed files
with
1,219 additions
and
42 deletions.
There are no files selected for viewing
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,18 @@ | ||
| /* | ||
| Copyright 2016 The Kubernetes Authors All rights reserved. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| // +groupName=rbac.authorization.k8s.io | ||
| package rbac |
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,114 @@ | ||
| /* | ||
| Copyright 2016 The Kubernetes Authors All rights reserved. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package install | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "testing" | ||
|
|
||
| "k8s.io/kubernetes/pkg/api" | ||
| "k8s.io/kubernetes/pkg/api/unversioned" | ||
| "k8s.io/kubernetes/pkg/apimachinery/registered" | ||
| "k8s.io/kubernetes/pkg/apis/rbac" | ||
| "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" | ||
| "k8s.io/kubernetes/pkg/runtime" | ||
| ) | ||
|
|
||
| func TestResourceVersioner(t *testing.T) { | ||
| roleBinding := rbac.RoleBinding{ObjectMeta: api.ObjectMeta{ResourceVersion: "10"}} | ||
| version, err := accessor.ResourceVersion(&roleBinding) | ||
| if err != nil { | ||
| t.Fatalf("unexpected error: %v", err) | ||
| } | ||
| if version != "10" { | ||
| t.Errorf("unexpected version %v", version) | ||
| } | ||
|
|
||
| roleBindingList := rbac.RoleBindingList{ListMeta: unversioned.ListMeta{ResourceVersion: "10"}} | ||
| version, err = accessor.ResourceVersion(&roleBindingList) | ||
| if err != nil { | ||
| t.Fatalf("unexpected error: %v", err) | ||
| } | ||
| if version != "10" { | ||
| t.Errorf("unexpected version %v", version) | ||
| } | ||
| } | ||
|
|
||
| func TestCodec(t *testing.T) { | ||
| roleBinding := rbac.RoleBinding{} | ||
| // We do want to use package registered rather than testapi here, because we | ||
| // want to test if the package install and package registered work as expected. | ||
| data, err := runtime.Encode(api.Codecs.LegacyCodec(registered.GroupOrDie(rbac.GroupName).GroupVersion), &roleBinding) | ||
| if err != nil { | ||
| t.Fatalf("unexpected error: %v", err) | ||
| } | ||
| other := rbac.RoleBinding{} | ||
| if err := json.Unmarshal(data, &other); err != nil { | ||
| t.Fatalf("unexpected error: %v", err) | ||
| } | ||
| if other.APIVersion != registered.GroupOrDie(rbac.GroupName).GroupVersion.String() || other.Kind != "RoleBinding" { | ||
| t.Errorf("unexpected unmarshalled object %#v", other) | ||
| } | ||
| } | ||
|
|
||
| func TestInterfacesFor(t *testing.T) { | ||
| if _, err := registered.GroupOrDie(rbac.GroupName).InterfacesFor(rbac.SchemeGroupVersion); err == nil { | ||
| t.Fatalf("unexpected non-error: %v", err) | ||
| } | ||
| for i, version := range registered.GroupOrDie(rbac.GroupName).GroupVersions { | ||
| if vi, err := registered.GroupOrDie(rbac.GroupName).InterfacesFor(version); err != nil || vi == nil { | ||
| t.Fatalf("%d: unexpected result: %v", i, err) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func TestRESTMapper(t *testing.T) { | ||
| gv := v1alpha1.SchemeGroupVersion | ||
| roleBindingGVK := gv.WithKind("RoleBinding") | ||
|
|
||
| if gvk, err := registered.GroupOrDie(rbac.GroupName).RESTMapper.KindFor(gv.WithResource("rolebindings")); err != nil || gvk != roleBindingGVK { | ||
| t.Errorf("unexpected version mapping: %v %v", gvk, err) | ||
| } | ||
|
|
||
| for _, version := range registered.GroupOrDie(rbac.GroupName).GroupVersions { | ||
| mapping, err := registered.GroupOrDie(rbac.GroupName).RESTMapper.RESTMapping(roleBindingGVK.GroupKind(), version.Version) | ||
| if err != nil { | ||
| t.Errorf("unexpected error: %v", err) | ||
| } | ||
|
|
||
| if mapping.Resource != "rolebindings" { | ||
| t.Errorf("incorrect resource name: %#v", mapping) | ||
| } | ||
| if mapping.GroupVersionKind.GroupVersion() != version { | ||
| t.Errorf("incorrect groupVersion: %v", mapping) | ||
| } | ||
|
|
||
| interfaces, _ := registered.GroupOrDie(rbac.GroupName).InterfacesFor(version) | ||
| if mapping.ObjectConvertor != interfaces.ObjectConvertor { | ||
| t.Errorf("unexpected: %#v, expected: %#v", mapping, interfaces) | ||
| } | ||
|
|
||
| roleBinding := &rbac.RoleBinding{ObjectMeta: api.ObjectMeta{Name: "foo"}} | ||
| name, err := mapping.MetadataAccessor.Name(roleBinding) | ||
| if err != nil { | ||
| t.Errorf("unexpected error: %v", err) | ||
| } | ||
| if name != "foo" { | ||
| t.Errorf("unable to retrieve object meta with: %v", mapping.MetadataAccessor) | ||
| } | ||
| } | ||
| } |
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| /* | ||
| Copyright 2016 The Kubernetes Authors All rights reserved. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package validation | ||
|
|
||
| import "k8s.io/kubernetes/pkg/apis/rbac" | ||
|
|
||
| // Covers determines whether or not the ownerRules cover the servantRules in terms of allowed actions. | ||
| // It returns whether or not the ownerRules cover and a list of the rules that the ownerRules do not cover. | ||
| func Covers(ownerRules, servantRules []rbac.PolicyRule) (bool, []rbac.PolicyRule) { | ||
| // 1. Break every servantRule into individual rule tuples: group, verb, resource, resourceName | ||
| // 2. Compare the mini-rules against each owner rule. Because the breakdown is down to the most atomic level, we're guaranteed that each mini-servant rule will be either fully covered or not covered by a single owner rule | ||
| // 3. Any left over mini-rules means that we are not covered and we have a nice list of them. | ||
| // TODO: it might be nice to collapse the list down into something more human readable | ||
|
|
||
| subrules := []rbac.PolicyRule{} | ||
| for _, servantRule := range servantRules { | ||
| subrules = append(subrules, breakdownRule(servantRule)...) | ||
| } | ||
|
|
||
| uncoveredRules := []rbac.PolicyRule{} | ||
| for _, subrule := range subrules { | ||
| covered := false | ||
| for _, ownerRule := range ownerRules { | ||
| if ruleCovers(ownerRule, subrule) { | ||
| covered = true | ||
| break | ||
| } | ||
| } | ||
|
|
||
| if !covered { | ||
| uncoveredRules = append(uncoveredRules, subrule) | ||
| } | ||
| } | ||
|
|
||
| return (len(uncoveredRules) == 0), uncoveredRules | ||
| } | ||
|
|
||
| // breadownRule takes a rule and builds an equivalent list of rules that each have at most one verb, one | ||
| // resource, and one resource name | ||
| func breakdownRule(rule rbac.PolicyRule) []rbac.PolicyRule { | ||
| subrules := []rbac.PolicyRule{} | ||
| for _, group := range rule.APIGroups { | ||
| for _, resource := range rule.Resources { | ||
| for _, verb := range rule.Verbs { | ||
| if len(rule.ResourceNames) > 0 { | ||
| for _, resourceName := range rule.ResourceNames { | ||
| subrules = append(subrules, rbac.PolicyRule{APIGroups: []string{group}, Resources: []string{resource}, Verbs: []string{verb}, ResourceNames: []string{resourceName}}) | ||
| } | ||
|
|
||
| } else { | ||
| subrules = append(subrules, rbac.PolicyRule{APIGroups: []string{group}, Resources: []string{resource}, Verbs: []string{verb}}) | ||
| } | ||
|
|
||
| } | ||
| } | ||
| } | ||
|
|
||
| // Non-resource URLs are unique because they don't combine with other policy rule fields. | ||
| for _, nonResourceURL := range rule.NonResourceURLs { | ||
| subrules = append(subrules, rbac.PolicyRule{NonResourceURLs: []string{nonResourceURL}}) | ||
| } | ||
|
|
||
| return subrules | ||
| } | ||
|
|
||
| func has(set []string, ele string) bool { | ||
| for _, s := range set { | ||
| if s == ele { | ||
| return true | ||
| } | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| func hasAll(set, contains []string) bool { | ||
| owning := make(map[string]struct{}, len(set)) | ||
| for _, ele := range set { | ||
| owning[ele] = struct{}{} | ||
| } | ||
| for _, ele := range contains { | ||
| if _, ok := owning[ele]; !ok { | ||
| return false | ||
| } | ||
| } | ||
| return true | ||
| } | ||
|
|
||
| // ruleCovers determines whether the ownerRule (which may have multiple verbs, resources, and resourceNames) covers | ||
| // the subrule (which may only contain at most one verb, resource, and resourceName) | ||
| func ruleCovers(ownerRule, subRule rbac.PolicyRule) bool { | ||
|
|
||
| verbMatches := has(ownerRule.Verbs, rbac.VerbAll) || hasAll(ownerRule.Verbs, subRule.Verbs) | ||
| groupMatches := has(ownerRule.APIGroups, rbac.APIGroupAll) || hasAll(ownerRule.APIGroups, subRule.APIGroups) | ||
| resourceMatches := has(ownerRule.Resources, rbac.ResourceAll) || hasAll(ownerRule.Resources, subRule.Resources) | ||
| nonResourceURLMatches := has(ownerRule.NonResourceURLs, rbac.NonResourceAll) || hasAll(ownerRule.NonResourceURLs, subRule.NonResourceURLs) | ||
|
|
||
| resourceNameMatches := false | ||
|
|
||
| if len(subRule.ResourceNames) == 0 { | ||
| resourceNameMatches = (len(ownerRule.ResourceNames) == 0) | ||
| } else { | ||
| resourceNameMatches = (len(ownerRule.ResourceNames) == 0) || hasAll(ownerRule.ResourceNames, subRule.ResourceNames) | ||
| } | ||
|
|
||
| return verbMatches && groupMatches && resourceMatches && resourceNameMatches && nonResourceURLMatches | ||
| } |
Oops, something went wrong.