github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-07-14 17:13:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

refact: misc refactoring and fixes to proxy builtin functions

Browse source
This commit is contained in:
evilsocket 2018-02-22 15:27:07 +01:00
parent 28ca00e480
commit 87800ef2dd
1 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

28
modules/http_proxy_script_builtins.go
View file

@ -8,21 +8,32 @@ import (
"github.com/robertkrimen/otto" "github.com/robertkrimen/otto"
) )
var nullOtto = otto.Value{}
func errOtto(format string, args ...interface{}) otto.Value {
log.Error(format, args...)
return nullOtto
}
// define functions available to proxy scripts // define functions available to proxy scripts
func (s *ProxyScript) defineBuiltins() error { func (s *ProxyScript) defineBuiltins() error {
// used to read a file ... doh // used to read a file ... doh
s.VM.Set("readFile", func(call otto.FunctionCall) otto.Value { s.VM.Set("readFile", func(call otto.FunctionCall) otto.Value {
filename := call.Argument(0).String() argv := call.ArgumentList
argc := len(argv)
if argc != 1 {
return errOtto("readFile: expected 1 argument, %d given instead.", argc)
}
filename := argv[0].String()
raw, err := ioutil.ReadFile(filename) raw, err := ioutil.ReadFile(filename)
if err != nil { if err != nil {
log.Error("Could not read %s: %s", filename, err) return errOtto("Could not read %s: %s", filename, err)
return otto.Value{}
} }
v, err := s.VM.ToValue(string(raw)) v, err := s.VM.ToValue(string(raw))
if err != nil { if err != nil {
log.Error("Could not convert to string: %s", err) return errOtto("Could not convert to string: %s", err)
return otto.Value{}
} }
return v return v
}) })
@ -46,8 +57,7 @@ func (s *ProxyScript) defineBuiltins() error {
if found, varValue := s.sess.Env.Get(varName); found == true { if found, varValue := s.sess.Env.Get(varName); found == true {
v, err := s.VM.ToValue(varValue) v, err := s.VM.ToValue(varValue)
if err != nil { if err != nil {
log.Error("Could not convert to string: %s", varValue) return errOtto("Could not convert to string: %s", varValue)
return otto.Value{}
} }
return v return v
} }
@ -57,9 +67,11 @@ func (s *ProxyScript) defineBuiltins() error {
varName := call.Argument(0).String() varName := call.Argument(0).String()
varValue := call.Argument(1).String() varValue := call.Argument(1).String()
s.sess.Env.Set(varName, varValue) s.sess.Env.Set(varName, varValue)
} else {
return errOtto("env: expected 1 or 2 arguments, %d given instead.", argc)
} }
return otto.Value{} return nullOtto
}) })
return nil return nil