hst/dbus: move dbus config struct

This allows holding a xdg-dbus-proxy configuration without importing system/dbus.

It also makes more sense in the project structure since the config struct is part of the hst API however the rest of the implementation is not.

Signed-off-by: Ophestra <cat@gensokyo.uk>

hst/config.go

@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"hakurei.app/container"
-	"hakurei.app/system/dbus"
 )
 
 const Tmp = "/.hakurei"
@@ -42,10 +41,10 @@ type (
 
 		// Session D-Bus proxy configuration.
 		// If set to nil, session bus proxy assume built-in defaults.
-		SessionBus *dbus.Config `json:"session_bus,omitempty"`
+		SessionBus *BusConfig `json:"session_bus,omitempty"`
 		// System D-Bus proxy configuration.
 		// If set to nil, system bus proxy is disabled.
-		SystemBus *dbus.Config `json:"system_bus,omitempty"`
+		SystemBus *BusConfig `json:"system_bus,omitempty"`
 		// Direct access to wayland socket, no attempt is made to attach security-context-v1
 		// and the bare socket is made available to the container.
 		DirectWayland bool `json:"direct_wayland,omitempty"`

hst/dbus.go

@@ -0,0 +1,19 @@
+package hst
+
+// BusConfig configures the xdg-dbus-proxy process.
+type BusConfig struct {
+	// See set 'see' policy for NAME (--see=NAME)
+	See []string `json:"see"`
+	// Talk set 'talk' policy for NAME (--talk=NAME)
+	Talk []string `json:"talk"`
+	// Own set 'own' policy for NAME (--own=NAME)
+	Own []string `json:"own"`
+
+	// Call set RULE for calls on NAME (--call=NAME=RULE)
+	Call map[string]string `json:"call"`
+	// Broadcast set RULE for broadcasts from NAME (--broadcast=NAME=RULE)
+	Broadcast map[string]string `json:"broadcast"`
+
+	Log    bool `json:"log,omitempty"`
+	Filter bool `json:"filter"`
+}

hst/hst.go

@@ -7,7 +7,6 @@ import (
 	"os"
 
 	"hakurei.app/container"
-	"hakurei.app/system/dbus"
 )
 
 // An AppError is returned while starting an app according to [hst.Config].
@@ -62,7 +61,7 @@ func Template() *Config {
 
 		Enablements: NewEnablements(EWayland | EDBus | EPulse),
 
-		SessionBus: &dbus.Config{
+		SessionBus: &BusConfig{
 			See: nil,
 			Talk: []string{"org.freedesktop.Notifications", "org.freedesktop.FileManager1", "org.freedesktop.ScreenSaver",
 				"org.freedesktop.secrets", "org.kde.kwalletd5", "org.kde.kwalletd6", "org.gnome.SessionManager"},
@@ -73,7 +72,7 @@ func Template() *Config {
 			Log:       false,
 			Filter:    true,
 		},
-		SystemBus: &dbus.Config{
+		SystemBus: &BusConfig{
 			See:       nil,
 			Talk:      []string{"org.bluez", "org.freedesktop.Avahi", "org.freedesktop.UPower"},
 			Own:       nil,