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

When sorting SCCs by restrictions don't add a score if SCC allows volumes of projected type #14548

Merged
merged 1 commit into from
Jun 20, 2017
Merged

When sorting SCCs by restrictions don't add a score if SCC allows volumes of projected type #14548

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions pkg/security/scc/byrestrictions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ func pointValue(constraint *kapi.SecurityContextConstraints) int {
return points
}

// allowsHostPathVolume returns a score based on the volumes allowed by the SCC.
// Allowing a host volume wil return a score of 10. Allowance of anything other
// than kapi.FSTypeSecret, kapi.FSTypeConfigMap, kapi.FSTypeConfigMap, kapi.FSTypeDownwardAPI
// will result in a score of 5. If the SCC only allows kapi.FSTypeSecret, kapi.FSTypeConfigMap,
// kapi.FSTypeEmptyDir, kapi.FSTypeDownwardAPI it will have a score of 0.
// volumePointValue returns a score based on the volumes allowed by the SCC.
// Allowing a host volume will return a score of 10. Allowance of anything other
// than Secret, ConfigMap, EmptyDir, DownwardAPI, Projected, and None will result in
// a score of 5. If the SCC only allows these trivial types, it will have a
// score of 0.
func volumePointValue(scc *kapi.SecurityContextConstraints) int {
hasHostVolume := false
hasNonTrivialVolume := false
Expand All @@ -66,8 +66,8 @@ func volumePointValue(scc *kapi.SecurityContextConstraints) int {
// it is easier to specifically list the trivial volumes and allow the
// default case to be non-trivial so we don't have to worry about adding
// volumes in the future unless they're trivial.
case kapi.FSTypeSecret, kapi.FSTypeConfigMap,
kapi.FSTypeEmptyDir, kapi.FSTypeDownwardAPI, kapi.FSTypeNone:
case kapi.FSTypeSecret, kapi.FSTypeConfigMap, kapi.FSTypeEmptyDir,
kapi.FSTypeDownwardAPI, kapi.FSProjected, kapi.FSTypeNone:
// do nothing
default:
hasNonTrivialVolume = true
Expand Down
12 changes: 12 additions & 0 deletions pkg/security/scc/byrestrictions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,18 @@ func TestVolumePointValue(t *testing.T) {
},
expectedPoints: 0,
},
"trivial - projected": {
scc: &kapi.SecurityContextConstraints{
Volumes: []kapi.FSType{kapi.FSProjected},
},
expectedPoints: 0,
},
"trivial - none": {
scc: &kapi.SecurityContextConstraints{
Volumes: []kapi.FSType{kapi.FSTypeNone},
},
expectedPoints: 0,
},
"no volumes allowed": {
scc: newSCC(false, false, false),
expectedPoints: 0,
Expand Down