Skip to content

generate: fix DropProcessCapability* #519

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

Merged
liangchenye merged 2 commits into from
Nov 28, 2017
Merged

generate: fix DropProcessCapability* #519

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5c45de
generate: remove redundant code
Nov 16, 2017
d327e0b
generate: fix DropProcessCapability*
Nov 16, 2017
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
36 changes: 19 additions & 17 deletions generate/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1093,10 +1093,11 @@ func (g *Generator) AddProcessCapabilityPermitted(c string) error {

// DropProcessCapabilityAmbient drops a process capability from g.spec.Process.Capabilities.Ambient.
func (g *Generator) DropProcessCapabilityAmbient(c string) error {
cp := strings.ToUpper(c)

g.initSpecProcessCapabilities()
if g.spec == nil || g.spec.Process == nil || g.spec.Process.Capabilities == nil {
return nil
}

cp := strings.ToUpper(c)
for i, cap := range g.spec.Process.Capabilities.Ambient {
if strings.ToUpper(cap) == cp {
g.spec.Process.Capabilities.Ambient = removeFunc(g.spec.Process.Capabilities.Ambient, i)
Expand All @@ -1108,10 +1109,11 @@ func (g *Generator) DropProcessCapabilityAmbient(c string) error {

// DropProcessCapabilityBounding drops a process capability from g.spec.Process.Capabilities.Bounding.
func (g *Generator) DropProcessCapabilityBounding(c string) error {
cp := strings.ToUpper(c)

g.initSpecProcessCapabilities()
if g.spec == nil || g.spec.Process == nil || g.spec.Process.Capabilities == nil {
return nil
}

cp := strings.ToUpper(c)
for i, cap := range g.spec.Process.Capabilities.Bounding {
if strings.ToUpper(cap) == cp {
g.spec.Process.Capabilities.Bounding = removeFunc(g.spec.Process.Capabilities.Bounding, i)
Expand All @@ -1123,10 +1125,11 @@ func (g *Generator) DropProcessCapabilityBounding(c string) error {

// DropProcessCapabilityEffective drops a process capability from g.spec.Process.Capabilities.Effective.
func (g *Generator) DropProcessCapabilityEffective(c string) error {
cp := strings.ToUpper(c)

g.initSpecProcessCapabilities()
if g.spec == nil || g.spec.Process == nil || g.spec.Process.Capabilities == nil {
return nil
}

cp := strings.ToUpper(c)
for i, cap := range g.spec.Process.Capabilities.Effective {
if strings.ToUpper(cap) == cp {
g.spec.Process.Capabilities.Effective = removeFunc(g.spec.Process.Capabilities.Effective, i)
Expand All @@ -1138,13 +1141,11 @@ func (g *Generator) DropProcessCapabilityEffective(c string) error {

// DropProcessCapabilityInheritable drops a process capability from g.spec.Process.Capabilities.Inheritable.
func (g *Generator) DropProcessCapabilityInheritable(c string) error {
cp := strings.ToUpper(c)
if err := validate.CapValid(cp, g.HostSpecific); err != nil {
return err
if g.spec == nil || g.spec.Process == nil || g.spec.Process.Capabilities == nil {
return nil
}

g.initSpecProcessCapabilities()

cp := strings.ToUpper(c)
for i, cap := range g.spec.Process.Capabilities.Inheritable {
if strings.ToUpper(cap) == cp {
g.spec.Process.Capabilities.Inheritable = removeFunc(g.spec.Process.Capabilities.Inheritable, i)
Expand All @@ -1156,10 +1157,11 @@ func (g *Generator) DropProcessCapabilityInheritable(c string) error {

// DropProcessCapabilityPermitted drops a process capability from g.spec.Process.Capabilities.Permitted.
func (g *Generator) DropProcessCapabilityPermitted(c string) error {
cp := strings.ToUpper(c)

g.initSpecProcessCapabilities()
if g.spec == nil || g.spec.Process == nil || g.spec.Process.Capabilities == nil {
return nil
}

cp := strings.ToUpper(c)
for i, cap := range g.spec.Process.Capabilities.Permitted {
if strings.ToUpper(cap) == cp {
g.spec.Process.Capabilities.Ambient = removeFunc(g.spec.Process.Capabilities.Ambient, i)
Expand Down