github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Fix RBAC authorizer of ServiceAccount

Browse Source 
RBAC authorizer assigns a role to a wrong service account.
This commit is contained in:
albatross0 2016-07-17 22:35:31 +09:00
parent 86b47f26d9
commit d1b14e2fae
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/apis/rbac/validation/rulevalidation.go
View File

@ -25,6 +25,7 @@ import (
apierrors "k8s.io/kubernetes/pkg/api/errors" apierrors "k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/apis/rbac"
"k8s.io/kubernetes/pkg/auth/user" "k8s.io/kubernetes/pkg/auth/user"
"k8s.io/kubernetes/pkg/serviceaccount"
utilerrors "k8s.io/kubernetes/pkg/util/errors" utilerrors "k8s.io/kubernetes/pkg/util/errors"
) )
@ -201,8 +202,7 @@ func appliesToUser(user user.Info, subject rbac.Subject) (bool, error) {
if subject.Namespace == "" { if subject.Namespace == "" {
return false, fmt.Errorf("subject of kind service account without specified namespace") return false, fmt.Errorf("subject of kind service account without specified namespace")
} }
// TODO(ericchiang): Is there a better way of matching a service account name? return serviceaccount.MakeUsername(subject.Namespace, subject.Name) == user.GetName(), nil
return "system:serviceaccount:"+subject.Name+":"+subject.Namespace == user.GetName(), nil
default: default:
return false, fmt.Errorf("unknown subject kind: %s", subject.Kind) return false, fmt.Errorf("unknown subject kind: %s", subject.Kind)
} }

2
pkg/apis/rbac/validation/rulevalidation_test.go
View File

@ -234,7 +234,7 @@ func TestAppliesTo(t *testing.T) {
subjects: []rbac.Subject{ subjects: []rbac.Subject{
{Kind: rbac.UserKind, Name: "barfoo"}, {Kind: rbac.UserKind, Name: "barfoo"},
{Kind: rbac.GroupKind, Name: "foobar"}, {Kind: rbac.GroupKind, Name: "foobar"},
{Kind: rbac.ServiceAccountKind, Name: "kube-system", Namespace: "default"}, {Kind: rbac.ServiceAccountKind, Namespace: "kube-system", Name: "default"},
}, },
ctx: api.WithNamespace( ctx: api.WithNamespace(
api.WithUser(api.NewContext(), &user.DefaultInfo{Name: "system:serviceaccount:kube-system:default"}), api.WithUser(api.NewContext(), &user.DefaultInfo{Name: "system:serviceaccount:kube-system:default"}),