mirrors/apparmor.d
1
0
Fork 0
mirror of https://github.com/roddhjav/apparmor.d.git synced 2024-11-14 23:43:56 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: improve attachments resolution.

Browse Source
This commit is contained in:
Alexandre Pujol 2023-04-24 12:51:16 +01:00
parent 38d310c62a
commit 7a70252e26
No known key found for this signature in database
GPG Key ID: C5469996F0DF68EC
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/aa/profile.go
View File

@ -67,13 +67,8 @@ func (p *AppArmorProfile) resolve(str string) []string {
if len(match) > 1 {
variable := match[0]
varname := match[1]
if len(p.Variables[varname]) > 1 {
for _, value := range p.Variables[varname] {
newVar := strings.ReplaceAll(str, variable, value)
vars = append(vars, p.resolve(newVar)...)
}
} else {
newVar := strings.ReplaceAll(str, variable, p.Variables[varname][0])
for _, value := range p.Variables[varname] {
newVar := strings.ReplaceAll(str, variable, value)
vars = append(vars, p.resolve(newVar)...)
}
} else {

28
pkg/aa/profile_test.go
View File

@ -93,6 +93,34 @@ func TestAppArmorProfile_ParseVariables(t *testing.T) {
}
}
func TestAppArmorProfile_resolve(t *testing.T) {
tests := []struct {
name string
variables map[string][]string
input string
want []string
}{
{
name: "empty",
variables: Tunables,
input: "@{}",
want: []string{"@{}"},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
p := &AppArmorProfile{
Content: "",
Variables: tt.variables,
Attachments: []string{},
}
if got := p.resolve(tt.input); !reflect.DeepEqual(got, tt.want) {
t.Errorf("AppArmorProfile.resolve() = %v, want %v", got, tt.want)
}
})
}
}
func TestAppArmorProfile_ResolveAttachments(t *testing.T) {
tests := []struct {
name string