feat(profile): start using new abstractions (2)

apparmor.d/groups/whonix/torbrowser

@@ -23,18 +23,16 @@ profile torbrowser @{exec_path} flags=(attach_disconnected) {
   include <abstractions/bus/org.freedesktop.login1>
   include <abstractions/bus/org.freedesktop.portal.Desktop>
   include <abstractions/bus/org.freedesktop.RealtimeKit1>
+  include <abstractions/bus/org.gtk.Private.RemoteVolumeMonitor>
+  include <abstractions/desktop>
+  include <abstractions/enchant>
   include <abstractions/fontconfig-cache-read>
-  include <abstractions/fonts>
-  include <abstractions/freedesktop.org>
+  include <abstractions/graphics-full>
   include <abstractions/gstreamer>
-  include <abstractions/gtk>
-  include <abstractions/mesa>
   include <abstractions/nameservice-strict>
-  include <abstractions/opencl>
   include <abstractions/ssl_certs>
   include <abstractions/thumbnails-cache-read>
   include <abstractions/user-download-strict>
-  include <abstractions/vulkan>
 
   # userns,
 
@@ -59,14 +57,10 @@ profile torbrowser @{exec_path} flags=(attach_disconnected) {
 
   /usr/share/@{name}/{,**} r,
   /usr/share/doc/{,**} r,
-  /usr/share/egl/{,**} r,
-  /usr/share/icu/@{int}.@{int}/*.dat r,
-  /usr/share/libdrm/*.ids r,
   /usr/share/xul-ext/kwallet5/* r,
 
   /etc/@{name}.d/{,**} r,
   /etc/igfx_user_feature{,_next}.txt w,
-  /etc/libva.conf r,
   /etc/mailcap r,
   /etc/mime.types r,
   /etc/opensc.conf r,
@@ -110,20 +104,16 @@ profile torbrowser @{exec_path} flags=(attach_disconnected) {
   @{sys}/cgroup/cpu,cpuacct/user.slice/cpu.cfs_quota_us r,
   @{sys}/class/ r,
   @{sys}/class/**/ r,
-  @{sys}/devices/**/uevent r,
   @{sys}/devices/@{pci}/ r,
   @{sys}/devices/@{pci}/drm/card@{int}/ r,
-  @{sys}/devices/@{pci}/drm/renderD[0-9]*/ r,
-  @{sys}/devices/@{pci}/irq r,
-  @{sys}/devices/system/cpu/cpu@{int}/cache/index[0-9]/size r,
-  @{sys}/devices/system/cpu/cpufreq/policy[0-9]/cpuinfo_max_freq r,
-  @{sys}/devices/system/cpu/present r,
+  @{sys}/devices/@{pci}/drm/renderD128/ r,
+  @{sys}/devices/@{pci}/drm/renderD129/ r,
+  @{sys}/devices/**/uevent r,
   @{sys}/fs/cgroup/cpu,cpuacct/cpu.cfs_quota_us r,
   @{sys}/fs/cgroup/user.slice/user-@{uid}.slice/session-1.scope/cpu.max r,
   @{sys}/fs/cgroup/user.slice/user-@{uid}.slice/user@@{uid}.service/**/cpu.max r,
 
   owner @{PROC}/@{pid}/cgroup r,
-  owner @{PROC}/@{pid}/comm r,
   owner @{PROC}/@{pid}/fd/ r,
   owner @{PROC}/@{pid}/gid_map w, # If kernel.unprivileged_userns_clone = 1
   owner @{PROC}/@{pid}/mountinfo r,
@@ -140,5 +130,9 @@ profile torbrowser @{exec_path} flags=(attach_disconnected) {
   owner @{PROC}/@{pids}/cmdline r,
   owner @{PROC}/@{pids}/environ r,
 
+  # Silencer
+  deny @{lib_dirs}/** w,
+  deny owner @{user_share_dirs}/gvfs-metadata/{,*} r,
+
   include if exists <local/torbrowser>
 }

apparmor.d/groups/whonix/torbrowser-glxtest

@@ -15,12 +15,8 @@ include <tunables/global>
 @{exec_path} = @{lib_dirs}/glxtest
 profile torbrowser-glxtest @{exec_path} {
   include <abstractions/base>
-  include <abstractions/dri-common>
-  include <abstractions/dri-enumerate>
-  include <abstractions/mesa>
+  include <abstractions/graphics>
   include <abstractions/nameservice-strict>
-  include <abstractions/opencl-nvidia>
-  include <abstractions/vulkan>
   include <abstractions/X-strict>
 
   @{exec_path} mr,
@@ -29,9 +25,6 @@ profile torbrowser-glxtest @{exec_path} {
 
   owner /tmp/@{name}/.parentlock rw,
 
-  @{sys}/bus/pci/devices/ r,
-  @{sys}/devices/@{pci}/class r,
-
   owner @{PROC}/@{pid}/cmdline r,
 
   include if exists <local/torbrowser-glxtest>

apparmor.d/groups/whonix/torbrowser-vaapitest

@@ -15,23 +15,16 @@ include <tunables/global>
 @{exec_path} = @{lib_dirs}/vaapitest
 profile torbrowser-vaapitest @{exec_path} {
   include <abstractions/base>
-  include <abstractions/dri-enumerate>
-  include <abstractions/dri-common>
-  include <abstractions/nvidia>
-  include <abstractions/vulkan>
+  include <abstractions/graphics>
 
   network netlink raw,
 
   @{exec_path} mr,
 
   /etc/igfx_user_feature{,_next}.txt w,
-  /etc/libva.conf r,
 
   owner /tmp/@{name}/.parentlock rw,
 
-  @{sys}/devices/@{pci}/{irq,revision,resource} r,
-  @{sys}/devices/@{pci}/config r,
-
   deny @{config_dirs}/.parentlock rw,
   deny @{config_dirs}/startupCache/** r,
   deny @{user_cache_dirs}/startupCache/* r,