adding response time to DSL

projectdiscovery · Sep 29, 2020 · fd1d249 · fd1d249
1 parent fee5099
commit fd1d249
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/v2/pkg/executer/executer_http.go b/v2/pkg/executer/executer_http.go
@@ -173,7 +173,9 @@ func (e *HTTPExecuter) handleHTTP(reqURL string, request *requests.HTTPRequest,
 		fmt.Fprintf(os.Stderr, "%s", string(dumpedRequest))
 	}
 
+	timeStart := time.Now()
 	resp, err := e.httpClient.Do(req)
+	duration := time.Since(timeStart)
 
 	if err != nil {
 		if resp != nil {
@@ -223,7 +225,7 @@ func (e *HTTPExecuter) handleHTTP(reqURL string, request *requests.HTTPRequest,
 
 	for _, matcher := range e.bulkHTTPRequest.Matchers {
 		// Check if the matcher matched
-		if !matcher.Match(resp, body, headers) {
+		if !matcher.Match(resp, body, headers, duration) {
 			// If the condition is AND we haven't matched, try next request.
 			if matcherCondition == matchers.ANDCondition {
 				return nil

diff --git a/v2/pkg/matchers/match.go b/v2/pkg/matchers/match.go
@@ -4,12 +4,13 @@ import (
 	"encoding/hex"
 	"net/http"
 	"strings"
+	"time"
 
 	"github.com/miekg/dns"
 )
 
 // Match matches a http response again a given matcher
-func (m *Matcher) Match(resp *http.Response, body, headers string) bool {
+func (m *Matcher) Match(resp *http.Response, body, headers string, duration time.Duration) bool {
 	switch m.matcherType {
 	case StatusMatcher:
 		return m.isNegative(m.matchStatusCode(resp.StatusCode))
@@ -44,7 +45,7 @@ func (m *Matcher) Match(resp *http.Response, body, headers string) bool {
 		}
 	case DSLMatcher:
 		// Match complex query
-		return m.isNegative(m.matchDSL(httpToMap(resp, body, headers)))
+		return m.isNegative(m.matchDSL(httpToMap(resp, body, headers, duration)))
 	}
 
 	return false

diff --git a/v2/pkg/matchers/util.go b/v2/pkg/matchers/util.go
@@ -5,11 +5,12 @@ import (
 	"net/http"
 	"net/http/httputil"
 	"strings"
+	"time"
 
 	"github.com/miekg/dns"
 )
 
-func httpToMap(resp *http.Response, body, headers string) (m map[string]interface{}) {
+func httpToMap(resp *http.Response, body, headers string, duration time.Duration) (m map[string]interface{}) {
 	m = make(map[string]interface{})
 
 	m["content_length"] = resp.ContentLength
@@ -27,6 +28,9 @@ func httpToMap(resp *http.Response, body, headers string) (m map[string]interfac
 		m["raw"] = string(r)
 	}
 
+	// should be used as int64 within DSL syntax
+	m["duration"] = duration
+
 	return m
 }