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

misc: small fix or general refactoring i did not bother commenting

Browse source
This commit is contained in:
evilsocket 2018-05-22 12:46:46 +02:00
parent 5ef0df0e7a
commit a3ef4e66f0
No known key found for this signature in database
GPG key ID: 1564D7F30393A456
2 changed files with 17 additions and 17 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", "\nTraceback:\n " + err.(*otto.Error).String() ) 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", "\nTraceback:\n " + err.(*otto.Error).String() ) 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", "\nTraceback:\n " + err.(*otto.Error).String() ) log.Error("Error while executing onLoad callback: %s", "\nTraceback:\n "+err.(*otto.Error).String())
return return
} }
} }

28
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", "\nTraceback:\n " + err.(*otto.Error).String() ) 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", "\nTraceback:\n " + err.(*otto.Error).String() ) 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", "\nTraceback:\n " + err.(*otto.Error).String() ) log.Error("Error while compiling onCommand callback: %s", "\nTraceback:\n "+err.(*otto.Error).String())
return return
} }
} }
@ -71,13 +71,13 @@ func LoadHttpProxyScript(path string, sess *session.Session) (err error, s *Http
func (s *HttpProxyScript) doRequestDefines(req *http.Request) (err error, jsreq *JSRequest, jsres *JSResponse) { func (s *HttpProxyScript) doRequestDefines(req *http.Request) (err error, jsreq *JSRequest, jsres *JSResponse) {
jsreq = NewJSRequest(req) jsreq = NewJSRequest(req)
if err = s.VM.Set("req", jsreq); err != nil { if err = s.VM.Set("req", jsreq); err != nil {
log.Error( "Error while defining request: %s", "\nTraceback:\n " + err.(*otto.Error).String() ) log.Error("Error while defining request: %s", "\nTraceback:\n "+err.(*otto.Error).String())
return return
} }
jsres = NewJSResponse(nil) jsres = NewJSResponse(nil)
if err = s.VM.Set("res", jsres); err != nil { if err = s.VM.Set("res", jsres); err != nil {
log.Error( "Error while defining response: %s", "\nTraceback:\n " + err.(*otto.Error).String() ) log.Error("Error while defining response: %s", "\nTraceback:\n "+err.(*otto.Error).String())
return return
} }
return return
@ -86,13 +86,13 @@ func (s *HttpProxyScript) doRequestDefines(req *http.Request) (err error, jsreq
func (s *HttpProxyScript) doResponseDefines(res *http.Response) (err error, jsreq *JSRequest, jsres *JSResponse) { func (s *HttpProxyScript) doResponseDefines(res *http.Response) (err error, jsreq *JSRequest, jsres *JSResponse) {
jsreq = NewJSRequest(res.Request) jsreq = NewJSRequest(res.Request)
if err = s.VM.Set("req", jsreq); err != nil { if err = s.VM.Set("req", jsreq); err != nil {
log.Error( "Error while defining request: %s", "\nTraceback:\n " + err.(*otto.Error).String() ) log.Error("Error while defining request: %s", "\nTraceback:\n "+err.(*otto.Error).String())
return return
} }
jsres = NewJSResponse(res) jsres = NewJSResponse(res)
if err = s.VM.Set("res", jsres); err != nil { if err = s.VM.Set("res", jsres); err != nil {
log.Error( "Error while defining response: %s", "\nTraceback:\n " + err.(*otto.Error).String() ) log.Error("Error while defining response: %s", "\nTraceback:\n "+err.(*otto.Error).String())
return return
} }
@ -101,7 +101,7 @@ func (s *HttpProxyScript) doResponseDefines(res *http.Response) (err error, jsre
func (s *HttpProxyScript) doCommandDefines(cmd string) (err error) { func (s *HttpProxyScript) doCommandDefines(cmd string) (err error) {
if err = s.VM.Set("cmd", cmd); err != nil { if err = s.VM.Set("cmd", cmd); err != nil {
log.Error( "Error while defining cmd: %s", "\nTraceback:\n " + err.(*otto.Error).String() ) log.Error("Error while defining cmd: %s", "\nTraceback:\n "+err.(*otto.Error).String())
} }
return return
} }
@ -114,12 +114,12 @@ func (s *HttpProxyScript) OnRequest(original *http.Request) (jsreq *JSRequest, j
defer s.Unlock() defer s.Unlock()
if err, jsreq, jsres = s.doRequestDefines(original); err != nil { if err, jsreq, jsres = s.doRequestDefines(original); err != nil {
log.Error( "Error while running bootstrap definitions: %s", "\nTraceback:\n " + err.(*otto.Error).String() ) log.Error("Error while running bootstrap definitions: %s", "\nTraceback:\n "+err.(*otto.Error).String())
return nil, nil return nil, nil
} }
if _, err = s.VM.Run(s.onRequestScript); err != nil { if _, err = s.VM.Run(s.onRequestScript); err != nil {
log.Error( "Error while executing onRequest callback: %s", "\nTraceback:\n " + err.(*otto.Error).String() ) log.Error("Error while executing onRequest callback: %s", "\nTraceback:\n "+err.(*otto.Error).String())
return nil, nil return nil, nil
} }
@ -143,12 +143,12 @@ func (s *HttpProxyScript) OnResponse(res *http.Response) (jsreq *JSRequest, jsre
defer s.Unlock() defer s.Unlock()
if err, jsreq, jsres = s.doResponseDefines(res); err != nil { if err, jsreq, jsres = s.doResponseDefines(res); err != nil {
log.Error( "Error while running bootstrap definitions: %s", "\nTraceback:\n " + err.(*otto.Error).String() ) log.Error("Error while running bootstrap definitions: %s", "\nTraceback:\n "+err.(*otto.Error).String())
return nil, nil return nil, nil
} }
if _, err = s.VM.Run(s.onResponseScript); err != nil { if _, err = s.VM.Run(s.onResponseScript); err != nil {
log.Error( "Error while executing onRequest callback: %s", "\nTraceback:\n " + err.(*otto.Error).String() ) log.Error("Error while executing onRequest callback: %s", "\nTraceback:\n "+err.(*otto.Error).String())
return nil, nil return nil, nil
} }
@ -167,12 +167,12 @@ func (s *HttpProxyScript) OnCommand(cmd string) bool {
defer s.Unlock() defer s.Unlock()
if err := s.doCommandDefines(cmd); err != nil { if err := s.doCommandDefines(cmd); err != nil {
log.Error( "Error while running bootstrap onCommand definitions: %s", "\nTraceback:\n " + err.(*otto.Error).String() ) log.Error("Error while running bootstrap onCommand definitions: %s", "\nTraceback:\n "+err.(*otto.Error).String())
return false return false
} }
if ret, err := s.VM.Run(s.onCommandScript); err != nil { if ret, err := s.VM.Run(s.onCommandScript); err != nil {
log.Error( "Error while executing onCommand callback: %s", "\nTraceback:\n " + err.(*otto.Error).String() ) log.Error("Error while executing onCommand callback: %s", "\nTraceback:\n "+err.(*otto.Error).String())
return false return false
} else if v, err := ret.ToBoolean(); err == nil { } else if v, err := ret.ToBoolean(); err == nil {
return v return v