github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-20 13:33:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #273 from bettercap/add-js-error-traceback

Browse source 
Print traceback with line numbers for JS errors
This commit is contained in:
Simone Margaritelli 2018-05-09 15:46:24 +02:00 • committed by GitHub
commit a5d26a545f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/base_proxy_script.go
View file

@ -49,13 +49,13 @@ func LoadProxyScriptSource(path, source string, sess *session.Session) (err erro
// define session pointer // define session pointer
err = s.VM.Set("env", sess.Env.Data) err = s.VM.Set("env", sess.Env.Data)
if err != nil { if err != nil {
log.Error("Error while defining environment: %s", err) log.Error( "Error while defining environment: %s", "\nTraceback:\n " + err.(*otto.Error).String() )
return return
} }
err = s.defineBuiltins() err = s.defineBuiltins()
if err != nil { if err != nil {
log.Error("Error while defining builtin functions: %s", err) log.Error( "Error while defining builtin functions: %s", "\nTraceback:\n " + err.(*otto.Error).String() )
return return
} }
@ -63,7 +63,7 @@ func LoadProxyScriptSource(path, source string, sess *session.Session) (err erro
if s.hasCallback("onLoad") { if s.hasCallback("onLoad") {
_, err = s.VM.Run("onLoad()") _, err = s.VM.Run("onLoad()")
if err != nil { if err != nil {
log.Error("Error while executing onLoad callback: %s", err) log.Error( "Error while executing onLoad callback: %s", "\nTraceback:\n " + err.(*otto.Error).String() )
return return
} }
} }

6
modules/http_proxy_script.go
View file

@ -33,7 +33,7 @@ func LoadHttpProxyScriptSource(path, source string, sess *session.Session) (err
if s.hasCallback("onRequest") { if s.hasCallback("onRequest") {
s.onRequestScript, err = s.VM.Compile("", "onRequest(req, res)") s.onRequestScript, err = s.VM.Compile("", "onRequest(req, res)")
if err != nil { if err != nil {
log.Error("Error while compiling onRequest callback: %s", err) log.Error( "Error while compiling onRequest callback: %s", "\nTraceback:\n " + err.(*otto.Error).String() )
return return
} }
} }
@ -41,7 +41,7 @@ func LoadHttpProxyScriptSource(path, source string, sess *session.Session) (err
if s.hasCallback("onResponse") { if s.hasCallback("onResponse") {
s.onResponseScript, err = s.VM.Compile("", "onResponse(req, res)") s.onResponseScript, err = s.VM.Compile("", "onResponse(req, res)")
if err != nil { if err != nil {
log.Error("Error while compiling onResponse callback: %s", err) log.Error( "Error while compiling onResponse callback: %s", "\nTraceback:\n " + err.(*otto.Error).String() )
return return
} }
} }
@ -49,7 +49,7 @@ func LoadHttpProxyScriptSource(path, source string, sess *session.Session) (err
if s.hasCallback("onCommand") { if s.hasCallback("onCommand") {
s.onCommandScript, err = s.VM.Compile("", "onCommand(cmd)") s.onCommandScript, err = s.VM.Compile("", "onCommand(cmd)")
if err != nil { if err != nil {
log.Error("Error while compiling onCommand callback: %s", err) log.Error( "Error while compiling onCommand callback: %s", "\nTraceback:\n " + err.(*otto.Error).String() )
return return
} }
} }