Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
0ad4282f
Commit
0ad4282f
authored
Sep 08, 2017
by
Chao Wang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
A policy with 0 rules should return an error
parent
034c40be
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
46 additions
and
18 deletions
+46
-18
reader.go
staging/src/k8s.io/apiserver/pkg/audit/policy/reader.go
+5
-1
reader_test.go
staging/src/k8s.io/apiserver/pkg/audit/policy/reader_test.go
+41
-17
No files found.
staging/src/k8s.io/apiserver/pkg/audit/policy/reader.go
View file @
0ad4282f
...
...
@@ -49,6 +49,10 @@ func LoadPolicyFromFile(filePath string) (*auditinternal.Policy, error) {
return
nil
,
err
.
ToAggregate
()
}
glog
.
V
(
4
)
.
Infof
(
"Loaded %d audit policy rules from file %s
\n
"
,
len
(
policy
.
Rules
),
filePath
)
policyCnt
:=
len
(
policy
.
Rules
)
if
policyCnt
==
0
{
return
nil
,
fmt
.
Errorf
(
"loaded illegal policy with 0 rules from file %s"
,
filePath
)
}
glog
.
V
(
4
)
.
Infof
(
"Loaded %d audit policy rules from file %s"
,
policyCnt
,
filePath
)
return
policy
,
nil
}
staging/src/k8s.io/apiserver/pkg/audit/policy/reader_test.go
View file @
0ad4282f
...
...
@@ -32,7 +32,7 @@ import (
)
const
policyDefV1alpha1
=
`
apiVersion: audit.k8s.io/v1
bet
a1
apiVersion: audit.k8s.io/v1
alph
a1
kind: Policy
rules:
- level: None
...
...
@@ -91,16 +91,11 @@ var expectedPolicy = &audit.Policy{
}
func
TestParserV1alpha1
(
t
*
testing
.
T
)
{
// Create a policy file.
f
,
err
:=
ioutil
.
TempFile
(
""
,
"policy.yaml"
)
require
.
NoError
(
t
,
err
)
defer
os
.
Remove
(
f
.
Name
())
_
,
err
=
f
.
WriteString
(
policyDefV1alpha1
)
f
,
err
:=
writePolicy
(
policyDefV1alpha1
,
t
)
require
.
NoError
(
t
,
err
)
require
.
NoError
(
t
,
f
.
Close
()
)
defer
os
.
Remove
(
f
)
policy
,
err
:=
LoadPolicyFromFile
(
f
.
Name
()
)
policy
,
err
:=
LoadPolicyFromFile
(
f
)
require
.
NoError
(
t
,
err
)
assert
.
Len
(
t
,
policy
.
Rules
,
3
)
// Sanity check.
...
...
@@ -110,16 +105,11 @@ func TestParserV1alpha1(t *testing.T) {
}
func
TestParserV1beta1
(
t
*
testing
.
T
)
{
// Create a policy file.
f
,
err
:=
ioutil
.
TempFile
(
""
,
"policy.yaml"
)
f
,
err
:=
writePolicy
(
policyDefV1beta1
,
t
)
require
.
NoError
(
t
,
err
)
defer
os
.
Remove
(
f
.
Name
()
)
defer
os
.
Remove
(
f
)
_
,
err
=
f
.
WriteString
(
policyDefV1beta1
)
require
.
NoError
(
t
,
err
)
require
.
NoError
(
t
,
f
.
Close
())
policy
,
err
:=
LoadPolicyFromFile
(
f
.
Name
())
policy
,
err
:=
LoadPolicyFromFile
(
f
)
require
.
NoError
(
t
,
err
)
assert
.
Len
(
t
,
policy
.
Rules
,
3
)
// Sanity check.
...
...
@@ -127,3 +117,37 @@ func TestParserV1beta1(t *testing.T) {
t
.
Errorf
(
"Unexpected policy! Diff:
\n
%s"
,
diff
.
ObjectDiff
(
policy
,
expectedPolicy
))
}
}
func
TestPolicyCntCheck
(
t
*
testing
.
T
)
{
//a set of testCases
var
testCases
=
[]
struct
{
caseName
,
policy
string
}{
{
"policyWithNoRule"
,
`apiVersion: audit.k8s.io/v1beta1
kind: Policy`
,
},
{
"emptyPolicyFile"
,
""
},
}
for
_
,
tc
:=
range
testCases
{
f
,
err
:=
writePolicy
(
tc
.
policy
,
t
)
require
.
NoError
(
t
,
err
)
defer
os
.
Remove
(
f
)
_
,
err
=
LoadPolicyFromFile
(
f
)
assert
.
Errorf
(
t
,
err
,
"loaded illegal policy with 0 rules from testCase %s"
,
tc
.
caseName
)
}
}
func
writePolicy
(
policy
string
,
t
*
testing
.
T
)
(
string
,
error
)
{
f
,
err
:=
ioutil
.
TempFile
(
""
,
"policy.yaml"
)
require
.
NoError
(
t
,
err
)
_
,
err
=
f
.
WriteString
(
policy
)
require
.
NoError
(
t
,
err
)
require
.
NoError
(
t
,
f
.
Close
())
return
f
.
Name
(),
nil
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment