mirror of
https://github.com/fleetdm/fleet
synced 2026-04-21 21:47:20 +00:00
Resolves #36024 and #34501. Main change is about stop using the first user in the `users` command output [*] and instead use `loginctl` commands to pick the correct current active GUI user. [*] `users` was returning empty on some new distributions, and in multi-sessions we were always picking the first one (even if it wasn't active). - [X] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. ## Testing - [x] QA'd all new/changed functionality manually ## fleetd/orbit/Fleet Desktop - [x] Verified compatibility with the latest released version of Fleet (see [Must rule](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/workflows/fleetd-development-and-release-strategy.md)) - [x] If the change applies to only one platform, confirmed that `runtime.GOOS` is used as needed to isolate changes - [x] Verified that fleetd runs on macOS, Linux and Windows - [x] Verified auto-update works from the released version of component to the new version (see [tools/tuf/test](../tools/tuf/test/README.md)) <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit ## Release Notes * **Bug Fixes** * Fixed Fleet Desktop startup to correctly detect and use the active GUI session on Linux systems. * Improved GUI user detection for dialog prompts, ensuring system dialogs run in the proper user context. * **Improvements** * Enhanced error reporting and logging clarity for GUI session detection failures. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
248 lines
7.4 KiB
Go
248 lines
7.4 KiB
Go
package execuser
|
|
|
|
import (
|
|
"bufio"
|
|
"bytes"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"os/exec"
|
|
"path/filepath"
|
|
"regexp"
|
|
"sort"
|
|
"strings"
|
|
|
|
userpkg "github.com/fleetdm/fleet/v4/orbit/pkg/user"
|
|
"github.com/rs/zerolog/log"
|
|
)
|
|
|
|
// base command to setup an exec.Cmd using `runuser`
|
|
func baserun(path string, opts eopts) (cmd *exec.Cmd, err error) {
|
|
if opts.user == "" {
|
|
return nil, errors.New("missing user")
|
|
}
|
|
|
|
args, env, err := getConfigForCommand(opts.user, path)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("get args: %w", err)
|
|
}
|
|
|
|
env = append(env,
|
|
// Append the packaged libayatana-appindicator3 libraries path to LD_LIBRARY_PATH.
|
|
//
|
|
// Fleet Desktop doesn't use libayatana-appindicator3 since 1.18.3, but we need to
|
|
// keep this to support older versions of Fleet Desktop.
|
|
fmt.Sprintf("LD_LIBRARY_PATH=%s:%s", filepath.Dir(path), os.ExpandEnv("$LD_LIBRARY_PATH")),
|
|
)
|
|
|
|
for _, nv := range opts.env {
|
|
env = append(env, fmt.Sprintf("%s=%s", nv[0], nv[1]))
|
|
}
|
|
|
|
// Hold any command line arguments to pass to the command.
|
|
cmdArgs := make([]string, 0, len(opts.args)*2)
|
|
if len(opts.args) > 0 {
|
|
for _, arg := range opts.args {
|
|
cmdArgs = append(cmdArgs, arg[0])
|
|
if arg[1] != "" {
|
|
cmdArgs = append(cmdArgs, arg[1])
|
|
}
|
|
}
|
|
}
|
|
|
|
// Run `env` to setup the environment.
|
|
args = append(args, "env")
|
|
args = append(args, env...)
|
|
// Pass the command and its arguments.
|
|
args = append(args, path)
|
|
args = append(args, cmdArgs...)
|
|
|
|
// Use sudo to run the command as the login user.
|
|
args = append([]string{"sudo"}, args...)
|
|
|
|
// If a timeout is set, prefix the command with "timeout".
|
|
if opts.timeout > 0 {
|
|
args = append([]string{"timeout", fmt.Sprintf("%ds", int(opts.timeout.Seconds()))}, args...)
|
|
}
|
|
|
|
cmd = exec.Command(args[0], args[1:]...) // #nosec G204
|
|
return
|
|
}
|
|
|
|
// run a command, passing its output to stdout and stderr.
|
|
func run(path string, opts eopts) (lastLogs string, err error) {
|
|
cmd, err := baserun(path, opts)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
cmd.Stderr = os.Stderr
|
|
cmd.Stdout = os.Stdout
|
|
log.Info().Str("cmd", cmd.String()).Msg("running command")
|
|
|
|
if err := cmd.Start(); err != nil {
|
|
return "", fmt.Errorf("open path %q: %w", path, err)
|
|
}
|
|
return "", nil
|
|
}
|
|
|
|
// runWithOutput runs a command and return its output and exit code.
|
|
func runWithOutput(path string, opts eopts) (output []byte, exitCode int, err error) {
|
|
cmd, err := baserun(path, opts)
|
|
if err != nil {
|
|
return nil, -1, err
|
|
}
|
|
|
|
output, err = cmd.Output()
|
|
if err != nil {
|
|
if exitErr, ok := err.(*exec.ExitError); ok {
|
|
exitCode = exitErr.ExitCode()
|
|
return output, exitCode, fmt.Errorf("%q exited with code %d: %w", path, exitCode, err)
|
|
}
|
|
return output, -1, fmt.Errorf("%q error: %w", path, err)
|
|
}
|
|
|
|
return output, exitCode, nil
|
|
}
|
|
|
|
func getUserID(user string) (string, error) {
|
|
uid_, err := exec.Command("id", "-u", user).Output()
|
|
if err != nil {
|
|
return "", fmt.Errorf("failed to execute id command for %q: %w", user, err)
|
|
}
|
|
uid := strings.TrimSpace(string(uid_))
|
|
if uid == "" {
|
|
return "", errors.New("failed to get uid")
|
|
}
|
|
return uid, nil
|
|
}
|
|
|
|
func getDisplayVariableForSession(user string, userID string, displaySessionType userpkg.GuiSessionType) string {
|
|
if displaySessionType == userpkg.GuiSessionTypeX11 {
|
|
x11Display, err := getUserX11Display(user)
|
|
if err != nil {
|
|
log.Error().Err(err).Msg("failed to get X11 display, using default :0")
|
|
// TODO(lucas): Revisit when working on multi-user/multi-session support.
|
|
// Default to display ':0' if user display could not be found.
|
|
// This assumes there's only one desktop session and belongs to the
|
|
// user returned in `getLoginUID'.
|
|
return ":0"
|
|
}
|
|
return x11Display
|
|
}
|
|
|
|
waylandDisplay, err := getUserWaylandDisplay(userID)
|
|
if err != nil {
|
|
log.Error().Err(err).Msg("failed to get wayland display, using default wayland-0")
|
|
// TODO(lucas): Revisit when working on multi-user/multi-session support.
|
|
// Default to display 'wayland-0' if user display could not be found.
|
|
// This assumes there's only one desktop session and belongs to the
|
|
// user returned in `getLoginUID'.
|
|
return "wayland-0"
|
|
}
|
|
return waylandDisplay
|
|
}
|
|
|
|
func getConfigForCommand(user string, path string) (args []string, env []string, err error) {
|
|
// Get user ID
|
|
userID, err := getUserID(user)
|
|
if err != nil {
|
|
return nil, nil, fmt.Errorf("get user ID: %w", err)
|
|
}
|
|
log.Info().Str("user", user).Str("id", userID).Msg("attempting to get user session type and display")
|
|
|
|
// Get user's display session type.
|
|
userDisplaySession, err := userpkg.GetUserDisplaySessionType(userID)
|
|
if err != nil {
|
|
// Wayland is the default for most distributions,
|
|
// thus we assume wayland if we couldn't determine the session type.
|
|
log.Error().Err(err).Msg("assuming wayland session")
|
|
userDisplaySession = &userpkg.UserDisplaySession{
|
|
Type: userpkg.GuiSessionTypeWayland,
|
|
}
|
|
} else if userDisplaySession.Type == userpkg.GuiSessionTypeTty {
|
|
return nil, nil, fmt.Errorf("user %q (%s) is not running a GUI session", user, userID)
|
|
}
|
|
|
|
// Get user's "display" variable for the GUI session.
|
|
display := getDisplayVariableForSession(user, userID, userDisplaySession.Type)
|
|
|
|
log.Info().
|
|
Str("path", path).
|
|
Str("user", user).
|
|
Str("id", userID).
|
|
Str("display", display).
|
|
Str("session_type", userDisplaySession.Type.String()).
|
|
Msg("running sudo")
|
|
|
|
args = []string{"-n", "-i", "-u", user, "-H"}
|
|
env = make([]string, 0)
|
|
|
|
if userDisplaySession.Type == userpkg.GuiSessionTypeWayland {
|
|
env = append(env, "WAYLAND_DISPLAY="+display)
|
|
// For xdg-open to work on a Wayland session we still need to set the DISPLAY variable.
|
|
x11Display := ":" + strings.TrimPrefix(display, "wayland-")
|
|
env = append(env, "DISPLAY="+x11Display)
|
|
} else {
|
|
env = append(env, "DISPLAY="+display)
|
|
}
|
|
|
|
env = append(env,
|
|
// DBUS_SESSION_BUS_ADDRESS sets the location of the user login session bus.
|
|
// Required by the libayatana-appindicator3 library to display a tray icon
|
|
// on the desktop session.
|
|
//
|
|
// This is required for Ubuntu 18, and not required for Ubuntu 21/22
|
|
// (because it's already part of the user).
|
|
fmt.Sprintf("DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/bus", userID),
|
|
)
|
|
|
|
return args, env, nil
|
|
}
|
|
|
|
var whoLineRegexp = regexp.MustCompile(`(\w+)\s+(:\d+)\s+`)
|
|
|
|
// getUserWaylandDisplay returns the value to set on WAYLAND_DISPLAY for the given user.
|
|
func getUserWaylandDisplay(uid string) (string, error) {
|
|
matches, err := filepath.Glob("/run/user/" + uid + "/wayland-*")
|
|
if err != nil {
|
|
return "", fmt.Errorf("list wayland socket files: %w", err)
|
|
}
|
|
sort.Slice(matches, func(i, j int) bool {
|
|
return matches[i] < matches[j]
|
|
})
|
|
for _, match := range matches {
|
|
if strings.HasSuffix(match, ".lock") {
|
|
continue
|
|
}
|
|
return filepath.Base(match), nil
|
|
}
|
|
return "", errors.New("wayland socket not found")
|
|
}
|
|
|
|
// getUserX11Display returns the value to set on DISPLAY for the given user.
|
|
func getUserX11Display(user string) (string, error) {
|
|
cmd := exec.Command("who")
|
|
var stdout bytes.Buffer
|
|
cmd.Stdout = &stdout
|
|
if err := cmd.Run(); err != nil {
|
|
return "", fmt.Errorf("run 'who' to get user display: %w", err)
|
|
}
|
|
return parseWhoOutputForDisplay(&stdout, user)
|
|
}
|
|
|
|
func parseWhoOutputForDisplay(output io.Reader, user string) (string, error) {
|
|
scanner := bufio.NewScanner(output)
|
|
for scanner.Scan() {
|
|
line := scanner.Text()
|
|
matches := whoLineRegexp.FindStringSubmatch(line)
|
|
if len(matches) > 1 && matches[1] == user {
|
|
return matches[2], nil
|
|
}
|
|
}
|
|
if err := scanner.Err(); err != nil {
|
|
return "", fmt.Errorf("scanner error: %w", err)
|
|
}
|
|
return "", errors.New("display not found on who output")
|
|
}
|