mirror of
https://github.com/roddhjav/apparmor.d.git
synced 2025-01-18 08:58:15 +01:00
feat(aa): add the link rule.
This commit is contained in:
parent
81f0163086
commit
e38f5b4637
3 changed files with 92 additions and 13 deletions
|
@ -10,11 +10,12 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
tokLINK = "link"
|
tokLINK = "link"
|
||||||
tokOWNER = "owner"
|
tokFILE = "file"
|
||||||
|
tokOWNER = "owner"
|
||||||
|
tokSUBSET = "subset"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
type File struct {
|
type File struct {
|
||||||
RuleBase
|
RuleBase
|
||||||
Qualifier
|
Qualifier
|
||||||
|
@ -25,17 +26,10 @@ type File struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
func newFileFromLog(log map[string]string) Rule {
|
func newFileFromLog(log map[string]string) Rule {
|
||||||
owner := false
|
|
||||||
fsuid, hasFsUID := log["fsuid"]
|
|
||||||
ouid, hasOuUID := log["ouid"]
|
|
||||||
isDbus := strings.Contains(log["operation"], "dbus")
|
|
||||||
if hasFsUID && hasOuUID && fsuid == ouid && ouid != "0" && !isDbus {
|
|
||||||
owner = true
|
|
||||||
}
|
|
||||||
return &File{
|
return &File{
|
||||||
RuleBase: newRuleFromLog(log),
|
RuleBase: newRuleFromLog(log),
|
||||||
Qualifier: newQualifierFromLog(log),
|
Qualifier: newQualifierFromLog(log),
|
||||||
Owner: owner,
|
Owner: isOwner(log),
|
||||||
Path: log["name"],
|
Path: log["name"],
|
||||||
Access: toAccess("file-log", log["requested_mask"]),
|
Access: toAccess("file-log", log["requested_mask"]),
|
||||||
Target: log["target"],
|
Target: log["target"],
|
||||||
|
@ -79,5 +73,68 @@ func (r *File) Constraint() constraint {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *File) Kind() string {
|
func (r *File) Kind() string {
|
||||||
return "file"
|
return tokFILE
|
||||||
|
}
|
||||||
|
|
||||||
|
type Link struct {
|
||||||
|
RuleBase
|
||||||
|
Qualifier
|
||||||
|
Owner bool
|
||||||
|
Subset bool
|
||||||
|
Path string
|
||||||
|
Target string
|
||||||
|
}
|
||||||
|
|
||||||
|
func newLinkFromLog(log map[string]string) Rule {
|
||||||
|
return &Link{
|
||||||
|
RuleBase: newRuleFromLog(log),
|
||||||
|
Qualifier: newQualifierFromLog(log),
|
||||||
|
Owner: isOwner(log),
|
||||||
|
Path: log["name"],
|
||||||
|
Target: log["target"],
|
||||||
|
}
|
||||||
|
}
|
||||||
|
func (r *Link) Less(other any) bool {
|
||||||
|
o, _ := other.(*Link)
|
||||||
|
if r.Path != o.Path {
|
||||||
|
return r.Path < o.Path
|
||||||
|
}
|
||||||
|
if r.Target != o.Target {
|
||||||
|
return r.Target < o.Target
|
||||||
|
}
|
||||||
|
if o.Owner != r.Owner {
|
||||||
|
return r.Owner
|
||||||
|
}
|
||||||
|
if r.Subset != o.Subset {
|
||||||
|
return r.Subset
|
||||||
|
}
|
||||||
|
return r.Qualifier.Less(o.Qualifier)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *Link) Equals(other any) bool {
|
||||||
|
o, _ := other.(*Link)
|
||||||
|
return r.Subset == o.Subset && r.Owner == o.Owner && r.Path == o.Path &&
|
||||||
|
r.Target == o.Target && r.Qualifier.Equals(o.Qualifier)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *Link) String() string {
|
||||||
|
return renderTemplate(r.Kind(), r)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *Link) Constraint() constraint {
|
||||||
|
return blockKind
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *Link) Kind() string {
|
||||||
|
return tokLINK
|
||||||
|
}
|
||||||
|
|
||||||
|
func isOwner(log map[string]string) bool {
|
||||||
|
fsuid, hasFsUID := log["fsuid"]
|
||||||
|
ouid, hasOuUID := log["ouid"]
|
||||||
|
isDbus := strings.Contains(log["operation"], "dbus")
|
||||||
|
if hasFsUID && hasOuUID && fsuid == ouid && ouid != "0" && !isDbus {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,4 +20,22 @@
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
{{- "," -}}
|
{{- "," -}}
|
||||||
{{- template "comment" . -}}
|
{{- template "comment" . -}}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|
||||||
|
{{- define "link" -}}
|
||||||
|
{{- template "qualifier" . -}}
|
||||||
|
{{- if .Owner -}}
|
||||||
|
{{- "owner " -}}
|
||||||
|
{{- end -}}
|
||||||
|
{{- "link " -}}
|
||||||
|
{{- if .Subset -}}
|
||||||
|
{{- "subset " -}}
|
||||||
|
{{- end -}}
|
||||||
|
{{- .Path -}}
|
||||||
|
{{- " " -}}
|
||||||
|
{{- with .Target -}}
|
||||||
|
{{ " -> " }}{{ . }}
|
||||||
|
{{- end -}}
|
||||||
|
{{- "," -}}
|
||||||
|
{{- template "comment" . -}}
|
||||||
|
{{- end -}}
|
||||||
|
|
|
@ -106,6 +106,10 @@
|
||||||
{{- template "file" . -}}
|
{{- template "file" . -}}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|
||||||
|
{{- if eq $type "Link" -}}
|
||||||
|
{{- template "link" . -}}
|
||||||
|
{{- end -}}
|
||||||
|
|
||||||
{{- if eq $type "Profile" -}}
|
{{- if eq $type "Profile" -}}
|
||||||
{{- template "profile" . -}}
|
{{- template "profile" . -}}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|
Loading…
Reference in a new issue