Commit b6b2a30e authored by Cao Shufeng's avatar Cao Shufeng

empty audit policy file is legal configuration

Empty audit policy file or policy file contains only comments means using default audit level for all requests.
parent c13d8917
......@@ -34,6 +34,7 @@ go_library(
],
tags = ["automanaged"],
deps = [
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/apiserver/pkg/apis/audit:go_default_library",
"//vendor/k8s.io/apiserver/pkg/apis/audit/v1alpha1:go_default_library",
......
......@@ -25,6 +25,8 @@ import (
auditv1alpha1 "k8s.io/apiserver/pkg/apis/audit/v1alpha1"
"k8s.io/apiserver/pkg/apis/audit/validation"
"k8s.io/apiserver/pkg/audit"
"github.com/golang/glog"
)
func LoadPolicyFromFile(filePath string) (*auditinternal.Policy, error) {
......@@ -35,9 +37,7 @@ func LoadPolicyFromFile(filePath string) (*auditinternal.Policy, error) {
if err != nil {
return nil, fmt.Errorf("failed to read file path %q: %+v", filePath, err)
}
if len(policyDef) == 0 {
return nil, fmt.Errorf("file %q was empty", filePath)
}
policyVersioned := &auditv1alpha1.Policy{}
decoder := audit.Codecs.UniversalDecoder(auditv1alpha1.SchemeGroupVersion)
......@@ -53,5 +53,7 @@ func LoadPolicyFromFile(filePath string) (*auditinternal.Policy, error) {
if err := validation.ValidatePolicy(policy); err != nil {
return nil, err.ToAggregate()
}
glog.V(4).Infof("Loaded %d audit policy rules from file %s\n", len(policy.Rules), filePath)
return policy, nil
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment