From e3273ea4fdbdbb2e8a34b3993a31001ae0feb66e Mon Sep 17 00:00:00 2001
From: RebeccaMahany <rebeccamahany@gmail.com>
Date: Mon, 24 Jun 2024 10:49:39 -0400
Subject: [PATCH] Parse json before declaring success, add documentation

---
 ee/consoleuser/consoleuser_linux.go | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/ee/consoleuser/consoleuser_linux.go b/ee/consoleuser/consoleuser_linux.go
index 6692ee91a..17adb2249 100644
--- a/ee/consoleuser/consoleuser_linux.go
+++ b/ee/consoleuser/consoleuser_linux.go
@@ -20,17 +20,11 @@ type listSessionsResult []struct {
 }
 
 func CurrentUids(ctx context.Context) ([]string, error) {
-	output, err := listSessions(ctx)
+	sessions, err := listSessions(ctx)
 	if err != nil {
 		return nil, fmt.Errorf("listing sessions: %w", err)
 	}
 
-	// unmarshall json output into listSessionsResult
-	var sessions listSessionsResult
-	if err := json.Unmarshal(output, &sessions); err != nil {
-		return nil, fmt.Errorf("loginctl list-sessions unmarshall json output: %w", err)
-	}
-
 	var uids []string
 	for _, s := range sessions {
 		// generally human users start at 1000 on linux. 65534 is reserved for https://wiki.ubuntu.com/nobody,
@@ -70,7 +64,12 @@ func CurrentUids(ctx context.Context) ([]string, error) {
 	return uids, nil
 }
 
-func listSessions(ctx context.Context) ([]byte, error) {
+// listSessions execs `loginctl list-sessions` in order to retrieve the current list of sessions.
+// Depending on the systemd version, we have to use different flags to output the results as JSON.
+// We may want to attempt parsing the output regardless in the future -- see launcher #1522.
+func listSessions(ctx context.Context) (listSessionsResult, error) {
+	var sessions listSessionsResult
+
 	// Try with `--output=json` first, to support the more widely-used older versions of systemd
 	legacyCmd, err := allowedcmd.Loginctl(ctx, "list-sessions", "--no-legend", "--no-pager", "--output=json")
 	if err != nil {
@@ -78,7 +77,11 @@ func listSessions(ctx context.Context) ([]byte, error) {
 	}
 	legacyOut, err := legacyCmd.Output()
 	if err == nil {
-		return legacyOut, nil
+		// Newer versions of systemd ignore `--output=json` rather than returning an error, so we also
+		// need to unmarshal the result to confirm we got expected output.
+		if err := json.Unmarshal(legacyOut, &sessions); err == nil {
+			return sessions, nil
+		}
 	}
 
 	cmd, err := allowedcmd.Loginctl(ctx, "list-sessions", "--no-legend", "--no-pager", "--json=short")
@@ -89,6 +92,9 @@ func listSessions(ctx context.Context) ([]byte, error) {
 	if err != nil {
 		return nil, fmt.Errorf("loginctl list-sessions: %w", err)
 	}
+	if err := json.Unmarshal(output, &sessions); err != nil {
+		return nil, fmt.Errorf("unmarshalling loginctl list-sessions output: %w", err)
+	}
 
-	return output, nil
+	return sessions, nil
 }