From d60a59d2c64009a5af8a108ac7be9587a3ce685f Mon Sep 17 00:00:00 2001 From: Mzack9999 Date: Mon, 6 Jul 2020 20:11:19 +0200 Subject: [PATCH 1/2] removed problematic early optimization --- v2/pkg/executor/executer_http.go | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/v2/pkg/executor/executer_http.go b/v2/pkg/executor/executer_http.go index c743d47bb8..002e06aad4 100644 --- a/v2/pkg/executor/executer_http.go +++ b/v2/pkg/executor/executer_http.go @@ -17,7 +17,6 @@ import ( "github.com/pkg/errors" "github.com/projectdiscovery/gologger" - "github.com/projectdiscovery/nuclei/v2/pkg/extractors" "github.com/projectdiscovery/nuclei/v2/pkg/matchers" "github.com/projectdiscovery/nuclei/v2/pkg/requests" "github.com/projectdiscovery/nuclei/v2/pkg/templates" @@ -156,12 +155,7 @@ mainLoop: var headers string matcherCondition := e.httpRequest.GetMatchersCondition() for _, matcher := range e.httpRequest.Matchers { - // Only build the headers string if the matcher asks for it - part := matcher.GetPart() - if part == matchers.AllPart || part == matchers.HeaderPart && headers == "" { - headers = headersToString(resp.Header) - } - + headers = headersToString(resp.Header) // Check if the matcher matched if !matcher.Match(resp, body, headers) { // If the condition is AND we haven't matched, try next request. @@ -182,10 +176,7 @@ mainLoop: // next task which is extraction of input from matchers. var extractorResults []string for _, extractor := range e.httpRequest.Extractors { - part := extractor.GetPart() - if part == extractors.AllPart || part == extractors.HeaderPart && headers == "" { - headers = headersToString(resp.Header) - } + headers = headersToString(resp.Header) for match := range extractor.Extract(body, headers) { extractorResults = append(extractorResults, match) } From 678f543f17421c66945b0bcb8a1917d5d6c107c2 Mon Sep 17 00:00:00 2001 From: Mzack9999 Date: Mon, 6 Jul 2020 20:15:07 +0200 Subject: [PATCH 2/2] fixed new path --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 70071d0c85..f228e93bc7 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -20,8 +20,8 @@ jobs: - name: Test run: go test . - working-directory: cmd/nuclei/ + working-directory: v2/cmd/nuclei/ - name: Build run: go build . - working-directory: cmd/nuclei/ \ No newline at end of file + working-directory: v2/cmd/nuclei/ \ No newline at end of file