kamikazechaser/vise
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add descriptive input checker error

Browse Source
This commit is contained in:
lash 2023-04-06 12:47:09 +01:00
parent 2989b23b93
commit 397985f1ae
Signed by untrusted user who does not match committer: lash
GPG Key ID: 21D2E7BB88C2A746
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
go/engine/engine.go
View File

@ -13,7 +13,8 @@ import (
) )
var ( var (
inputRegex = regexp.MustCompile("^[a-zA-Z0-9].*$") inputRegexStr = "^[a-zA-Z0-9].*$"
inputRegex = regexp.MustCompile(inputRegexStr)
) )
// //
//type Config struct { //type Config struct {
@ -50,9 +51,10 @@ func(en *Engine) Init(sym string, ctx context.Context) error {
return nil return nil
} }
// return descriptive error if client input is invalid
func checkInput(input []byte) error { func checkInput(input []byte) error {
if !inputRegex.Match(input) { if !inputRegex.Match(input) {
return fmt.Errorf("Invalid input format: %s", input) return fmt.Errorf("Input '%s' does not match format /%s/", input, inputRegexStr)
} }
return nil return nil
} }
@ -70,12 +72,13 @@ func checkInput(input []byte) error {
func (en *Engine) Exec(input []byte, ctx context.Context) (bool, error) { func (en *Engine) Exec(input []byte, ctx context.Context) (bool, error) {
err := checkInput(input) err := checkInput(input)
if err != nil { if err != nil {
return false, err return true, err
} }
err = en.st.SetInput(input) err = en.st.SetInput(input)
if err != nil { if err != nil {
return false, err return false, err
} }
log.Printf("new execution with input '%s' (0x%x)", input, input) log.Printf("new execution with input '%s' (0x%x)", input, input)
code, err := en.st.GetCode() code, err := en.st.GetCode()
if err != nil { if err != nil {