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

build: use new internal structure.

Browse source
This commit is contained in:
Alexandre Pujol 2024-03-26 18:07:48 +00:00
parent c8512bc2c6
commit 0f1f9ce49b
No known key found for this signature in database
GPG key ID: C5469996F0DF68EC
4 changed files with 13 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/prebuild/prebuild.go
View file

@ -33,7 +33,7 @@ func init() {
case "ubuntu": case "ubuntu":
if cfg.Release["VERSION_CODENAME"] == "noble" { if cfg.Release["VERSION_CODENAME"] == "noble" {
builder.Register("abi3") builder.Register("abi3")
cfg.Overwrite = true cfg.Overwrite.Enabled = true
} }
} }
} }

24
pkg/prebuild/prepare/flags.go
View file

@ -32,27 +32,17 @@ func init() {
func (p SetFlags) Apply() ([]string, error) { func (p SetFlags) Apply() ([]string, error) {
res := []string{} res := []string{}
for _, name := range []string{"main.flags", cfg.Distribution + ".flags"} { for _, name := range []string{"main", cfg.Distribution} {
path := cfg.FlagDir.Join(name) for profile, flags := range cfg.Flags.Read(name) {
if !path.Exist() {
continue
}
lines, _ := path.ReadFileAsLines()
for _, line := range lines {
if strings.HasPrefix(line, "#") || line == "" {
continue
}
manifest := strings.Split(line, " ")
profile := manifest[0]
file := cfg.RootApparmord.Join(profile) file := cfg.RootApparmord.Join(profile)
if !file.Exist() { if !file.Exist() {
res = append(res, fmt.Sprintf("Profile %s not found, ignoring", profile)) res = append(res, fmt.Sprintf("Profile %s not found, ignoring", profile))
continue continue
} }
// If flags is set, overwrite profile flag // Overwrite profile flags
if len(manifest) > 1 { if len(flags) > 0 {
flags := " flags=(" + manifest[1] + ") {" flagsStr := " flags=(" + strings.Join(flags, ",") + ") {"
content, err := file.ReadFile() content, err := file.ReadFile()
if err != nil { if err != nil {
return res, err return res, err
@ -60,13 +50,13 @@ func (p SetFlags) Apply() ([]string, error) {
// Remove all flags definition, then set manifest' flags // Remove all flags definition, then set manifest' flags
out := regFlags.ReplaceAllLiteralString(string(content), "") out := regFlags.ReplaceAllLiteralString(string(content), "")
out = regProfileHeader.ReplaceAllLiteralString(out, flags) out = regProfileHeader.ReplaceAllLiteralString(out, flagsStr)
if err := file.WriteFile([]byte(out)); err != nil { if err := file.WriteFile([]byte(out)); err != nil {
return res, err return res, err
} }
} }
} }
res = append(res, path.String()) res = append(res, cfg.FlagDir.Join(name+".flags").String())
} }
return res, nil return res, nil
} }

20
pkg/prebuild/prepare/ignore.go
View file

@ -5,8 +5,6 @@
package prepare package prepare
import ( import (
"strings"
"github.com/arduino/go-paths-helper" "github.com/arduino/go-paths-helper"
"github.com/roddhjav/apparmor.d/pkg/prebuild/cfg" "github.com/roddhjav/apparmor.d/pkg/prebuild/cfg"
) )
@ -26,19 +24,11 @@ func init() {
func (p Ignore) Apply() ([]string, error) { func (p Ignore) Apply() ([]string, error) {
res := []string{} res := []string{}
for _, name := range []string{"main.ignore", cfg.Distribution + ".ignore"} { for _, name := range []string{"main", cfg.Distribution} {
path := cfg.DistDir.Join("ignore", name) for _, ignore := range cfg.Ignore.Read(name) {
if !path.Exist() { profile := cfg.Root.Join(ignore)
continue
}
lines, _ := path.ReadFileAsLines()
for _, line := range lines {
if strings.HasPrefix(line, "#") || line == "" {
continue
}
profile := cfg.Root.Join(line)
if profile.NotExist() { if profile.NotExist() {
files, err := cfg.RootApparmord.ReadDirRecursiveFiltered(nil, paths.FilterNames(line)) files, err := cfg.RootApparmord.ReadDirRecursiveFiltered(nil, paths.FilterNames(ignore))
if err != nil { if err != nil {
return res, err return res, err
} }
@ -53,7 +43,7 @@ func (p Ignore) Apply() ([]string, error) {
} }
} }
} }
res = append(res, path.String()) res = append(res, cfg.IgnoreDir.Join(name+".ignore").String())
} }
return res, nil return res, nil
} }

1
pkg/util/tools.go
View file

@ -94,4 +94,3 @@ func CopyTo(src *paths.Path, dst *paths.Path) error {
} }
return nil return nil
} }