app: clean up interactions and handle all application state and setup/teardown

There was an earlier attempt of cleaning up the app package however it ended up creating even more of a mess and the code structure largely still looked like Ego with state setup scattered everywhere and a bunch of ugly hacks had to be implemented to keep track of all of them. In this commit the entire app package is rewritten to track everything that has to do with an app in one thread safe value.

In anticipation of the client/server split also made changes:
- Console messages are cleaned up to be consistent
- State tracking is fully rewritten to be cleaner and usable for multiple process and client/server
- Encapsulate errors to easier identify type of action causing the error as well as additional info
- System-level setup operations is grouped in a way that can be collectively committed/reverted
  and gracefully handles errors returned by each operation
- Resource sharing is made more fine-grained with PID-scoped resources whenever possible,
  a few remnants (X11, Wayland, PulseAudio) will be addressed when a generic proxy is available
- Application setup takes a JSON-friendly config struct and deterministically generates system setup operations

Signed-off-by: Ophestra Umiker <cat@ophivana.moe>

1 files changed, 0 insertions, 123 deletions

diff --git a/internal/app/dbus.go b/internal/app/dbus.go
deleted file mode 100644
index fe8039f6..00000000
--- a/internal/app/dbus.go
+++ /dev/null
@@ -1,123 +0,0 @@
-package app
-
-import (
-	"errors"
-	"fmt"
-	"os"
-	"path"
-	"strconv"
-
-	"git.ophivana.moe/cat/fortify/acl"
-	"git.ophivana.moe/cat/fortify/dbus"
-	"git.ophivana.moe/cat/fortify/internal"
-	"git.ophivana.moe/cat/fortify/internal/util"
-	"git.ophivana.moe/cat/fortify/internal/verbose"
-)
-
-const (
-	dbusSessionBusAddress = "DBUS_SESSION_BUS_ADDRESS"
-	dbusSystemBusAddress  = "DBUS_SYSTEM_BUS_ADDRESS"
-)
-
-var (
-	dbusAddress [2]string
-	dbusSystem  bool
-)
-
-func (a *App) ShareDBus(dse, dsg *dbus.Config, log bool) {
-	a.setEnablement(internal.EnableDBus)
-
-	dbusSystem = dsg != nil
-	var binPath string
-	var sessionBus, systemBus [2]string
-
-	target := path.Join(a.sharePath, strconv.Itoa(os.Getpid()))
-	sessionBus[1] = target + ".bus"
-	systemBus[1] = target + ".system-bus"
-	dbusAddress = [2]string{
-		"unix:path=" + sessionBus[1],
-		"unix:path=" + systemBus[1],
-	}
-
-	if b, ok := util.Which("xdg-dbus-proxy"); !ok {
-		internal.Fatal("D-Bus: Did not find 'xdg-dbus-proxy' in PATH")
-	} else {
-		binPath = b
-	}
-
-	if addr, ok := os.LookupEnv(dbusSessionBusAddress); !ok {
-		verbose.Println("D-Bus: DBUS_SESSION_BUS_ADDRESS not set, assuming default format")
-		sessionBus[0] = fmt.Sprintf("unix:path=/run/user/%d/bus", os.Getuid())
-	} else {
-		sessionBus[0] = addr
-	}
-
-	if addr, ok := os.LookupEnv(dbusSystemBusAddress); !ok {
-		verbose.Println("D-Bus: DBUS_SYSTEM_BUS_ADDRESS not set, assuming default format")
-		systemBus[0] = "unix:path=/run/dbus/system_bus_socket"
-	} else {
-		systemBus[0] = addr
-	}
-
-	p := dbus.New(binPath, sessionBus, systemBus)
-
-	dse.Log = log
-	verbose.Println("D-Bus: sealing session proxy", dse.Args(sessionBus))
-	if dsg != nil {
-		dsg.Log = log
-		verbose.Println("D-Bus: sealing system proxy", dsg.Args(systemBus))
-	}
-	if err := p.Seal(dse, dsg); err != nil {
-		internal.Fatal("D-Bus: invalid config when sealing proxy,", err)
-	}
-
-	ready := make(chan bool, 1)
-	done := make(chan struct{})
-
-	verbose.Printf("Starting session bus proxy '%s' for address '%s'\n", dbusAddress[0], sessionBus[0])
-	if dsg != nil {
-		verbose.Printf("Starting system bus proxy '%s' for address '%s'\n", dbusAddress[1], systemBus[0])
-	}
-	if err := p.Start(&ready); err != nil {
-		internal.Fatal("D-Bus: error starting proxy,", err)
-	}
-	verbose.Println("D-Bus proxy launch:", p)
-
-	go func() {
-		if err := p.Wait(); err != nil {
-			fmt.Println("warn: D-Bus proxy returned error,", err)
-		} else {
-			verbose.Println("D-Bus proxy uneventful wait")
-		}
-		if err := os.Remove(target); err != nil && !errors.Is(err, os.ErrNotExist) {
-			fmt.Println("Error removing dangling D-Bus socket:", err)
-		}
-		done <- struct{}{}
-	}()
-
-	// register early to enable Fatal cleanup
-	a.exit.SealDBus(p, &done)
-
-	if !<-ready {
-		internal.Fatal("D-Bus: proxy did not start correctly")
-	}
-
-	a.AppendEnv(dbusSessionBusAddress, dbusAddress[0])
-	if err := acl.UpdatePerm(sessionBus[1], a.UID(), acl.Read, acl.Write); err != nil {
-		internal.Fatal(fmt.Sprintf("Error preparing D-Bus session proxy '%s':", dbusAddress[0]), err)
-	} else {
-		a.exit.RegisterRevertPath(sessionBus[1])
-	}
-	if dsg != nil {
-		a.AppendEnv(dbusSystemBusAddress, dbusAddress[1])
-		if err := acl.UpdatePerm(systemBus[1], a.UID(), acl.Read, acl.Write); err != nil {
-			internal.Fatal(fmt.Sprintf("Error preparing D-Bus system proxy '%s':", dbusAddress[1]), err)
-		} else {
-			a.exit.RegisterRevertPath(systemBus[1])
-		}
-	}
-	verbose.Printf("Session bus proxy '%s' for address '%s' configured\n", dbusAddress[0], sessionBus[0])
-	if dsg != nil {
-		verbose.Printf("System bus proxy '%s' for address '%s' configured\n", dbusAddress[1], systemBus[0])
-	}
-}