fortify: update help strings
All checks were successful
Test / Create distribution (push) Successful in 30s
Test / Sandbox (push) Successful in 1m58s
Test / Sandbox (race detector) (push) Successful in 3m11s
Test / Fpkg (push) Successful in 4m24s
Test / Fortify (race detector) (push) Successful in 4m58s
Test / Fortify (push) Successful in 3m44s
Test / Flake checks (push) Successful in 1m34s

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Ophestra 2025-05-07 19:06:36 +09:00
parent cb8b886446
commit 23aefcd759
Signed by: cat
SSH Key Fingerprint: SHA256:gQ67O0enBZ7UdZypgtspB2FDM1g3GVw8nX0XSdcFw8Q
3 changed files with 39 additions and 39 deletions

View File

@ -7,24 +7,24 @@ _fortify_app() {
_fortify_run() { _fortify_run() {
_arguments \ _arguments \
'--id[App ID, leave empty to disable security context app_id]:id' \ '--id[Reverse-DNS style Application identifier, leave empty to inherit instance identifier]:id' \
'-a[Fortify application ID]: :_numbers' \ '-a[Application identity]: :_numbers' \
'-g[Groups inherited by the app process]: :_groups' \ '-g[Groups inherited by all container processes]: :_groups' \
'-d[Application home directory]: :_files -/' \ '-d[Container home directory]: :_files -/' \
'-u[Passwd name within sandbox]: :_users' \ '-u[Passwd user name within sandbox]: :_users' \
'--wayland[Share Wayland socket]' \ '--wayland[Enable connection to Wayland via security-context-v1]' \
'-X[Share X11 socket and allow connection]' \ '-X[Enable direct connection to X11]' \
'--dbus[Proxy D-Bus connection]' \ '--dbus[Enable proxied connection to D-Bus]' \
'--pulse[Share PulseAudio socket and cookie]' \ '--pulse[Enable direct connection to PulseAudio]' \
'--dbus-config[Path to D-Bus proxy config file]: :_files -g "*.json"' \ '--dbus-config[Path to session bus proxy config file]: :_files -g "*.json"' \
'--dbus-system[Path to system D-Bus proxy config file]: :_files -g "*.json"' \ '--dbus-system[Path to system bus proxy config file]: :_files -g "*.json"' \
'--mpris[Allow owning MPRIS D-Bus path]' \ '--mpris[Allow owning MPRIS D-Bus path]' \
'--dbus-log[Force logging in the D-Bus proxy]' '--dbus-log[Force buffered logging in the D-Bus proxy]'
} }
_fortify_ps() { _fortify_ps() {
_arguments \ _arguments \
'--short[Print instance id]' '--short[List instances only]'
} }
_fortify_show() { _fortify_show() {
@ -78,5 +78,5 @@ __fortify_instances() {
_arguments -C \ _arguments -C \
'-v[Verbose output]' \ '-v[Verbose output]' \
'--json[Format output in JSON when applicable]' \ '--json[Serialise output in JSON when applicable]' \
'*::fortify command:_fortify_commands' '*::fortify command:_fortify_commands'

26
main.go
View File

@ -72,7 +72,7 @@ func buildCommand(out io.Writer) command.Command {
return nil return nil
}). }).
Flag(&flagVerbose, "v", command.BoolFlag(false), "Print debug messages to the console"). Flag(&flagVerbose, "v", command.BoolFlag(false), "Print debug messages to the console").
Flag(&flagJSON, "json", command.BoolFlag(false), "Serialise output as JSON when applicable") Flag(&flagJSON, "json", command.BoolFlag(false), "Serialise output in JSON when applicable")
c.Command("shim", command.UsageInternal, func([]string) error { instance.ShimMain(); return errSuccess }) c.Command("shim", command.UsageInternal, func([]string) error { instance.ShimMain(); return errSuccess })
@ -205,31 +205,31 @@ func buildCommand(out io.Writer) command.Command {
panic("unreachable") panic("unreachable")
}). }).
Flag(&dbusConfigSession, "dbus-config", command.StringFlag("builtin"), Flag(&dbusConfigSession, "dbus-config", command.StringFlag("builtin"),
"Path to D-Bus proxy config file, or \"builtin\" for defaults"). "Path to session bus proxy config file, or \"builtin\" for defaults").
Flag(&dbusConfigSystem, "dbus-system", command.StringFlag("nil"), Flag(&dbusConfigSystem, "dbus-system", command.StringFlag("nil"),
"Path to system D-Bus proxy config file, or \"nil\" to disable"). "Path to system bus proxy config file, or \"nil\" to disable").
Flag(&mpris, "mpris", command.BoolFlag(false), Flag(&mpris, "mpris", command.BoolFlag(false),
"Allow owning MPRIS D-Bus path, has no effect if custom config is available"). "Allow owning MPRIS D-Bus path, has no effect if custom config is available").
Flag(&dbusVerbose, "dbus-log", command.BoolFlag(false), Flag(&dbusVerbose, "dbus-log", command.BoolFlag(false),
"Force logging in the D-Bus proxy"). "Force buffered logging in the D-Bus proxy").
Flag(&fid, "id", command.StringFlag(""), Flag(&fid, "id", command.StringFlag(""),
"App ID, leave empty to disable security context app_id"). "Reverse-DNS style Application identifier, leave empty to inherit instance identifier").
Flag(&aid, "a", command.IntFlag(0), Flag(&aid, "a", command.IntFlag(0),
"Fortify application ID"). "Application identity").
Flag(nil, "g", &groups, Flag(nil, "g", &groups,
"Groups inherited by the app process"). "Groups inherited by all container processes").
Flag(&homeDir, "d", command.StringFlag("os"), Flag(&homeDir, "d", command.StringFlag("os"),
"Application home directory"). "Container home directory").
Flag(&userName, "u", command.StringFlag("chronos"), Flag(&userName, "u", command.StringFlag("chronos"),
"Passwd name within sandbox"). "Passwd user name within sandbox").
Flag(&wayland, "wayland", command.BoolFlag(false), Flag(&wayland, "wayland", command.BoolFlag(false),
"Allow Wayland connections"). "Enable connection to Wayland via security-context-v1").
Flag(&x11, "X", command.BoolFlag(false), Flag(&x11, "X", command.BoolFlag(false),
"Share X11 socket and allow connection"). "Enable direct connection to X11").
Flag(&dBus, "dbus", command.BoolFlag(false), Flag(&dBus, "dbus", command.BoolFlag(false),
"Proxy D-Bus connection"). "Enable proxied connection to D-Bus").
Flag(&pulse, "pulse", command.BoolFlag(false), Flag(&pulse, "pulse", command.BoolFlag(false),
"Share PulseAudio socket and cookie") "Enable direct connection to PulseAudio")
} }
var showFlagShort bool var showFlagShort bool

