mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-29 06:27:05 +00:00
Authorize PSP usage for pods without service accounts
This commit is contained in:
parent
2b6e318ea0
commit
dd7561801a
@ -288,7 +288,8 @@ func getMatchingPolicies(lister extensionslisters.PodSecurityPolicyLister, user
|
||||
}
|
||||
|
||||
for _, constraint := range list {
|
||||
if authorizedForPolicy(user, constraint, authz) || authorizedForPolicy(sa, constraint, authz) {
|
||||
// if no user info exists then the API is being hit via the unsecured port. In this case authorize the request.
|
||||
if user == nil || authorizedForPolicy(user, constraint, authz) || authorizedForPolicy(sa, constraint, authz) {
|
||||
matchedPolicies = append(matchedPolicies, constraint)
|
||||
}
|
||||
}
|
||||
@ -298,10 +299,8 @@ func getMatchingPolicies(lister extensionslisters.PodSecurityPolicyLister, user
|
||||
|
||||
// authorizedForPolicy returns true if info is authorized to perform a "get" on policy.
|
||||
func authorizedForPolicy(info user.Info, policy *extensions.PodSecurityPolicy, authz authorizer.Authorizer) bool {
|
||||
// if no info exists then the API is being hit via the unsecured port. In this case
|
||||
// authorize the request.
|
||||
if info == nil {
|
||||
return true
|
||||
return false
|
||||
}
|
||||
attr := buildAttributes(info, policy)
|
||||
allowed, reason, err := authz.Authorize(attr)
|
||||
|
@ -1610,7 +1610,7 @@ func TestGetMatchingPolicies(t *testing.T) {
|
||||
// (ie. a request hitting the unsecure port)
|
||||
expectedPolicies: sets.NewString("policy1", "policy2", "policy3"),
|
||||
},
|
||||
"policies are allowed for nil sa info": {
|
||||
"policies are not allowed for nil sa info": {
|
||||
user: &user.DefaultInfo{Name: "user"},
|
||||
sa: nil,
|
||||
disallowedPolicies: map[string][]string{
|
||||
@ -1622,9 +1622,8 @@ func TestGetMatchingPolicies(t *testing.T) {
|
||||
policyWithName("policy2"),
|
||||
policyWithName("policy3"),
|
||||
},
|
||||
// all policies are allowed regardless of the permissions when sa info is nil
|
||||
// (ie. a request hitting the unsecure port)
|
||||
expectedPolicies: sets.NewString("policy1", "policy2", "policy3"),
|
||||
// only the policies for the user are allowed when sa info is nil
|
||||
expectedPolicies: sets.NewString("policy2"),
|
||||
},
|
||||
}
|
||||
for k, v := range tests {
|
||||
|
Loading…
Reference in New Issue
Block a user