mirror of
https://github.com/roddhjav/apparmor.d.git
synced 2024-11-14 23:43:56 +01:00
feat(build): rewrite the stack directive witht the new structure.
This commit is contained in:
parent
83691bbb1f
commit
8e5f83df34
68
pkg/prebuild/directive/stack.go
Normal file
68
pkg/prebuild/directive/stack.go
Normal file
@ -0,0 +1,68 @@
|
||||
// apparmor.d - Full set of apparmor profiles
|
||||
// Copyright (C) 2021-2024 Alexandre Pujol <alexandre@pujol.io>
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
|
||||
package directive
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"regexp"
|
||||
"strings"
|
||||
|
||||
"github.com/arduino/go-paths-helper"
|
||||
"github.com/roddhjav/apparmor.d/pkg/util"
|
||||
)
|
||||
|
||||
var rootApparmord = paths.New(".build/apparmor.d")
|
||||
|
||||
var (
|
||||
regRules = regexp.MustCompile(`(?m)^profile.*{$((.|\n)*)}`)
|
||||
regEndOfRules = regexp.MustCompile(`(?m)([\t ]*include if exists <.*>\n)+}`)
|
||||
regCleanStakedRules = util.ToRegexRepl([]string{
|
||||
`(?m)^.*include <abstractions/base>.*$`, ``, // Remove mandatory base abstraction
|
||||
`(?m)^.*@{exec_path}.*$`, ``, // Remove entry point
|
||||
`(?m)^.*(|P|p)(|U|u)(|i)x,.*$`, ``, // Remove transition rules
|
||||
`(?m)^(?:[\t ]*(?:\r?\n))+`, ``, // Remove empty lines
|
||||
})
|
||||
)
|
||||
|
||||
type Stack struct {
|
||||
DirectiveBase
|
||||
}
|
||||
|
||||
func init() {
|
||||
Directives["stack"] = &Stack{
|
||||
DirectiveBase: DirectiveBase{
|
||||
message: "Stack directive applied",
|
||||
usage: `#aa:stack profiles_name...`,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func (s Stack) Apply(opt *Option, profile string) string {
|
||||
res := ""
|
||||
for name := range opt.Args {
|
||||
tmp, err := rootApparmord.Join(name).ReadFile()
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
stackedProfile := string(tmp)
|
||||
|
||||
m := regRules.FindStringSubmatch(stackedProfile)
|
||||
if len(m) < 2 {
|
||||
panic(fmt.Sprintf("No profile found in %s", name))
|
||||
}
|
||||
stackedRules := m[1]
|
||||
stackedRules = regCleanStakedRules.Replace(stackedRules)
|
||||
res += " # Stacked profile: " + name + "\n" + stackedRules + "\n"
|
||||
}
|
||||
|
||||
// Insert the stacked profile at the end of the current profile, remove the stack directive
|
||||
m := regEndOfRules.FindStringSubmatch(profile)
|
||||
if len(m) <= 1 {
|
||||
panic(fmt.Sprintf("No end of rules found in %s", opt.File))
|
||||
}
|
||||
profile = strings.Replace(profile, m[0], res+m[0], -1)
|
||||
profile = strings.Replace(profile, opt.Raw, "", -1)
|
||||
return profile
|
||||
}
|
74
pkg/prebuild/directive/stack_test.go
Normal file
74
pkg/prebuild/directive/stack_test.go
Normal file
@ -0,0 +1,74 @@
|
||||
// apparmor.d - Full set of apparmor profiles
|
||||
// Copyright (C) 2021-2024 Alexandre Pujol <alexandre@pujol.io>
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
|
||||
package directive
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/arduino/go-paths-helper"
|
||||
)
|
||||
|
||||
func TestStack_Apply(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
rootApparmord *paths.Path
|
||||
opt *Option
|
||||
profile string
|
||||
want string
|
||||
}{
|
||||
{
|
||||
name: "stack",
|
||||
rootApparmord: paths.New("../../../apparmor.d/groups/freedesktop/"),
|
||||
opt: &Option{
|
||||
Name: "stack",
|
||||
Args: map[string]string{"plymouth": ""},
|
||||
File: nil,
|
||||
Raw: " #aa:stack plymouth",
|
||||
},
|
||||
profile: `
|
||||
profile parent @{exec_path} {
|
||||
include <abstractions/base>
|
||||
|
||||
@{exec_path} mr,
|
||||
|
||||
#aa:stack plymouth
|
||||
@{bin}/plymouth rPx -> parent//&plymouth,
|
||||
|
||||
@{PROC}/cmdline r,
|
||||
|
||||
include if exists <local/parent>
|
||||
}`,
|
||||
want: `
|
||||
profile parent @{exec_path} {
|
||||
include <abstractions/base>
|
||||
|
||||
@{exec_path} mr,
|
||||
|
||||
|
||||
@{bin}/plymouth rPx -> parent//&plymouth,
|
||||
|
||||
@{PROC}/cmdline r,
|
||||
|
||||
# Stacked profile: plymouth
|
||||
include <abstractions/fonts>
|
||||
include <abstractions/fontconfig-cache-read>
|
||||
include <abstractions/consoles>
|
||||
unix (send, receive, connect) type=stream peer=(addr="@/org/freedesktop/plymouthd"),
|
||||
@{PROC}/cmdline r,
|
||||
include if exists <local/plymouth>
|
||||
|
||||
include if exists <local/parent>
|
||||
}`,
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
rootApparmord = tt.rootApparmord
|
||||
if got := Directives["stack"].Apply(tt.opt, tt.profile); got != tt.want {
|
||||
t.Errorf("Stack.Apply() = %v, want %v", got, tt.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user