View File

@ -36,31 +36,31 @@ Commands:
Usage: fortify run [-h | --help] [--dbus-config <value>] [--dbus-system <value>] [--mpris] [--dbus-log] [--id <value>] [-a <int>] [-g <value>] [-d <value>] [-u <value>] [--wayland] [-X] [--dbus] [--pulse] COMMAND [OPTIONS] Usage: fortify run [-h | --help] [--dbus-config <value>] [--dbus-system <value>] [--mpris] [--dbus-log] [--id <value>] [-a <int>] [-g <value>] [-d <value>] [-u <value>] [--wayland] [-X] [--dbus] [--pulse] COMMAND [OPTIONS]
Flags: Flags:
-X Share X11 socket and allow connection -X Enable direct connection to X11
-a int -a int
Fortify application ID Application identity
-d string -d string
Application home directory (default "os") Container home directory (default "os")
-dbus -dbus
Proxy D-Bus connection Enable proxied connection to D-Bus
-dbus-config string -dbus-config string
Path to D-Bus proxy config file, or "builtin" for defaults (default "builtin") Path to session bus proxy config file, or "builtin" for defaults (default "builtin")
-dbus-log -dbus-log
Force logging in the D-Bus proxy Force buffered logging in the D-Bus proxy
-dbus-system string -dbus-system string
Path to system D-Bus proxy config file, or "nil" to disable (default "nil") Path to system bus proxy config file, or "nil" to disable (default "nil")
-g value -g value
Groups inherited by the app process Groups inherited by all container processes
-id string -id string
App ID, leave empty to disable security context app_id Reverse-DNS style Application identifier, leave empty to inherit instance identifier
-mpris -mpris
Allow owning MPRIS D-Bus path, has no effect if custom config is available Allow owning MPRIS D-Bus path, has no effect if custom config is available
-pulse -pulse
Share PulseAudio socket and cookie Enable direct connection to PulseAudio
-u string -u string
Passwd name within sandbox (default "chronos") Passwd user name within sandbox (default "chronos")
-wayland -wayland
Allow Wayland connections Enable connection to Wayland via security-context-v1
`, `,
}, },