mirror of
https://github.com/slackhq/nebula.git
synced 2026-11-15 08:26:52 +01:00
smoke-extra / freebsd-amd64 (push) Failing after 14s
smoke-extra / linux-amd64-ipv6disable (push) Failing after 13s
smoke-extra / netbsd-amd64 (push) Failing after 14s
smoke-extra / openbsd-amd64 (push) Failing after 15s
smoke-extra / linux-386 (push) Failing after 14s
smoke / Run multi node smoke test (push) Failing after 1m46s
Build and test / Static checks (push) Successful in 2m38s
Build and test / Test linux (push) Failing after 1m12s
Build and test / Test linux-pkcs11 (push) Failing after 2m6s
Build and test / Test linux-boringcrypto (push) Failing after 3m0s
Build and test / Test linux-fips140 (push) Failing after 2m56s
Build and test / Cross-build linux-arm (push) Successful in 3m10s
Build and test / Cross-build linux-mips (push) Successful in 3m55s
Build and test / Cross-build linux-other (push) Successful in 3m15s
Build and test / Cross-build windows (push) Successful in 1m5s
Build and test / Cross-build freebsd (push) Successful in 1m37s
Build and test / Cross-build netbsd (push) Successful in 1m36s
Build and test / Cross-build openbsd (push) Successful in 1m35s
Build and test / Cross-build mobile (push) Successful in 3m32s
smoke-extra / Run windows smoke test (push) Canceled after 0s
smoke / Run self traffic smoke test on macOS (push) Canceled after 0s
Build and test / Test macos (push) Canceled after 0s
Build and test / Test windows (push) Canceled after 0s
Build and test / CI status (push) Canceled after 0s
Report ssh command failures to the surface (#1959) The ssh debug commands told the user when something went wrong but never told the surface that ran them, so `ssh host cmd` always exited 0 and a few failures were not reported at all. A failed command now returns its error, a failure the user has already heard about is a commands.Failure, and the ssh exec path exits 1 for either. The command bodies also lose their ssh prefixes and the duplication they carried over from ssh.go; both goldens pin that nothing else changed. - Dispatch returns the callback's error, or shlex's; the ssh session logs it at debug, and not at all for a Failure the user already saw - commands.Fail writes a message and returns it as a Failure in one step; an unknown command, `help` for a command that is not there, a failed reload and an unbalanced quote are failures - ssh exec exit-status is 1 for a command, flag or failure error, 0 otherwise; the e2e golden records the exit status for every case - Clone rebinds help to the copy, so an ssh session's help lists logout and `help logout` and `logout -h` answer; sshd.LogoutCommand is the session's logout, exported for tests - "did not understand" names the first word only, the one looked up; DispatchArgs takes just the tokens - log-format writes its refusal to the user, as log-level does - print-relays emits the relay error as a string and omits the key when there is none, where it printed {} or "Error":null - list-hostmap and list-lighthouse-addrmap -json return the encode error; print-cert reports a certificate that will not marshal - a flags type that is not the one registered is an internal error, not a silent success - command functions and flag types are <name>Command and <name>Flags; parseVpnAddr and listHostMapFlagSet replace the repeated parse block and flag set; close-tunnel sends through sendCloseTunnel Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
84 lines
2.5 KiB
Go
84 lines
2.5 KiB
Go
package commands
|
|
|
|
import (
|
|
"flag"
|
|
)
|
|
|
|
// CommandFlags is called before help or command execution to parse command line flags.
|
|
// It should return a flag.FlagSet instance and a pointer to the struct that will contain parsed flags
|
|
type CommandFlags func() (*flag.FlagSet, any)
|
|
|
|
// CommandCallback is called when your command should execute.
|
|
// fs will be a pointer to the struct provided by Command.Flags callback, if there was one. -h and -help are reserved
|
|
// and handled automatically for you.
|
|
// a will be any unconsumed arguments, if no Command.Flags was available this will be all the flags passed in.
|
|
// w is the writer to use when sending messages back to the client.
|
|
// An error returned by the callback is handed back to whoever dispatched the command, which reports a failure: exit
|
|
// status 1 over ssh. The error is not shown to the user. For a failure the user caused or can act on, write the
|
|
// message and return it as a *Failure, which Fail does in one step; the surface then reports the failure without
|
|
// logging what the user was already told. Any other error is logged by the surface as well.
|
|
type CommandCallback func(fs any, a []string, w StringWriter) error
|
|
|
|
type Command struct {
|
|
Name Name
|
|
ShortDescription string
|
|
Help string
|
|
|
|
Flags CommandFlags
|
|
Callback CommandCallback
|
|
}
|
|
|
|
// Failure is the error a command returns for a failure it has already explained to the user:
|
|
// the message it wrote is the whole story. A surface reports it as a failure and does not
|
|
// log it.
|
|
type Failure struct {
|
|
Msg string
|
|
}
|
|
|
|
func (f *Failure) Error() string {
|
|
return f.Msg
|
|
}
|
|
|
|
// Fail writes msg to w and returns it as a *Failure, so a command reports a failure to the
|
|
// user and to its surface in one line. If the write itself fails, that error is returned
|
|
// instead: the user was not told anything.
|
|
func Fail(w StringWriter, msg string) error {
|
|
if err := w.WriteLine(msg); err != nil {
|
|
return err
|
|
}
|
|
return &Failure{Msg: msg}
|
|
}
|
|
|
|
func execCommand(c *Command, args []string, w StringWriter) error {
|
|
var (
|
|
fl *flag.FlagSet
|
|
fs any
|
|
)
|
|
|
|
if c.Flags != nil {
|
|
fl, fs = c.Flags()
|
|
if fl != nil {
|
|
// SetOutput() here in case fl.Parse dumps usage.
|
|
fl.SetOutput(w.GetWriter())
|
|
err := fl.Parse(args)
|
|
if err != nil {
|
|
// fl.Parse has dumped error information to the user via the w writer.
|
|
return err
|
|
}
|
|
args = fl.Args()
|
|
}
|
|
}
|
|
|
|
return c.Callback(fs, args, w)
|
|
}
|
|
|
|
func checkHelpArgs(args []string) bool {
|
|
for _, a := range args {
|
|
if a == "-h" || a == "-help" {
|
|
return true
|
|
}
|
|
}
|
|
|
|
return false
|
|
}
|