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

refact: returning pointers for both js request and js response

Browse source
This commit is contained in:
evilsocket 2018-03-05 16:14:26 +01:00
parent 291b95b5f7
commit cb58258bd7
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/http_proxy_js_request.go
View file

@ -27,7 +27,7 @@ type JSRequest struct {
req *http.Request req *http.Request
} }
func NewJSRequest(req *http.Request) JSRequest { func NewJSRequest(req *http.Request) *JSRequest {
headers := make([]JSHeader, 0) headers := make([]JSHeader, 0)
cType := "" cType := ""
@ -41,7 +41,7 @@ func NewJSRequest(req *http.Request) JSRequest {
} }
} }
return JSRequest{ return &JSRequest{
Client: strings.Split(req.RemoteAddr, ":")[0], Client: strings.Split(req.RemoteAddr, ":")[0],
Method: req.Method, Method: req.Method,
Version: fmt.Sprintf("%d.%d", req.ProtoMajor, req.ProtoMinor), Version: fmt.Sprintf("%d.%d", req.ProtoMajor, req.ProtoMinor),

2
modules/http_proxy_script.go
View file

@ -63,7 +63,7 @@ func LoadHttpProxyScript(path string, sess *session.Session) (err error, s *Http
func (s *HttpProxyScript) doRequestDefines(req *http.Request) (err error, jsres *JSResponse) { func (s *HttpProxyScript) doRequestDefines(req *http.Request) (err error, jsres *JSResponse) {
// convert request and define empty response to be optionally filled // convert request and define empty response to be optionally filled
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", err) log.Error("Error while defining request: %s", err)
return return
} }

4
session/session_core_handlers.go
View file

@ -153,11 +153,11 @@ func (s *Session) sleepHandler(args []string, sess *Session) error {
func (s *Session) getHandler(args []string, sess *Session) error { func (s *Session) getHandler(args []string, sess *Session) error {
key := args[0] key := args[0]
if strings.Contains(key, "*") { if strings.Contains(key, "*") {
prev_ns := "" prev_ns := ""
fmt.Println() fmt.Println()
last := len(key) - 1 last := len(key) - 1
prefix := key[:last] prefix := key[:last]
for _, k := range s.Env.Sorted() { for _, k := range s.Env.Sorted() {
if strings.HasPrefix(k, prefix) { if strings.HasPrefix(k, prefix) {