felipe/apparmor.d
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build(directive): support both liust & map.

Browse source
This commit is contained in:
Alexandre Pujol 2024-03-23 17:41:10 +00:00
parent f81ceb9185
commit 88fcdd8c8e
No known key found for this signature in database
GPG key ID: C5469996F0DF68EC
10 changed files with 126 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

41
pkg/prebuild/directive/dbus.go
View file

@ -50,21 +50,13 @@ func setInterfaces(rules map[string]string) []string {
func (d Dbus) Apply(opt *Option, profile string) string {
var p *aa.AppArmorProfile
var action string
if _, ok := opt.Args["own"]; ok {
action = "own"
} else if _, ok := opt.Args["talk"]; ok {
action = "talk"
} else {
panic(fmt.Sprintf("Unknown dbus action: %s in %s", opt.Name, opt.File))
}
d.sanityCheck(action, opt)
action := d.sanityCheck(opt)
switch action {
case "own":
p = d.own(opt.Args)
p = d.own(opt.ArgMap)
case "talk":
p = d.talk(opt.Args)
p = d.talk(opt.ArgMap)
}
generatedDbus := p.String()
@ -74,22 +66,31 @@ func (d Dbus) Apply(opt *Option, profile string) string {
return profile
}
func (d Dbus) sanityCheck(action string, opt *Option) {
if _, present := opt.Args["name"]; !present {
func (d Dbus) sanityCheck(opt *Option) string {
if len(opt.ArgList) < 1 {
panic(fmt.Sprintf("Unknown dbus action: %s in %s", opt.Name, opt.File))
}
action := opt.ArgList[0]
if action != "own" && action != "talk" {
panic(fmt.Sprintf("Unknown dbus action: %s in %s", opt.Name, opt.File))
}
if _, present := opt.ArgMap["name"]; !present {
panic(fmt.Sprintf("Missing name for 'dbus: %s' in %s", action, opt.File))
}
if _, present := opt.Args["bus"]; !present {
panic(fmt.Sprintf("Missing bus for '%s' in %s", opt.Args["name"], opt.File))
if _, present := opt.ArgMap["bus"]; !present {
panic(fmt.Sprintf("Missing bus for '%s' in %s", opt.ArgMap["name"], opt.File))
}
if _, present := opt.Args["label"]; !present && action == "talk" {
panic(fmt.Sprintf("Missing label for '%s' in %s", opt.Args["name"], opt.File))
if _, present := opt.ArgMap["label"]; !present && action == "talk" {
panic(fmt.Sprintf("Missing label for '%s' in %s", opt.ArgMap["name"], opt.File))
}
// Set default values
if _, present := opt.Args["path"]; !present {
opt.Args["path"] = "/" + strings.Replace(opt.Args["name"], ".", "/", -1) + "{,/**}"
if _, present := opt.ArgMap["path"]; !present {
opt.ArgMap["path"] = "/" + strings.Replace(opt.ArgMap["name"], ".", "/", -1) + "{,/**}"
}
opt.Args["name"] += "{,.*}"
opt.ArgMap["name"] += "{,.*}"
return action
}
func (d Dbus) own(rules map[string]string) *aa.AppArmorProfile {