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

feat(aa): formatter: add support for abstraction & tunables.

Browse Source
This commit is contained in:
Alexandre Pujol 2024-06-22 20:20:34 +01:00
parent 42ca1be858
commit a91e2ddf56
No known key found for this signature in database
GPG Key ID: C5469996F0DF68EC
1 changed files with 50 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
cmd/aa/main.go
View File

@ -40,6 +40,14 @@ var (
tree bool
)
type kind uint8
const (
isProfile kind = iota
isAbstraction
isTunable
)
func init() {
flag.BoolVar(&help, "h", false, "Show this help message and exit.")
flag.BoolVar(&help, "help", false, "Show this help message and exit.")
@ -68,25 +76,40 @@ func getIndentationLevel(input string) int {
return level
}
func parse(profile string) (*aa.AppArmorProfileFile, []aa.Rules, []string, error) {
f := &aa.AppArmorProfileFile{}
nb, err := f.Parse(profile)
if err != nil {
return nil, nil, nil, err
func parse(kind kind, profile string) ([]aa.Rules, []string, error) {
var raw string
paragraphs := []string{}
rulesByParagraph := []aa.Rules{}
switch kind {
case isTunable, isProfile:
f := &aa.AppArmorProfileFile{}
nb, err := f.Parse(profile)
if err != nil {
return nil, nil, err
}
lines := strings.Split(profile, "\n")
raw = strings.Join(lines[nb:], "\n")
case isAbstraction:
raw = profile
}
paragraphRules, paragraphs, err := aa.ParseRules(strings.Join(strings.Split(profile, "\n")[nb:], "\n"))
r, par, err := aa.ParseRules(raw)
if err != nil {
return nil, nil, nil, err
return nil, nil, err
}
return f, paragraphRules, paragraphs, nil
rulesByParagraph = append(rulesByParagraph, r...)
paragraphs = append(paragraphs, par...)
return rulesByParagraph, paragraphs, nil
}
func formatFile(profile string) (string, error) {
_, paragraphRules, paragraphs, err := parse(profile)
func formatFile(kind kind, profile string) (string, error) {
rulesByParagraph, paragraphs, err := parse(kind, profile)
if err != nil {
return "", err
}
for idx, rules := range paragraphRules {
for idx, rules := range rulesByParagraph {
if err := rules.Validate(); err != nil {
return "", err
}
@ -97,6 +120,20 @@ func formatFile(profile string) (string, error) {
return profile, nil
}
// getKind checks if the file is a full apparmor profile file or an
// included (abstraction or tunable) file.
func getKind(file *paths.Path) kind {
dirname := file.Parent().String()
switch {
case strings.Contains(dirname, "abstractions"):
return isAbstraction
case strings.Contains(dirname, "tunables"):
return isTunable
default:
return isProfile
}
}
func aaFormat(files paths.PathList) error {
for _, file := range files {
if !file.Exist() {
@ -106,7 +143,8 @@ func aaFormat(files paths.PathList) error {
if err != nil {
return err
}
profile, err = formatFile(profile)
profile, err = formatFile(getKind(file), profile)
if err != nil {
return err
}