fix(profile): issue with re-attached paths

- Add missing att on some profiles
- Fix alias / -> //
- Fix aa-log att variable resolution

fix #813 #814

apparmor.d/abstractions/attached/base

@@ -14,6 +14,8 @@
   @{att}/@{run}/systemd/journal/socket w,
   @{att}/@{run}/systemd/journal/stdout rw,
 
+  @{att}/dev/null  rw,
+
   /apparmor/.null rw,
   @{att}/apparmor/.null rw,
 

apparmor.d/abstractions/common/bwrap

@@ -38,12 +38,14 @@
   pivot_root oldroot=/newroot/ /newroot/,
   pivot_root oldroot=/tmp/oldroot/ /tmp/,
 
-  owner / r,
   owner /newroot/{,**} w,
 
   owner /tmp/newroot/ w,
   owner /tmp/oldroot/ w,
 
+  @{att}/ r,
+  @{att}/@{run}/.userns r,
+
         @{PROC}/sys/kernel/overflowgid r,
         @{PROC}/sys/kernel/overflowuid r,
         @{PROC}/sys/user/max_user_namespaces r,

apparmor.d/groups/flatpak/flatpak

@@ -66,7 +66,7 @@ profile flatpak @{exec_path} flags=(attach_disconnected,mediate_deleted,complain
   /etc/flatpak/{,**} r,
   /etc/pulse/client.conf r,
 
-  / r,
+  @{att}/ r,
 
   /var/lib/flatpak/{,**} rwlk,
 

apparmor.d/groups/freedesktop/xdg-desktop-portal

@@ -64,9 +64,9 @@ profile xdg-desktop-portal @{exec_path} flags=(attach_disconnected) {
   @{lib}/xdg-desktop-portal-validate-icon rPx,
   @{open_path}                            rPx -> child-open,
 
-              / r,
+        / r,
-        @{att}/.flatpak-info r,
+  @{att}/ r,
-  owner @{att}/ r,
+  @{att}/.flatpak-info r,
 
   /usr/share/dconf/profile/gdm r,
   /usr/share/xdg-desktop-portal/** r,

apparmor.d/groups/freedesktop/xwayland

@@ -9,6 +9,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/Xwayland
 profile xwayland @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
+  include <abstractions/consoles>
   include <abstractions/graphics>
   include <abstractions/nameservice-strict>
   include <abstractions/wayland>
@@ -41,9 +42,6 @@ profile xwayland @{exec_path} flags=(attach_disconnected) {
 
   @{PROC}/@{pids}/cmdline r,
 
-  @{att}/dev/tty@{int} rw,
-  /dev/tty rw,
-
   include if exists <local/xwayland>
 }
 

apparmor.d/groups/hyprland/hyprland

@@ -62,6 +62,9 @@ profile hyprland @{exec_path} flags=(attach_disconnected) {
 
   owner @{PROC}/@{pid}/environ r,
 
+  @{att}/dev/dri/card@{int} rw,
+  @{att}/dev/input/event@{int} rw,
+
         /dev/input/event@{int} rw,
         /dev/tty r,
   owner /dev/tty@{int} rw,

apparmor.d/tunables/multiarch.d/system

@@ -74,6 +74,6 @@
 # See https://apparmor.pujol.io/development/internal/#re-attached-path
 @{att}=/
 
-alias // -> /,
+alias / -> //,
 
 # vim:syntax=apparmor

pkg/logs/logs.go

@@ -64,7 +64,7 @@ var (
 		`/home/[^/]+/`, `@{HOME}/`,
 
 		// Resolve system variables
-		`/att/[^/@]+`, `@{att}/`,
+		`/att/[^/]+/`, `@{att}/`,
 		`/usr/lib(32|64|exec)`, `@{lib}`,
 		`/usr/lib`, `@{lib}`,
 		`/usr/sbin`, `@{sbin}`,
@@ -86,7 +86,6 @@ var (
 		`pci` + strings.Repeat(h, 4) + `:` + strings.Repeat(h, 2), `@{pci_bus}`,
 		`@{pci_bus}/[0-9a-f:*./]*/`, `@{pci}/`,
 		`1000`, `@{uid}`,
-		`@{att}//`, `@{att}/`,
 
 		// Some system glob
 		`:not.active.yet`, `@{busname}`, // dbus unique bus name