LICENSE

@@ -1,9 +0,0 @@
-Copyright (C) 2024 Ophestra Umiker
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL OPHESTRA UMIKER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of Ophestra Umiker shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Ophestra Umiker.

main.go

@@ -56,12 +56,8 @@ func main() {
 		fatal("Env variable", xdgRuntimeDir, "unset")
 	} else {
 		runtime = r
-		runDir = path.Join(runtime, "ego")
 	}
 
-	// state query command
-	tryState()
-
 	// Report warning if user home directory does not exist or has wrong ownership
 	if stat, err := os.Stat(ego.HomeDir); err != nil {
 		if verbose {
@@ -91,10 +87,9 @@ func main() {
 	} else if !s.IsDir() {
 		fatal(fmt.Sprintf("Path '%s' is not a directory", runtime))
 	} else {
+		// Cleanup: need revert
 		if err = aclUpdatePerm(runtime, uid, aclExecute); err != nil {
 			fatal("Error preparing runtime dir:", err)
-		} else {
-			registerRevertPath(runtime)
 		}
 		if verbose {
 			fmt.Printf("Runtime data dir '%s' configured\n", runtime)
@@ -102,14 +97,15 @@ func main() {
 	}
 
 	// Create runtime dir for Ego itself (e.g. `/run/user/%d/ego`) and make it readable for target
+	runDir = path.Join(runtime, "ego")
 	if err := os.Mkdir(runDir, 0700); err != nil && !errors.Is(err, fs.ErrExist) {
 		fatal("Error creating Ego runtime dir:", err)
 	}
+	// Cleanup: need revert
 	if err := aclUpdatePerm(runDir, uid, aclExecute); err != nil {
 		fatal("Error preparing Ego runtime dir:", err)
-	} else {
-		registerRevertPath(runDir)
 	}
+	// Cleanup: need register control PID
 
 	// Add rwx permissions to Wayland socket (e.g. `/run/user/%d/wayland-0`)
 	if w, ok := os.LookupEnv(waylandDisplay); !ok {
@@ -119,11 +115,9 @@ func main() {
 	} else {
 		// add environment variable for new process
 		env = append(env, waylandDisplay+"="+path.Join(runtime, w))
-		wp := path.Join(runtime, w)
+		// Cleanup: need revert
-		if err := aclUpdatePerm(wp, uid, aclRead, aclWrite, aclExecute); err != nil {
+		if err := aclUpdatePerm(path.Join(runtime, w), uid, aclRead, aclWrite, aclExecute); err != nil {
 			fatal(fmt.Sprintf("Error preparing Wayland '%s':", w), err)
-		} else {
-			registerRevertPath(wp)
 		}
 		if verbose {
 			fmt.Printf("Wayland socket '%s' configured\n", w)
@@ -138,14 +132,12 @@ func main() {
 	} else {
 		// add environment variable for new process
 		env = append(env, display+"="+d)
-
+		// Cleanup: need revert
-		if verbose {
-			fmt.Printf("X11: Adding XHost entry SI:localuser:%s to display '%s'\n", ego.Username, d)
-		}
 		if err := changeHosts(xcbHostModeInsert, xcbFamilyServerInterpreted, "localuser\x00"+ego.Username); err != nil {
 			fatal(fmt.Sprintf("Error adding XHost entry to '%s':", d), err)
-		} else {
+		}
-			xcbActionComplete = true
+		if verbose {
+			fmt.Printf("X11: Adding XHost entry SI:localuser:%s to display '%s'\n", ego.Username, d)
 		}
 	}
 
@@ -165,10 +157,9 @@ func main() {
 	} else {
 		// add environment variable for new process
 		env = append(env, pulseServer+"=unix:"+pulseS)
+		// Cleanup: need revert
 		if err = aclUpdatePerm(pulse, uid, aclExecute); err != nil {
 			fatal("Error preparing PulseAudio:", err)
-		} else {
-			registerRevertPath(pulse)
 		}
 
 		// Ensure permissions of PulseAudio socket `/run/user/%d/pulse/native`
@@ -193,10 +184,9 @@ func main() {
 		if err = copyFile(pulseCookieFinal, pulseCookieSource); err != nil {
 			fatal("Error copying PulseAudio cookie:", err)
 		}
+		// Cleanup: need revert
 		if err = aclUpdatePerm(pulseCookieFinal, uid, aclRead); err != nil {
 			fatal("Error publishing PulseAudio cookie:", err)
-		} else {
-			registerRevertPath(pulseCookieFinal)
 		}
 
 		if verbose {
@@ -259,10 +249,7 @@ func main() {
 		fatal("Error starting process:", err)
 	}
 
-	if err := registerProcess(ego.Uid, cmd); err != nil {
+	// Cleanup: need register
-		// process already started, shouldn't be fatal
-		fmt.Println("Error registering process:", err)
-	}
 
 	var r int
 	if err := cmd.Wait(); err != nil {
@@ -272,10 +259,11 @@ func main() {
 		}
 	}
 
+	// Cleanup: deregister, call revert
+
 	if verbose {
 		fmt.Println("Process exited with exit code", r)
 	}
-	beforeExit()
 	os.Exit(r)
 }
 
@@ -355,3 +343,9 @@ func launchByMachineCtl(bare bool) (args []string) {
 
 	return
 }
+
+func fatal(msg ...any) {
+	// Cleanup: call revert
+	fmt.Println(msg...)
+	os.Exit(1)
+}

state.go

@@ -1,162 +0,0 @@
-package main
-
-import (
-	"encoding/gob"
-	"errors"
-	"flag"
-	"fmt"
-	"io/fs"
-	"os"
-	"os/exec"
-	"path"
-	"strconv"
-)
-
-// we unfortunately have to assume there are never races between processes
-// this and launcher should eventually be replaced by a server process
-
-var (
-	stateActionEarly  bool
-	statePath         string
-	cleanupCandidate  []string
-	xcbActionComplete bool
-)
-
-type launcherState struct {
-	PID      int
-	Launcher string
-	Argv     []string
-	Command  []string
-}
-
-func init() {
-	flag.BoolVar(&stateActionEarly, "state", false, "query state value of current active launchers")
-}
-
-func tryState() {
-	if !stateActionEarly {
-		return
-	}
-
-	launchers, err := readLaunchers()
-	if err != nil {
-		fmt.Println("Error reading launchers:", err)
-		os.Exit(1)
-	}
-
-	fmt.Println("\tPID\tLauncher")
-	for _, state := range launchers {
-		fmt.Printf("\t%d\t%s\nCommand: %s\nArgv: %s\n", state.PID, state.Launcher, state.Command, state.Argv)
-	}
-
-	os.Exit(0)
-}
-
-func registerRevertPath(p string) {
-	cleanupCandidate = append(cleanupCandidate, p)
-}
-
-// called after process start, before wait
-func registerProcess(uid string, cmd *exec.Cmd) error {
-	statePath = path.Join(runDir, uid, strconv.Itoa(cmd.Process.Pid))
-	state := launcherState{
-		PID:      cmd.Process.Pid,
-		Launcher: cmd.Path,
-		Argv:     cmd.Args,
-		Command:  command,
-	}
-
-	if err := os.Mkdir(path.Join(runDir, uid), 0700); err != nil && !errors.Is(err, fs.ErrExist) {
-		return err
-	}
-
-	if f, err := os.OpenFile(statePath, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0600); err != nil {
-		return err
-	} else {
-		defer func() {
-			if f.Close() != nil {
-				// unreachable
-				panic("state file closed prematurely")
-			}
-		}()
-		return gob.NewEncoder(f).Encode(state)
-	}
-}
-
-func readLaunchers() ([]*launcherState, error) {
-	var f *os.File
-	var r []*launcherState
-	launcherPrefix := path.Join(runDir, ego.Uid)
-
-	if pl, err := os.ReadDir(launcherPrefix); err != nil {
-		return nil, err
-	} else {
-		for _, e := range pl {
-			if err = func() error {
-				if f, err = os.Open(path.Join(launcherPrefix, e.Name())); err != nil {
-					return err
-				} else {
-					defer func() {
-						if f.Close() != nil {
-							// unreachable
-							panic("foreign state file closed prematurely")
-						}
-					}()
-
-					var s launcherState
-					r = append(r, &s)
-					return gob.NewDecoder(f).Decode(&s)
-				}
-			}(); err != nil {
-				return nil, err
-			}
-		}
-	}
-
-	return r, nil
-}
-
-func beforeExit() {
-	if err := os.Remove(statePath); err != nil && !errors.Is(err, fs.ErrNotExist) {
-		fmt.Println("Error removing state file:", err)
-	}
-
-	if a, err := readLaunchers(); err != nil {
-		fmt.Println("Error reading active launchers:", err)
-		os.Exit(1)
-	} else if len(a) > 0 {
-		// other launchers are still active
-		if verbose {
-			fmt.Printf("Found %d active launchers, exiting without cleaning up\n", len(a))
-		}
-		return
-	}
-
-	if verbose {
-		fmt.Println("No other launchers active, will clean up")
-	}
-
-	if xcbActionComplete {
-		if verbose {
-			fmt.Printf("X11: Removing XHost entry SI:localuser:%s\n", ego.Username)
-		}
-		if err := changeHosts(xcbHostModeDelete, xcbFamilyServerInterpreted, "localuser\x00"+ego.Username); err != nil {
-			fmt.Println("Error removing XHost entry:", err)
-		}
-	}
-
-	for _, candidate := range cleanupCandidate {
-		if err := aclUpdatePerm(candidate, uid); err != nil {
-			fmt.Printf("Error stripping ACL entry from '%s': %s\n", candidate, err)
-		}
-		if verbose {
-			fmt.Printf("Stripped ACL entry for user '%s' from '%s'\n", ego.Username, candidate)
-		}
-	}
-}
-
-func fatal(msg ...any) {
-	fmt.Println(msg...)
-	beforeExit()
-	os.Exit(1)
-}