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

new: centralized logging and implemented DELETE /api/events route, closes #5

Browse source
This commit is contained in:
evilsocket 2018-01-08 06:39:44 +01:00
parent 269d7d845b
commit f1f146d3d7
21 changed files with 144 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

28
session/modules/http_proxy_script.go
View file

@ -15,6 +15,7 @@ type ProxyScript struct {
Source string
VM *otto.Otto
sess *session.Session
gil *sync.Mutex
onRequestScript *otto.Script
onResponseScript *otto.Script
@ -23,7 +24,7 @@ type ProxyScript struct {
}
func LoadProxyScript(path string, sess *session.Session) (err error, s *ProxyScript) {
log.Infof("Loading proxy script %s ...", path)
sess.Events.Log(session.INFO, "Loading proxy script %s ...", path)
raw, err := ioutil.ReadFile(path)
if err != nil {
@ -35,6 +36,7 @@ func LoadProxyScript(path string, sess *session.Session) (err error, s *ProxyScr
Source: string(raw),
VM: otto.New(),
sess: sess,
gil: &sync.Mutex{},
onRequestScript: nil,
onResponseScript: nil,
@ -51,7 +53,7 @@ func LoadProxyScript(path string, sess *session.Session) (err error, s *ProxyScr
// define session pointer
err = s.VM.Set("env", sess.Env.Storage)
if err != nil {
log.Errorf("Error while defining environment: %s", err)
sess.Events.Log(session.ERROR, "Error while defining environment: %s", err)
return
}
@ -59,7 +61,7 @@ func LoadProxyScript(path string, sess *session.Session) (err error, s *ProxyScr
if s.hasCallback("onLoad") {
_, err = s.VM.Run("onLoad()")
if err != nil {
log.Errorf("Error while executing onLoad callback: %s", err)
sess.Events.Log(session.ERROR, "Error while executing onLoad callback: %s", err)
return
}
}
@ -68,7 +70,7 @@ func LoadProxyScript(path string, sess *session.Session) (err error, s *ProxyScr
if s.hasCallback("onRequest") {
s.onRequestScript, err = s.VM.Compile("", "onRequest(req, res)")
if err != nil {
log.Errorf("Error while compiling onRequest callback: %s", err)
sess.Events.Log(session.ERROR, "Error while compiling onRequest callback: %s", err)
return
}
}
@ -77,7 +79,7 @@ func LoadProxyScript(path string, sess *session.Session) (err error, s *ProxyScr
if s.hasCallback("onResponse") {
s.onResponseScript, err = s.VM.Compile("", "onResponse(req, res)")
if err != nil {
log.Errorf("Error while compiling onResponse callback: %s", err)
sess.Events.Log(session.ERROR, "Error while compiling onResponse callback: %s", err)
return
}
}
@ -109,13 +111,13 @@ func (s *ProxyScript) doRequestDefines(req *http.Request) (err error, jsres *JSR
// convert request and define empty response to be optionally filled
jsreq := NewJSRequest(req)
if err = s.VM.Set("req", &jsreq); err != nil {
log.Errorf("Error while defining request: %s", err)
s.sess.Events.Log(session.ERROR, "Error while defining request: %s", err)
return
}
jsres = &JSResponse{}
if err = s.VM.Set("res", jsres); err != nil {
log.Errorf("Error while defining response: %s", err)
s.sess.Events.Log(session.ERROR, "Error while defining response: %s", err)
return
}
@ -126,13 +128,13 @@ func (s *ProxyScript) doResponseDefines(res *http.Response) (err error, jsres *J
// convert both request and response
jsreq := NewJSRequest(res.Request)
if err = s.VM.Set("req", jsreq); err != nil {
log.Errorf("Error while defining request: %s", err)
s.sess.Events.Log(session.ERROR, "Error while defining request: %s", err)
return
}
jsres = NewJSResponse(res)
if err = s.VM.Set("res", jsres); err != nil {
log.Errorf("Error while defining response: %s", err)
s.sess.Events.Log(session.ERROR, "Error while defining response: %s", err)
return
}
@ -146,13 +148,13 @@ func (s *ProxyScript) OnRequest(req *http.Request) *JSResponse {
err, jsres := s.doRequestDefines(req)
if err != nil {
log.Errorf("Error while running bootstrap definitions: %s", err)
s.sess.Events.Log(session.ERROR, "Error while running bootstrap definitions: %s", err)
return nil
}
_, err = s.VM.Run(s.onRequestScript)
if err != nil {
log.Errorf("Error while executing onRequest callback: %s", err)
s.sess.Events.Log(session.ERROR, "Error while executing onRequest callback: %s", err)
return nil
}
@ -171,13 +173,13 @@ func (s *ProxyScript) OnResponse(res *http.Response) *JSResponse {
err, jsres := s.doResponseDefines(res)
if err != nil {
log.Errorf("Error while running bootstrap definitions: %s", err)
s.sess.Events.Log(session.ERROR, "Error while running bootstrap definitions: %s", err)
return nil
}
_, err = s.VM.Run(s.onResponseScript)
if err != nil {
log.Errorf("Error while executing onRequest callback: %s", err)
s.sess.Events.Log(session.ERROR, "Error while executing onRequest callback: %s", err)
return nil
}