From 0107620d8c174dcf9237c16d4b4b7b2f6955a214 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Sat, 28 Dec 2024 11:12:35 +0900 Subject: app: merge share methods This significantly increases readability and makes order of ops more obvious. Signed-off-by: Ophestra --- internal/app/share.dbus.go | 44 -------------------------------------------- 1 file changed, 44 deletions(-) delete mode 100644 internal/app/share.dbus.go (limited to 'internal/app/share.dbus.go') diff --git a/internal/app/share.dbus.go b/internal/app/share.dbus.go deleted file mode 100644 index 4fd947d7..00000000 --- a/internal/app/share.dbus.go +++ /dev/null @@ -1,44 +0,0 @@ -package app - -import ( - "path" - - "git.gensokyo.uk/security/fortify/acl" - "git.gensokyo.uk/security/fortify/dbus" - "git.gensokyo.uk/security/fortify/internal/system" -) - -const ( - dbusSessionBusAddress = "DBUS_SESSION_BUS_ADDRESS" - dbusSystemBusAddress = "DBUS_SYSTEM_BUS_ADDRESS" -) - -func (seal *appSeal) shareDBus(config [2]*dbus.Config) error { - if !seal.et.Has(system.EDBus) { - return nil - } - - // downstream socket paths - sessionPath, systemPath := path.Join(seal.share, "bus"), path.Join(seal.share, "system_bus_socket") - - // configure dbus proxy - if f, err := seal.sys.ProxyDBus(config[0], config[1], sessionPath, systemPath); err != nil { - return err - } else { - seal.dbusMsg = f - } - - // share proxy sockets - sessionInner := path.Join(seal.sys.runtime, "bus") - seal.sys.bwrap.SetEnv[dbusSessionBusAddress] = "unix:path=" + sessionInner - seal.sys.bwrap.Bind(sessionPath, sessionInner) - seal.sys.UpdatePerm(sessionPath, acl.Read, acl.Write) - if config[1] != nil { - systemInner := "/run/dbus/system_bus_socket" - seal.sys.bwrap.SetEnv[dbusSystemBusAddress] = "unix:path=" + systemInner - seal.sys.bwrap.Bind(systemPath, systemInner) - seal.sys.UpdatePerm(systemPath, acl.Read, acl.Write) - } - - return nil -} -- cgit v1.3.1