security/fortify
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 18 Wiki Activity

app: treat display server variable unset as fatal

Browse Source 
This is yet another remnant of Ego, as Ego unconditionally shares these resources and the absence of them are ignored and warned about in verbose logging. In our case they are individually opt-in so silently dropping them while the enablement is still set makes very little sense.

Signed-off-by: Ophestra Umiker <cat@ophivana.moe>
This commit is contained in:
Ophestra 2024-09-09 00:35:16 +09:00
parent 7450b0b0bb
commit 3242ce3406
Signed by: cat
SSH Key Fingerprint: SHA256:gQ67O0enBZ7UdZypgtspB2FDM1g3GVw8nX0XSdcFw8Q
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/app/wayland.go
View File

@ -20,9 +20,7 @@ func (a *App) ShareWayland() {
// ensure Wayland socket ACL (e.g. `/run/user/%d/wayland-%d`) // ensure Wayland socket ACL (e.g. `/run/user/%d/wayland-%d`)
if w, ok := os.LookupEnv(waylandDisplay); !ok { if w, ok := os.LookupEnv(waylandDisplay); !ok {
if system.V.Verbose { state.Fatal("Wayland: WAYLAND_DISPLAY not set")
fmt.Println("Wayland: WAYLAND_DISPLAY not set, skipping")
}
} else { } else {
// add environment variable for new process // add environment variable for new process
wp := path.Join(system.V.Runtime, w) wp := path.Join(system.V.Runtime, w)

4
internal/app/x.go
View File

@ -16,9 +16,7 @@ func (a *App) ShareX() {
// discovery X11 and grant user permission via the `ChangeHosts` command // discovery X11 and grant user permission via the `ChangeHosts` command
if d, ok := os.LookupEnv(display); !ok { if d, ok := os.LookupEnv(display); !ok {
if system.V.Verbose { state.Fatal("X11: DISPLAY not set")
fmt.Println("X11: DISPLAY not set, skipping")
}
} else { } else {
// add environment variable for new process // add environment variable for new process
a.AppendEnv(display, d) a.AppendEnv(display, d)