github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-17 15:13:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #46764 from CaoShuFeng/audit-empty-policy-file

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 46112, 46764, 46727, 46974, 46968)

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.

**Release note**:

```
NONE
```

Part of https://github.com/kubernetes/features/issues/22
This commit is contained in:
Kubernetes Submit Queue
2017-06-06 03:17:41 -07:00
committed by GitHub
parent 8da89aeb00 b6b2a30e83
commit b238d3e6c5
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
staging/src/k8s.io/apiserver/pkg/audit/policy/BUILD
View File

@@ -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",

8
staging/src/k8s.io/apiserver/pkg/audit/policy/reader.go
View File

@@ -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
}