Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Automated cherry pick of #59398: fix invalid match rules for advanced audit policy #59399

Merged
merged 1 commit into from
Mar 14, 2018
Merged

Automated cherry pick of #59398: fix invalid match rules for advanced audit policy #59399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 8 additions & 4 deletions staging/src/k8s.io/apiserver/pkg/audit/policy/checker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,18 @@ func (p *policyChecker) LevelAndStages(attrs authorizer.Attributes) (audit.Level

// Check whether the rule matches the request attrs.
func ruleMatches(r *audit.PolicyRule, attrs authorizer.Attributes) bool {
if len(r.Users) > 0 && attrs.GetUser() != nil {
if !hasString(r.Users, attrs.GetUser().GetName()) {
user := attrs.GetUser()
if len(r.Users) > 0 {
if user == nil || !hasString(r.Users, user.GetName()) {
return false
}
}
if len(r.UserGroups) > 0 && attrs.GetUser() != nil {
if len(r.UserGroups) > 0 {
if user == nil {
return false
}
matched := false
for _, group := range attrs.GetUser().GetGroups() {
for _, group := range user.GetGroups() {
if hasString(r.UserGroups, group) {
matched = true
break
Expand Down
14 changes: 14 additions & 0 deletions staging/src/k8s.io/apiserver/pkg/audit/policy/checker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,16 @@ var (
ResourceRequest: true,
Path: "/api/v1/namespaces/default/pods/busybox",
},
"Unauthorized": &authorizer.AttributesRecord{
Verb: "get",
Namespace: "default",
APIGroup: "", // Core
APIVersion: "v1",
Resource: "pods",
Name: "busybox",
ResourceRequest: true,
Path: "/api/v1/namespaces/default/pods/busybox",
},
}

rules = map[string]audit.PolicyRule{
Expand Down Expand Up @@ -209,6 +219,10 @@ func testAuditLevel(t *testing.T, stages []audit.Stage) {

test(t, "subresource", audit.LevelRequest, stages, stages, "getPodLogs", "getPods")

test(t, "Unauthorized", audit.LevelNone, stages, stages, "tims")
test(t, "Unauthorized", audit.LevelMetadata, stages, stages, "tims", "default")
test(t, "Unauthorized", audit.LevelNone, stages, stages, "humans")
test(t, "Unauthorized", audit.LevelMetadata, stages, stages, "humans", "default")
}

func TestChecker(t *testing.T) {
Expand Down