From df33123bd7f1e0cb4e98580b7e63818c82aa7206 Mon Sep 17 00:00:00 2001 From: Ophestra Umiker Date: Sat, 16 Nov 2024 21:19:45 +0900 Subject: app: integrate fsu This removes the dependency on external user switchers like sudo/machinectl and decouples fortify user ids from the passwd database. Signed-off-by: Ophestra Umiker --- internal/state/print.go | 12 ++++++------ internal/state/state.go | 2 -- 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'internal/state') diff --git a/internal/state/print.go b/internal/state/print.go index 8ca3529e..174f0693 100644 --- a/internal/state/print.go +++ b/internal/state/print.go @@ -67,10 +67,10 @@ func (s *simpleStore) mustPrintLauncherState(w **tabwriter.Writer, now time.Time // write header when initialising if !fmsg.Verbose() { - _, _ = fmt.Fprintln(*w, "\tUID\tPID\tUptime\tEnablements\tMethod\tCommand") + _, _ = fmt.Fprintln(*w, "\tPID\tApp\tUptime\tEnablements\tCommand") } else { // argv is emitted in body when verbose - _, _ = fmt.Fprintln(*w, "\tUID\tPID\tArgv") + _, _ = fmt.Fprintln(*w, "\tPID\tApp\tArgv") } } @@ -96,13 +96,13 @@ func (s *simpleStore) mustPrintLauncherState(w **tabwriter.Writer, now time.Time } if !fmsg.Verbose() { - _, _ = fmt.Fprintf(*w, "\t%s\t%d\t%s\t%s\t%s\t%s\n", - s.path[len(s.path)-1], state.PID, now.Sub(state.Time).Round(time.Second).String(), strings.TrimPrefix(ets.String(), ", "), state.Method, + _, _ = fmt.Fprintf(*w, "\t%d\t%s\t%s\t%s\t%s\n", + state.PID, s.path[len(s.path)-1], now.Sub(state.Time).Round(time.Second).String(), strings.TrimPrefix(ets.String(), ", "), state.Command) } else { // emit argv instead when verbose - _, _ = fmt.Fprintf(*w, "\t%s\t%d\t%s\n", - s.path[len(s.path)-1], state.PID, state.Argv) + _, _ = fmt.Fprintf(*w, "\t%d\t%s\t%s\n", + state.PID, s.path[len(s.path)-1], state.Argv) } } diff --git a/internal/state/state.go b/internal/state/state.go index 81df9655..ee5a95f7 100644 --- a/internal/state/state.go +++ b/internal/state/state.go @@ -33,8 +33,6 @@ type State struct { // capability enablements applied to child Capability system.Enablements - // user switch method - Method string // full argv whe launching Argv []string // process start time -- cgit v1.3.1