Unverified Commit df393398 authored by Adin Schmahmann's avatar Adin Schmahmann Committed by GitHub

refactor: move external command checks into commands lib (#198)

* refactor: move environment-based command restrictions to be stored with the command itself
parent 0cd468aa
...@@ -90,6 +90,39 @@ type Command struct { ...@@ -90,6 +90,39 @@ type Command struct {
// simple typo in a sub command will invoke the parent command and may // simple typo in a sub command will invoke the parent command and may
// end up returning a cryptic error to the user. // end up returning a cryptic error to the user.
Subcommands map[string]*Command Subcommands map[string]*Command
// NoRemote denotes that a command cannot be executed in a remote environment
NoRemote bool
// NoLocal denotes that a command cannot be executed in a local environment
NoLocal bool
// Extra contains a set of other command-specific parameters
Extra *Extra
}
// Extra is a set of tag information for a command
type Extra struct {
m map[interface{}]interface{}
}
func (e *Extra) SetValue(key, value interface{}) *Extra {
if e == nil {
e = &Extra{}
}
if e.m == nil {
e.m = make(map[interface{}]interface{})
}
e.m[key] = value
return e
}
func (e *Extra) GetValue(key interface{}) (interface{}, bool) {
if e == nil || e.m == nil {
return nil, false
}
val, found := e.m[key]
return val, found
} }
var ( var (
...@@ -141,6 +174,7 @@ func (c *Command) call(req *Request, re ResponseEmitter, env Environment) error ...@@ -141,6 +174,7 @@ func (c *Command) call(req *Request, re ResponseEmitter, env Environment) error
} }
// Resolve returns the subcommands at the given path // Resolve returns the subcommands at the given path
// The returned set of subcommands starts with this command and therefore is always at least size 1
func (c *Command) Resolve(pth []string) ([]*Command, error) { func (c *Command) Resolve(pth []string) ([]*Command, error) {
cmds := make([]*Command, len(pth)+1) cmds := make([]*Command, len(pth)+1)
cmds[0] = c cmds[0] = c
......
...@@ -28,12 +28,19 @@ func parseRequest(r *http.Request, root *cmds.Command) (*cmds.Request, error) { ...@@ -28,12 +28,19 @@ func parseRequest(r *http.Request, root *cmds.Command) (*cmds.Request, error) {
getPath = pth[:len(pth)-1] getPath = pth[:len(pth)-1]
) )
cmd, err := root.Get(getPath) cmdPath, err := root.Resolve(getPath)
if err != nil { if err != nil {
// 404 if there is no command at that path // 404 if there is no command at that path
return nil, ErrNotFound return nil, ErrNotFound
} }
for _, c := range cmdPath {
if c.NoRemote {
return nil, ErrNotFound
}
}
cmd := cmdPath[len(cmdPath)-1]
sub := cmd.Subcommands[pth[len(pth)-1]] sub := cmd.Subcommands[pth[len(pth)-1]]
if sub == nil { if sub == nil {
...@@ -49,6 +56,10 @@ func parseRequest(r *http.Request, root *cmds.Command) (*cmds.Request, error) { ...@@ -49,6 +56,10 @@ func parseRequest(r *http.Request, root *cmds.Command) (*cmds.Request, error) {
cmd = sub cmd = sub
} }
if cmd.NoRemote {
return nil, ErrNotFound
}
opts, stringArgs2 := parseOptions(r) opts, stringArgs2 := parseOptions(r)
optDefs, err := root.GetOptions(pth) optDefs, err := root.GetOptions(pth)
if err != nil { if err != nil {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment