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

feat(dbus): simplify the way to provide unix address for dbus.

Browse source
This commit is contained in:
Alexandre Pujol 2025-03-06 23:46:49 +01:00
parent f360d12ec1
commit 03406096ce
No known key found for this signature in database
GPG key ID: C5469996F0DF68EC
4 changed files with 11 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -45,15 +45,11 @@ func (d Dbus) Apply(opt *Option, profile string) (string, error) {
if err != nil {
return "", err
}
name := opt.File.Base()
if len(name) > 15 {
name = name[:15]
}
switch action {
case "own":
r = d.own(opt.ArgMap, name)
r = d.own(opt.ArgMap)
case "talk":
r = d.talk(opt.ArgMap, name)
r = d.talk(opt.ArgMap)
}
aa.IndentationLevel = strings.Count(
@ -107,14 +103,10 @@ func getInterfaces(rules map[string]string) []string {
return interfaces
}
func (d Dbus) own(rules map[string]string, name string) aa.Rules {
func (d Dbus) own(rules map[string]string) aa.Rules {
interfaces := getInterfaces(rules)
res := aa.Rules{
&aa.Unix{
Access: []string{"bind"}, Type: "stream",
Address: `@@{udbus}/bus/` + name + `/` + rules["bus"],
},
&aa.Dbus{
Access: []string{"bind"}, Bus: rules["bus"], Name: rules["name"],
},
@ -170,15 +162,9 @@ func (d Dbus) own(rules map[string]string, name string) aa.Rules {
return res
}
func (d Dbus) talk(rules map[string]string, name string) aa.Rules {
func (d Dbus) talk(rules map[string]string) aa.Rules {
interfaces := getInterfaces(rules)
res := aa.Rules{
&aa.Unix{
Access: []string{"bind"}, Type: "stream",
Address: `@@{udbus}/bus/` + name + `/` + rules["bus"],
},
}
res := aa.Rules{}
// Interfaces
for _, iface := range interfaces {