more restrictive dbus proxy config, taken from bubblejail

[bubblebox.git] / profiles.py

diff --git a/profiles.py b/profiles.py
index 69445f444f91110597c9614724ed8c9fb589bcc3..3d395c512c6c2630a942fed0b12937bb49ea776d 100644 (file)
--- a/profiles.py
+++ b/profiles.py
@@ -30,31 +30,45 @@ DEFAULT = group(
   }),
 )
 
   }),
 )
 

-# https://github.com/igo95862/bubblejail is a good source of paths that need allowing.
+def X11():
+  display = os.environ["DISPLAY"].removeprefix(":").split('.')[0]
+  return host_access({
+      "/tmp/.X11-unix/": {
+        "X"+display: Access.Read,
+      },
+      os.environ["XAUTHORITY"]: Access.Read,
+  })
+
+# https://github.com/igo95862/bubblejail/blob/master/src/bubblejail/services.py is a good source of paths that need allowing.

 # We do not give access to pipewire, that needs a portal (https://docs.pipewire.org/page_portal.html).
 def DESKTOP(name):
   return group(
     DEFAULT,
     # Share XDG_RUNTIME_DIR among all instances of this sandbox
     shared_runtime_dir(name),
 # We do not give access to pipewire, that needs a portal (https://docs.pipewire.org/page_portal.html).
 def DESKTOP(name):
   return group(
     DEFAULT,
     # Share XDG_RUNTIME_DIR among all instances of this sandbox
     shared_runtime_dir(name),

-    # Access to screen and audio
+    # Access to display servers, hardware acceleration, and audio

     host_access({
       "dev": {
         ("dri", "snd"): Access.Device,
       },
     host_access({
       "dev": {
         ("dri", "snd"): Access.Device,
       },

-      "/tmp/.X11-unix/": Access.Read,
-      os.environ["XAUTHORITY"]: Access.Read,

       XDG_RUNTIME_DIR: {
       XDG_RUNTIME_DIR: {

-        ("wayland*", "pulse"): Access.Read,
+        (os.environ["WAYLAND_DISPLAY"], "pulse"): Access.Read,

       },
     }),
       },
     }),

+    X11(),

     # Access to some key user configuration
     home_access({
       (".config/fontconfig", ".XCompose", ".local/share/applications"): Access.Read,
     }),
     # Access to basic d-bus services (that are hopefully safe to expose...)
     # Access to some key user configuration
     home_access({
       (".config/fontconfig", ".XCompose", ".local/share/applications"): Access.Read,
     }),
     # Access to basic d-bus services (that are hopefully safe to expose...)

-    dbus_proxy_flags("--talk=org.kde.StatusNotifierWatcher.*", "--talk=org.freedesktop.Notifications.*", "--talk=org.freedesktop.ScreenSaver.*", "--talk=org.freedesktop.portal.*"),
+    dbus_proxy_flags(
+      "--call=org.kde.StatusNotifierWatcher=@/StatusNotifierWatcher",
+      "--call=org.freedesktop.Notifications=@/org/freedesktop/Notifications",
+      "--call=org.freedesktop.ScreenSaver=@/org/freedesktop/ScreenSaver",
+      "--call=org.freedesktop.ScreenSaver=@/ScreenSaver",
+      "--talk=org.freedesktop.portal.*",
+    ),

     # Make it possible to open websites in Firefox
     home_access({ ".mozilla/firefox/profiles.ini": Access.Read }),
     # Make it possible to open websites in Firefox
     home_access({ ".mozilla/firefox/profiles.ini": Access.Read }),

-    dbus_proxy_flags("--talk=org.mozilla.firefox.*"),
+    dbus_proxy_flags("--call=org.mozilla.firefox.*=@/org/mozilla/firefox/Remote"),

   )
   )