Ophestra Umiker
1906853382
In the past Wayland, X and PulseAudio are shared unconditionally. This can unnecessarily increase attack surface as some of these resources might not be needed at all. This commit moves all environment preparation code to the internal app package and selectively call them based on flags. An "enablements" bitfield is introduced tracking all enabled shares. This value is registered after successful child process launch and stored in launcher states. Code responsible for running the child process is isolated to its own app/run file and cleaned up. Launch method selection is also extensively cleaned up. The internal state/track readLaunchers function now takes uid as an argument. Launcher state is now printed using text/tabwriter and argv is only emitted when verbose. Signed-off-by: Ophestra Umiker <cat@ophivana.moe>
64 lines
1.1 KiB
Go
64 lines
1.1 KiB
Go
package app
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"os"
|
|
"os/user"
|
|
"strconv"
|
|
|
|
"git.ophivana.moe/cat/fortify/internal/state"
|
|
"git.ophivana.moe/cat/fortify/internal/system"
|
|
)
|
|
|
|
type App struct {
|
|
uid int
|
|
env []string
|
|
command []string
|
|
|
|
enablements state.Enablements
|
|
*user.User
|
|
|
|
// absolutely *no* method of this type is thread-safe
|
|
// so don't treat it as if it is
|
|
}
|
|
|
|
func (a *App) setEnablement(e state.Enablement) {
|
|
if a.enablements.Has(e) {
|
|
panic("enablement " + e.String() + " set twice")
|
|
}
|
|
|
|
a.enablements |= e.Mask()
|
|
}
|
|
|
|
func New(userName string, args []string) *App {
|
|
a := &App{command: args}
|
|
|
|
if u, err := user.Lookup(userName); err != nil {
|
|
if errors.As(err, new(user.UnknownUserError)) {
|
|
fmt.Println("unknown user", userName)
|
|
} else {
|
|
// unreachable
|
|
panic(err)
|
|
}
|
|
|
|
// too early for fatal
|
|
os.Exit(1)
|
|
} else {
|
|
a.User = u
|
|
}
|
|
|
|
if u, err := strconv.Atoi(a.Uid); err != nil {
|
|
// usually unreachable
|
|
panic("uid parse")
|
|
} else {
|
|
a.uid = u
|
|
}
|
|
|
|
if system.V.Verbose {
|
|
fmt.Println("Running as user", a.Username, "("+a.Uid+"),", "command:", a.command)
|
|
}
|
|
|
|
return a
|
|
}
|