feat(aa): make preamble rule classic aa rules.

This commit is contained in:
Alexandre Pujol 2024-05-04 23:25:55 +01:00
parent 068373405f
commit a5c4eab0cf
No known key found for this signature in database
GPG key ID: C5469996F0DF68EC
8 changed files with 81 additions and 74 deletions

View file

@ -4,42 +4,7 @@
{{- define "apparmor" -}}
{{- with .Comments -}}
{{- range . -}}
{{- template "comment" . -}}
{{- "\n" -}}
{{- end -}}
{{- "\n" -}}
{{- end -}}
{{- with .Abi -}}
{{- range . -}}
{{- template "abi" . -}}
{{- "\n" -}}
{{- end -}}
{{- "\n" -}}
{{- end -}}
{{- with .Aliases -}}
{{- range . -}}
{{- template "alias" . -}}
{{- "\n" -}}
{{- end -}}
{{- "\n" -}}
{{- end -}}
{{- with .Includes -}}
{{- range . -}}
{{- template "include" . -}}
{{- "\n" -}}
{{- end -}}
{{- "\n" -}}
{{- end -}}
{{- range .Variables -}}
{{- template "variable" . -}}
{{- "\n" -}}
{{- end -}}
{{- template "rules" .Preamble -}}
{{- range .Profiles -}}
{{- template "profile" . -}}

View file

@ -19,7 +19,7 @@
{{- " optional:" -}}
{{- end -}}
{{- with .Comment -}}
{{ " " }}{{ . }}
{{ . }}
{{- end -}}
{{- end -}}
{{- end -}}

View file

@ -7,7 +7,11 @@
{{- $oldtype := "" -}}
{{- range . -}}
{{- $type := typeof . -}}
{{- if eq $type "RuleBase" -}}
{{- if eq $type "" -}}
{{- "\n" -}}
{{- continue -}}
{{- end -}}
{{- if eq $type "Comment" -}}
{{- template "comment" . -}}
{{- "\n" -}}
{{- continue -}}
@ -18,10 +22,22 @@
{{- end -}}
{{- indent "" -}}
{{- if eq $type "Abi" -}}
{{- template "abi" . -}}
{{- end -}}
{{- if eq $type "Alias" -}}
{{- template "alias" . -}}
{{- end -}}
{{- if eq $type "Include" -}}
{{- template "include" . -}}
{{- end -}}
{{- if eq $type "Variable" -}}
{{- template "variable" . -}}
{{- end -}}
{{- if eq $type "All" -}}
{{- template "all" . -}}
{{- end -}}