diff --git a/v2/internal/runner/runner.go b/v2/internal/runner/runner.go index 519f64d64..becd659e5 100644 --- a/v2/internal/runner/runner.go +++ b/v2/internal/runner/runner.go @@ -259,7 +259,7 @@ func (r *Runner) RunEnumeration() { Executer: clusterer.NewExecuter(cluster, &executerOpts), TotalRequests: len(cluster[0].RequestsHTTP), }) - clusterCount++ + clusterCount += len(cluster) } else { for _, item := range cluster { finalTemplates = append(finalTemplates, item) diff --git a/v2/pkg/protocols/headless/engine/page_actions.go b/v2/pkg/protocols/headless/engine/page_actions.go index ed6ce1246..76038540f 100644 --- a/v2/pkg/protocols/headless/engine/page_actions.go +++ b/v2/pkg/protocols/headless/engine/page_actions.go @@ -194,7 +194,7 @@ func (p *Page) RunScript(action *Action, out map[string]string) error { if err != nil { return err } - if data != nil { + if data != nil && action.Name != "" { out[action.Name] = data.Value.String() } return nil @@ -447,7 +447,7 @@ func (p *Page) pageElementBy(data map[string]string) (*rod.Element, error) { page := p.page switch by { - case "r": + case "r", "regex": return page.ElementR(data["selector"], data["regex"]) case "x", "xpath": return page.ElementX(data["xpath"]) diff --git a/v2/pkg/protocols/http/request.go b/v2/pkg/protocols/http/request.go index 725f9f3f3..f7b2c9a19 100644 --- a/v2/pkg/protocols/http/request.go +++ b/v2/pkg/protocols/http/request.go @@ -336,8 +336,8 @@ func (r *Request) executeRequest(reqURL string, request *generatedRequest, dynam } } - var matchedURL string - if request.rawRequest != nil { + matchedURL := reqURL + if request.rawRequest != nil && request.rawRequest.FullURL != "" { matchedURL = request.rawRequest.FullURL } if request.request != nil {