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

refractor(build): update prebuild logic to the new interface structure.

Browse source
This commit is contained in:
Alexandre Pujol 2024-03-25 23:37:13 +00:00
parent 2dea78a59c
commit 69f2f46c46
No known key found for this signature in database
GPG key ID: C5469996F0DF68EC
4 changed files with 80 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

31
cmd/prebuild/main.go
View file

@ -10,12 +10,14 @@ import (
"os"
"github.com/roddhjav/apparmor.d/pkg/logging"
oss "github.com/roddhjav/apparmor.d/pkg/os"
"github.com/roddhjav/apparmor.d/pkg/prebuild"
"github.com/roddhjav/apparmor.d/pkg/prebuild/builder"
"github.com/roddhjav/apparmor.d/pkg/prebuild/cfg"
"github.com/roddhjav/apparmor.d/pkg/prebuild/directive"
"github.com/roddhjav/apparmor.d/pkg/prebuild/prepare"
)
const usage = `prebuild [-h] [--full] [--complain | --enforce] [profiles...]
const usage = `prebuild [-h] [--full] [--complain | --enforce]
Prebuild apparmor.d profiles for a given distribution and apply
internal built-in directives.
@ -27,7 +29,6 @@ Options:
-e, --enforce Set enforce flag on all profiles.
--abi4 Convert the profiles to Apparmor abi/4.0.
Directives:
`
var (
@ -51,23 +52,23 @@ func init() {
}
func aaPrebuild() error {
logging.Step("Building apparmor.d profiles for %s.", oss.Distribution)
logging.Step("Building apparmor.d profiles for %s.", cfg.Distribution)
if full {
prebuild.Prepares = append(prebuild.Prepares, prebuild.SetFullSystemPolicy)
prebuild.Builds = append(prebuild.Builds, prebuild.BuildFullSystemPolicy)
prepare.Register("fsp")
builder.Register("fsp")
} else {
prebuild.Prepares = append(prebuild.Prepares, prebuild.SetEarlySystemd)
prepare.Register("systemd-early")
}
if complain {
prebuild.Builds = append(prebuild.Builds, prebuild.BuildComplain)
builder.Register("complain")
} else if enforce {
prebuild.Builds = append(prebuild.Builds, prebuild.BuildEnforce)
builder.Register("enforce")
}
if abi4 {
prebuild.Builds = append(prebuild.Builds, prebuild.BuildABI3)
builder.Register("abi3")
}
if err := prebuild.Prepare(); err != nil {
@ -78,11 +79,11 @@ func aaPrebuild() error {
func main() {
flag.Usage = func() {
res := usage
for _, d := range directive.Directives {
res += ` ` + d.Usage() + "\n"
}
fmt.Print(res)
fmt.Printf("%s%s\n%s\n%s", usage,
cfg.Help("Prepare", prepare.Tasks),
cfg.Help("Build", builder.Builders),
cfg.Usage("Directives", directive.Directives),
)
}
flag.Parse()
if help {