diff options
Diffstat (limited to 'print.go')
| -rw-r--r-- | print.go | 215 |
1 files changed, 110 insertions, 105 deletions
@@ -3,6 +3,7 @@ package main import ( "encoding/json" "fmt" + direct "os" "strings" "text/tabwriter" "time" @@ -15,129 +16,133 @@ import ( func printShow(instance *state.State, config *fst.Config) { if flagJSON { - v := interface{}(config) + v := any(config) if instance != nil { v = instance } - if s, err := json.MarshalIndent(v, "", " "); err != nil { - fmsg.Fatalf("cannot serialise as JSON: %v", err) - panic("unreachable") - } else { - fmt.Println(string(s)) - } - } else { - buf := new(strings.Builder) - w := tabwriter.NewWriter(buf, 0, 1, 4, ' ', 0) + printJSON(v) + return + } - if instance != nil { - fmt.Fprintf(w, "State\n") - fmt.Fprintf(w, " Instance:\t%s (%d)\n", instance.ID.String(), instance.PID) - fmt.Fprintf(w, " Uptime:\t%s\n", time.Now().Sub(instance.Time).Round(time.Second).String()) - fmt.Fprintf(w, "\n") - } + now := time.Now().UTC() + w := tabwriter.NewWriter(direct.Stdout, 0, 1, 4, ' ', 0) - fmt.Fprintf(w, "App\n") - if config.ID != "" { - fmt.Fprintf(w, " ID:\t%d (%s)\n", config.Confinement.AppID, config.ID) - } else { - fmt.Fprintf(w, " ID:\t%d\n", config.Confinement.AppID) + if instance != nil { + fmt.Fprintf(w, "State\n") + fmt.Fprintf(w, " Instance:\t%s (%d)\n", instance.ID.String(), instance.PID) + fmt.Fprintf(w, " Uptime:\t%s\n", now.Sub(instance.Time).Round(time.Second).String()) + fmt.Fprintf(w, "\n") + } + + fmt.Fprintf(w, "App\n") + if config.ID != "" { + fmt.Fprintf(w, " ID:\t%d (%s)\n", config.Confinement.AppID, config.ID) + } else { + fmt.Fprintf(w, " ID:\t%d\n", config.Confinement.AppID) + } + fmt.Fprintf(w, " Enablements:\t%s\n", config.Confinement.Enablements.String()) + if len(config.Confinement.Groups) > 0 { + fmt.Fprintf(w, " Groups:\t%q\n", config.Confinement.Groups) + } + fmt.Fprintf(w, " Directory:\t%s\n", config.Confinement.Outer) + if config.Confinement.Sandbox != nil { + sandbox := config.Confinement.Sandbox + if sandbox.Hostname != "" { + fmt.Fprintf(w, " Hostname:\t%q\n", sandbox.Hostname) } - fmt.Fprintf(w, " Enablements:\t%s\n", config.Confinement.Enablements.String()) - if len(config.Confinement.Groups) > 0 { - fmt.Fprintf(w, " Groups:\t%q\n", config.Confinement.Groups) + flags := make([]string, 0, 7) + writeFlag := func(name string, value bool) { + if value { + flags = append(flags, name) + } } - fmt.Fprintf(w, " Directory:\t%s\n", config.Confinement.Outer) - if config.Confinement.Sandbox != nil { - sandbox := config.Confinement.Sandbox - if sandbox.Hostname != "" { - fmt.Fprintf(w, " Hostname:\t%q\n", sandbox.Hostname) + writeFlag("userns", sandbox.UserNS) + writeFlag("net", sandbox.Net) + writeFlag("dev", sandbox.Dev) + writeFlag("tty", sandbox.NoNewSession) + writeFlag("mapuid", sandbox.MapRealUID) + writeFlag("directwl", sandbox.DirectWayland) + writeFlag("autoetc", sandbox.AutoEtc) + if len(flags) == 0 { + flags = append(flags, "none") + } + fmt.Fprintf(w, " Flags:\t%s\n", strings.Join(flags, " ")) + fmt.Fprintf(w, " Overrides:\t%s\n", strings.Join(sandbox.Override, " ")) + + // Env map[string]string `json:"env"` + // Link [][2]string `json:"symlink"` + } else { + // this gets printed before everything else + fmt.Println("WARNING: current configuration uses permissive defaults!") + } + fmt.Fprintf(w, " Command:\t%s\n", strings.Join(config.Command, " ")) + fmt.Fprintf(w, "\n") + + if config.Confinement.Sandbox != nil && len(config.Confinement.Sandbox.Filesystem) > 0 { + fmt.Fprintf(w, "Filesystem:\n") + for _, f := range config.Confinement.Sandbox.Filesystem { + expr := new(strings.Builder) + if f.Device { + expr.WriteString(" d") + } else if f.Write { + expr.WriteString(" w") + } else { + expr.WriteString(" ") } - flags := make([]string, 0, 7) - writeFlag := func(name string, value bool) { - if value { - flags = append(flags, name) - } + if f.Must { + expr.WriteString("*") + } else { + expr.WriteString("+") } - writeFlag("userns", sandbox.UserNS) - writeFlag("net", sandbox.Net) - writeFlag("dev", sandbox.Dev) - writeFlag("tty", sandbox.NoNewSession) - writeFlag("mapuid", sandbox.MapRealUID) - writeFlag("directwl", sandbox.DirectWayland) - writeFlag("autoetc", sandbox.AutoEtc) - if len(flags) == 0 { - flags = append(flags, "none") + expr.WriteString(f.Src) + if f.Dst != "" { + expr.WriteString(":" + f.Dst) } - fmt.Fprintf(w, " Flags:\t%s\n", strings.Join(flags, " ")) - fmt.Fprintf(w, " Overrides:\t%s\n", strings.Join(sandbox.Override, " ")) - - // Env map[string]string `json:"env"` - // Link [][2]string `json:"symlink"` - } else { - // this gets printed before everything else - fmt.Println("WARNING: current configuration uses permissive defaults!") + fmt.Fprintf(w, "%s\n", expr.String()) } - fmt.Fprintf(w, " Command:\t%s\n", strings.Join(config.Command, " ")) fmt.Fprintf(w, "\n") + } - if config.Confinement.Sandbox != nil && len(config.Confinement.Sandbox.Filesystem) > 0 { - fmt.Fprintf(w, "Filesystem:\n") - for _, f := range config.Confinement.Sandbox.Filesystem { - expr := new(strings.Builder) - if f.Device { - expr.WriteString(" d") - } else if f.Write { - expr.WriteString(" w") - } else { - expr.WriteString(" ") - } - if f.Must { - expr.WriteString("*") - } else { - expr.WriteString("+") - } - expr.WriteString(f.Src) - if f.Dst != "" { - expr.WriteString(":" + f.Dst) - } - fmt.Fprintf(w, "%s\n", expr.String()) - } - fmt.Fprintf(w, "\n") + printDBus := func(c *dbus.Config) { + fmt.Fprintf(w, " Filter:\t%v\n", c.Filter) + if len(c.See) > 0 { + fmt.Fprintf(w, " See:\t%q\n", c.See) } - - printDBus := func(c *dbus.Config) { - fmt.Fprintf(w, " Filter:\t%v\n", c.Filter) - if len(c.See) > 0 { - fmt.Fprintf(w, " See:\t%q\n", c.See) - } - if len(c.Talk) > 0 { - fmt.Fprintf(w, " Talk:\t%q\n", c.Talk) - } - if len(c.Own) > 0 { - fmt.Fprintf(w, " Own:\t%q\n", c.Own) - } - if len(c.Call) > 0 { - fmt.Fprintf(w, " Call:\t%q\n", c.Call) - } - if len(c.Broadcast) > 0 { - fmt.Fprintf(w, " Broadcast:\t%q\n", c.Broadcast) - } + if len(c.Talk) > 0 { + fmt.Fprintf(w, " Talk:\t%q\n", c.Talk) } - if config.Confinement.SessionBus != nil { - fmt.Fprintf(w, "Session bus\n") - printDBus(config.Confinement.SessionBus) - fmt.Fprintf(w, "\n") + if len(c.Own) > 0 { + fmt.Fprintf(w, " Own:\t%q\n", c.Own) } - if config.Confinement.SystemBus != nil { - fmt.Fprintf(w, "System bus\n") - printDBus(config.Confinement.SystemBus) - fmt.Fprintf(w, "\n") + if len(c.Call) > 0 { + fmt.Fprintf(w, " Call:\t%q\n", c.Call) } - - if err := w.Flush(); err != nil { - fmsg.Fatalf("cannot flush tabwriter: %v", err) + if len(c.Broadcast) > 0 { + fmt.Fprintf(w, " Broadcast:\t%q\n", c.Broadcast) } - fmt.Print(buf.String()) + } + if config.Confinement.SessionBus != nil { + fmt.Fprintf(w, "Session bus\n") + printDBus(config.Confinement.SessionBus) + fmt.Fprintf(w, "\n") + } + if config.Confinement.SystemBus != nil { + fmt.Fprintf(w, "System bus\n") + printDBus(config.Confinement.SystemBus) + fmt.Fprintf(w, "\n") + } + + if err := w.Flush(); err != nil { + fmsg.Fatalf("cannot flush tabwriter: %v", err) + } +} + +func printJSON(v any) { + encoder := json.NewEncoder(direct.Stdout) + encoder.SetIndent("", " ") + if err := encoder.Encode(v); err != nil { + fmsg.Fatalf("cannot serialise as JSON: %v", err) + panic("unreachable") } } |