opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-20 19:19:06 +08:00
Code Issues Projects Releases Wiki Activity

commands: Ensure command output is correct type (if cmd.Type is set), resolves #321

Browse Source
This commit is contained in:
Matt Bell
2014-11-13 01:09:57 -08:00
committed by Juan Batiz-Benet
parent c973776049
commit 3b407c705d
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
commands/command.go
View File

@ -4,6 +4,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"io" "io"
"reflect"
"strings" "strings"
u "github.com/jbenet/go-ipfs/util" u "github.com/jbenet/go-ipfs/util"
@ -64,6 +65,8 @@ var ErrNotCallable = errors.New("This command can't be called directly. Try one
var ErrNoFormatter = errors.New("This command cannot be formatted to plain text") var ErrNoFormatter = errors.New("This command cannot be formatted to plain text")
var ErrIncorrectType = errors.New("The command returned a value with a different type than expected")
// Call invokes the command for the given Request // Call invokes the command for the given Request
func (c *Command) Call(req Request) Response { func (c *Command) Call(req Request) Response {
res := NewResponse(req) res := NewResponse(req)
@ -106,6 +109,17 @@ func (c *Command) Call(req Request) Response {
return res return res
} }
// If the command specified an output type, ensure the actual value returned is of that type
if cmd.Type != nil {
definedType := reflect.ValueOf(cmd.Type).Type()
actualType := reflect.ValueOf(output).Type()
if definedType != actualType {
res.SetError(ErrIncorrectType, ErrNormal)
return res
}
}
// clean up the request (close the readers, e.g. fileargs) // clean up the request (close the readers, e.g. fileargs)
// NOTE: this means commands can't expect to keep reading after cmd.Run returns (in a goroutine) // NOTE: this means commands can't expect to keep reading after cmd.Run returns (in a goroutine)
err = req.Cleanup() err = req.Cleanup()