Merge pull request #5529 from projectdiscovery/dev

v3.3.1

.github/ISSUE_TEMPLATE/issue-report.md

@@ -18,6 +18,11 @@ labels: 'Type: Bug'
 <!-- We only accept issues that are reproducible on the latest version of nuclei. -->
 <!-- You can find the latest version of project at https://github.com/projectdiscovery/nuclei/releases/ -->
 
+## Nuclei command:
+
+<!-- Provide the exact command you used to run Nuclei. -->
+<!-- Please redact any literal target hosts/URLs or other sensitive information. -->
+
 ### Current Behavior:
 <!-- A concise description of what you're experiencing. -->
 

.github/workflows/build-test.yml

@@ -12,28 +12,23 @@ jobs:
     name: Test Builds
     strategy:
       matrix:
-        go-version: [1.21.x]
         os: [ubuntu-latest, windows-latest, macOS-latest]
-
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: ${{ matrix.go-version }}
+      - name: Check out code
+        uses: actions/checkout@v4
 
-      - name: Set up Python   # required for running python code in py-snippet.yaml integration test
+      - name: Set up Go
+        uses: projectdiscovery/actions/setup/go@v1
+
+      # required for running python code in py-snippet.yaml integration test
+      - name: Set up Python
         uses: actions/setup-python@v4
         with:
           python-version: '3.10'
 
-      - name: Check out code
-        uses: actions/checkout@v3
-
-      - name: Go Mod hygiene
-        run: |
-          go clean -modcache
-          go mod tidy
+      - name: Verify Go modules
+        run: make verify
 
       - name: Build
         run: go build .
@@ -65,9 +60,10 @@ jobs:
         run: go run .
         working-directory: examples/simple/
 
-      - name: Example SDK Advanced
-        run: go run .
-        working-directory: examples/advanced/
+      # Temporarily disabled very flaky in github actions
+      # - name: Example SDK Advanced
+      #   run: go run .
+      #   working-directory: examples/advanced/
 
       - name: Example SDK with speed control
         run: go run .

.github/workflows/functional-test.yml

@@ -15,13 +15,11 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: 1.21.x
-
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: projectdiscovery/actions/setup/go@v1
 
       - name: Functional Tests
         env:

.github/workflows/lint-test.yml

@@ -12,16 +12,11 @@ jobs:
     name: Lint Test
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: 1.21.x
-
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: projectdiscovery/actions/setup/go@v1
 
       - name: Run golangci-lint
-        uses: golangci/[email protected]
-        with:
-          version: latest
-          args: --timeout 5m
+        uses: projectdiscovery/actions/golangci-lint@v1

.github/workflows/performance-test.yaml

@@ -11,24 +11,19 @@ jobs:
     name: Test Performance
     strategy:
       matrix:
-        go-version: [1.21.x]
         os: [ubuntu-latest, macOS-latest]
 
     runs-on: ${{ matrix.os }}
     if: github.repository == 'projectdiscovery/nuclei'
     steps:
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: ${{ matrix.go-version }}
-
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Go Mod hygine
-        run: |
-          go clean -modcache
-          go mod tidy
+      - name: Set up Go
+        uses: projectdiscovery/actions/setup/go@v1
+
+      - name: Verify Go modules
+        run: make verify
 
       # Max GH exection time 6H => timeout after that
       - name: Running performance with big list

.github/workflows/publish-docs.yaml

@@ -11,14 +11,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with: 
           fetch-depth: 0
 
       - name: "Set up Go"
-        uses: actions/setup-go@v4
-        with: 
-          go-version: 1.21.x
+        uses: projectdiscovery/actions/setup/go@v1
+
+      - name: "Set up Git"
+        uses: projectdiscovery/actions/setup/git@v1
 
       - name: Generate YAML Syntax Documentation
         id: generate-docs
@@ -35,8 +36,6 @@ jobs:
       - name: Commit files
         if: steps.generate-docs.outputs.CHANGES > 0
         run: |
-          git config --local user.email "[email protected]"
-          git config --local user.name "GitHub Action"
           git add SYNTAX-REFERENCE.md nuclei-jsonschema.json
           git commit -m "Auto Generate Syntax Docs + JSONSchema [$(date)] :robot:" -a
 

.github/workflows/release-binary.yml

@@ -9,20 +9,17 @@ on:
 jobs: 
   release: 
     runs-on: ubuntu-latest-16-cores
-
     steps: 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with: 
           fetch-depth: 0
 
-      - uses: actions/setup-go@v4
-        with: 
-          go-version: 1.21.x
+      - name: Set up Go
+        uses: projectdiscovery/actions/setup/go@v1
 
-      - uses: goreleaser/goreleaser-action@v4
+      - uses: projectdiscovery/actions/goreleaser@v1
         with: 
-          args: "release --clean"
-          version: latest
+          release: true
         env: 
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           SLACK_WEBHOOK: "${{ secrets.RELEASE_SLACK_WEBHOOK }}"

.github/workflows/release-test.yml

@@ -12,17 +12,12 @@ jobs:
     runs-on: ubuntu-latest-16-cores
     steps:
       - name: "Check out code"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with: 
           fetch-depth: 0
 
       - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: 1.21.x
+        uses: projectdiscovery/actions/setup/go@v1
       
-      - name: release test
-        uses: goreleaser/goreleaser-action@v4
-        with:
-          args: "release --clean --snapshot"
-          version: latest
+      - name: Release snapshot
+        uses: projectdiscovery/actions/goreleaser@v1

.github/workflows/template-validate.yml

@@ -10,10 +10,9 @@ jobs:
   build:
     runs-on: ubuntu-latest-16-cores
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
-        with: 
-          go-version: 1.21.x
+      - uses: actions/checkout@v4
+
+      - uses: projectdiscovery/actions/setup/go@v1
 
       - name: Template Validation
         run: |

Makefile

@@ -11,7 +11,7 @@ ifneq ($(shell go env GOOS),darwin)
 LDFLAGS := -extldflags "-static"
 endif
     
-.PHONY: all build build-stats scan-charts docs test integration functional tidy devtools jsupdate ts fuzzplayground memogen dsl-docs
+.PHONY: all build build-stats scan-charts docs test integration functional tidy verify devtools jsupdate ts fuzzplayground memogen dsl-docs
 
 all: build
 build:
@@ -39,6 +39,8 @@ functional:
 	cd cmd/functional-test; bash run.sh
 tidy:
 	$(GOMOD) tidy
+verify: tidy
+	$(GOMOD) verify
 devtools:
 	$(GOBUILD) $(GOFLAGS) -ldflags '$(LDFLAGS)' -o "bindgen" pkg/js/devtools/bindgen/cmd/bindgen/main.go
 	$(GOBUILD) $(GOFLAGS) -ldflags '$(LDFLAGS)' -o "tsgen" pkg/js/devtools/tsgen/cmd/tsgen/main.go

README.md

@@ -179,6 +179,7 @@ OUTPUT:
    -se, -sarif-export string     file to export results in SARIF format
    -je, -json-export string      file to export results in JSON format
    -jle, -jsonl-export string    file to export results in JSONL(ine) format
+   -rd, -redact string[]         redact given list of keys from query parameter, request header and body
 
 CONFIGURATIONS:
    -config string                        path to the nuclei configuration file
@@ -203,7 +204,6 @@ CONFIGURATIONS:
    -sml, -show-match-line                show match lines for file templates, works with extractors only
    -ztls                                 use ztls library with autofallback to standard one for tls13 [Deprecated] autofallback to ztls is enabled by default
    -sni string                           tls sni hostname to use (default: input domain name)
-   -dt, -dialer-timeout value            timeout for network requests.
    -dka, -dialer-keep-alive value        keep-alive duration for network requests.
    -lfa, -allow-local-file-access        allows file (payload) access anywhere on the system
    -lna, -restrict-local-network-access  blocks connections to the local / private network
@@ -212,7 +212,6 @@ CONFIGURATIONS:
    -sip, -source-ip string               source ip address to use for network scan
    -rsr, -response-size-read int         max response size to read in bytes
    -rss, -response-size-save int         max response size to read in bytes (default 1048576)
-   -rrt, -response-read-timeout value    response read timeout in seconds (default 5s)
    -reset                                reset removes all nuclei configuration and data files (including nuclei-templates)
    -tlsi, -tls-impersonate               enable experimental client hello (ja3) tls randomization
    -hae, -http-api-endpoint string       experimental http api endpoint
@@ -238,7 +237,7 @@ FUZZING:
 UNCOVER:
    -uc, -uncover                  enable uncover engine
    -uq, -uncover-query string[]   uncover search query
-   -ue, -uncover-engine string[]  uncover search engine (shodan,censys,fofa,shodan-idb,quake,hunter,zoomeye,netlas,criminalip,publicwww,hunterhow) (default shodan)
+   -ue, -uncover-engine string[]  uncover search engine (shodan,censys,fofa,shodan-idb,quake,hunter,zoomeye,netlas,criminalip,publicwww,hunterhow,google) (default shodan)
    -uf, -uncover-field string     uncover fields to return (ip,port,host) (default "ip:port")
    -ul, -uncover-limit int        uncover results to return (default 100)
    -ur, -uncover-ratelimit int    override ratelimit of engines with unknown ratelimit (default 60 req/min) (default 60)
@@ -311,9 +310,11 @@ STATISTICS:
    -mp, -metrics-port int    port to expose nuclei metrics on (default 9092)
 
 CLOUD:
-   -auth                  configure projectdiscovery cloud (pdcp) api key
-   -cup, -cloud-upload    upload scan results to pdcp dashboard
-   -sid, -scan-id string  upload scan results to given scan id
+   -auth                      configure projectdiscovery cloud (pdcp) api key (default true)
+   -tid, -team-id string      upload scan results to given team id (optional) (default "none")
+   -cup, -cloud-upload        upload scan results to pdcp dashboard
+   -sid, -scan-id string      upload scan results to existing scan id (optional)
+   -sname, -scan-name string  scan name to set (optional)
 
 AUTHENTICATION:
    -sf, -secret-file string[]  path to config file containing secrets for nuclei authenticated scan

SYNTAX-REFERENCE.md

@@ -1404,6 +1404,19 @@ Valid values:
 
 <div class="dd">
 
+<code>skip-secret-file</code>  <i>bool</i>
+
+</div>
+<div class="dt">
+
+SkipSecretFile skips the authentication or authorization configured in the secret file.
+
+</div>
+
+<hr />
+
+<div class="dd">
+
 <code>cookie-reuse</code>  <i>bool</i>
 
 </div>
@@ -4339,19 +4352,6 @@ Code contains code to execute for the javascript request.
 
 <div class="dd">
 
-<code>timeout</code>  <i>int</i>
-
-</div>
-<div class="dt">
-
-Timeout in seconds is optional timeout for each  javascript script execution (i.e init, pre-condition, code)
-
-</div>
-
-<hr />
-
-<div class="dd">
-
 <code>stop-at-first-match</code>  <i>bool</i>
 
 </div>

cmd/integration-test/loader.go

@@ -172,7 +172,14 @@ func (h *nonExistentTemplateList) Execute(nonExistingTemplateList string) error
 	ts := httptest.NewServer(router)
 	defer ts.Close()
 
-	_, err := testutils.RunNucleiBareArgsAndGetResults(debug, nil, "-target", ts.URL, "-template-url", ts.URL+"/404")
+	configFileData := `remote-template-domain: [ "` + ts.Listener.Addr().String() + `" ]`
+	err := os.WriteFile("test-config.yaml", []byte(configFileData), permissionutil.ConfigFilePermission)
+	if err != nil {
+		return err
+	}
+	defer os.Remove("test-config.yaml")
+
+	_, err = testutils.RunNucleiBareArgsAndGetResults(debug, nil, "-target", ts.URL, "-template-url", ts.URL+"/404", "-config", "test-config.yaml")
 	if err == nil {
 		return fmt.Errorf("expected error for nonexisting workflow url")
 	}
@@ -188,7 +195,14 @@ func (h *nonExistentWorkflowList) Execute(nonExistingWorkflowList string) error
 	ts := httptest.NewServer(router)
 	defer ts.Close()
 
-	_, err := testutils.RunNucleiBareArgsAndGetResults(debug, nil, "-target", ts.URL, "-workflow-url", ts.URL+"/404")
+	configFileData := `remote-template-domain: [ "` + ts.Listener.Addr().String() + `" ]`
+	err := os.WriteFile("test-config.yaml", []byte(configFileData), permissionutil.ConfigFilePermission)
+	if err != nil {
+		return err
+	}
+	defer os.Remove("test-config.yaml")
+
+	_, err = testutils.RunNucleiBareArgsAndGetResults(debug, nil, "-target", ts.URL, "-workflow-url", ts.URL+"/404", "-config", "test-config.yaml")
 	if err == nil {
 		return fmt.Errorf("expected error for nonexisting workflow url")
 	}

cmd/nuclei/main.go

@@ -12,6 +12,7 @@ import (
 	"strings"
 	"time"
 
+	_pdcp "github.com/projectdiscovery/nuclei/v3/internal/pdcp"
 	"github.com/projectdiscovery/utils/auth/pdcp"
 	"github.com/projectdiscovery/utils/env"
 	_ "github.com/projectdiscovery/utils/pprof"
@@ -272,6 +273,7 @@ on extensive configurability, massive extensibility and ease of use.`)
 		flagSet.StringVarP(&options.SarifExport, "sarif-export", "se", "", "file to export results in SARIF format"),
 		flagSet.StringVarP(&options.JSONExport, "json-export", "je", "", "file to export results in JSON format"),
 		flagSet.StringVarP(&options.JSONLExport, "jsonl-export", "jle", "", "file to export results in JSONL(ine) format"),
+		flagSet.StringSliceVarP(&options.Redact, "redact", "rd", nil, "redact given list of keys from query parameter, request header and body", goflags.CommaSeparatedStringSliceOptions),
 	)
 
 	flagSet.CreateGroup("configs", "Configurations",
@@ -297,7 +299,6 @@ on extensive configurability, massive extensibility and ease of use.`)
 		flagSet.BoolVarP(&options.ShowMatchLine, "show-match-line", "sml", false, "show match lines for file templates, works with extractors only"),
 		flagSet.BoolVar(&options.ZTLS, "ztls", false, "use ztls library with autofallback to standard one for tls13 [Deprecated] autofallback to ztls is enabled by default"), //nolint:all
 		flagSet.StringVar(&options.SNI, "sni", "", "tls sni hostname to use (default: input domain name)"),
-		flagSet.DurationVarP(&options.DialerTimeout, "dialer-timeout", "dt", 0, "timeout for network requests."),
 		flagSet.DurationVarP(&options.DialerKeepAlive, "dialer-keep-alive", "dka", 0, "keep-alive duration for network requests."),
 		flagSet.BoolVarP(&options.AllowLocalFileAccess, "allow-local-file-access", "lfa", false, "allows file (payload) access anywhere on the system"),
 		flagSet.BoolVarP(&options.RestrictLocalNetworkAccess, "restrict-local-network-access", "lna", false, "blocks connections to the local / private network"),
@@ -306,7 +307,6 @@ on extensive configurability, massive extensibility and ease of use.`)
 		flagSet.StringVarP(&options.SourceIP, "source-ip", "sip", "", "source ip address to use for network scan"),
 		flagSet.IntVarP(&options.ResponseReadSize, "response-size-read", "rsr", 0, "max response size to read in bytes"),
 		flagSet.IntVarP(&options.ResponseSaveSize, "response-size-save", "rss", unitutils.Mega, "max response size to read in bytes"),
-		flagSet.DurationVarP(&options.ResponseReadTimeout, "response-read-timeout", "rrt", time.Duration(5*time.Second), "response read timeout in seconds"),
 		flagSet.CallbackVar(resetCallback, "reset", "reset removes all nuclei configuration and data files (including nuclei-templates)"),
 		flagSet.BoolVarP(&options.TlsImpersonate, "tls-impersonate", "tlsi", false, "enable experimental client hello (ja3) tls randomization"),
 		flagSet.StringVarP(&options.HttpApiEndpoint, "http-api-endpoint", "hae", "", "experimental http api endpoint"),
@@ -419,6 +419,7 @@ on extensive configurability, massive extensibility and ease of use.`)
 
 	flagSet.CreateGroup("cloud", "Cloud",
 		flagSet.DynamicVar(&pdcpauth, "auth", "true", "configure projectdiscovery cloud (pdcp) api key"),
+		flagSet.StringVarP(&options.TeamID, "team-id", "tid", _pdcp.TeamIDEnv, "upload scan results to given team id (optional)"),
 		flagSet.BoolVarP(&options.EnableCloudUpload, "cloud-upload", "cup", false, "upload scan results to pdcp dashboard"),
 		flagSet.StringVarP(&options.ScanID, "scan-id", "sid", "", "upload scan results to existing scan id (optional)"),
 		flagSet.StringVarP(&options.ScanName, "scan-name", "sname", "", "scan name to set (optional)"),

cmd/tmc/main.go

@@ -162,7 +162,7 @@ func process(opts options) error {
 			var updated bool // if max-requests is updated
 			dataString, updated, err = parseAndAddMaxRequests(templateCatalog, path, dataString)
 			if err != nil {
-				gologger.Info().Label("max-request").Msgf(logErrMsg(path, err, opts.debug, errFile))
+				gologger.Info().Label("max-request").Msg(logErrMsg(path, err, opts.debug, errFile))
 			} else {
 				if updated {
 					gologger.Info().Label("max-request").Msgf("✅ updated template: %s\n", path)
@@ -255,7 +255,7 @@ func enhanceTemplate(data string) (string, bool, error) {
 		return data, false, errorutil.New("validation failed").WithTag("validate")
 	}
 	if templateResp.Error.Name != "" {
-		return data, false, errorutil.New(templateResp.Error.Name)
+		return data, false, errorutil.New("%s", templateResp.Error.Name)
 	}
 	if strings.TrimSpace(templateResp.Enhanced) == "" && !templateResp.Lint {
 		if templateResp.LintError.Reason != "" {
@@ -289,7 +289,7 @@ func formatTemplate(data string) (string, bool, error) {
 		return data, false, errorutil.New("validation failed").WithTag("validate")
 	}
 	if templateResp.Error.Name != "" {
-		return data, false, errorutil.New(templateResp.Error.Name)
+		return data, false, errorutil.New("%s", templateResp.Error.Name)
 	}
 	if strings.TrimSpace(templateResp.Updated) == "" && !templateResp.Lint {
 		if templateResp.LintError.Reason != "" {
@@ -345,7 +345,7 @@ func validateTemplate(data string) (bool, error) {
 		return false, errorutil.New("validation failed").WithTag("validate")
 	}
 	if validateResp.Error.Name != "" {
-		return false, errorutil.New(validateResp.Error.Name)
+		return false, errorutil.New("%s", validateResp.Error.Name)
 	}
 	return false, errorutil.New("template validation failed")
 }

examples/advanced/advanced.go

@@ -1,13 +1,24 @@
 package main
 
 import (
+	"context"
+
 	nuclei "github.com/projectdiscovery/nuclei/v3/lib"
+	"github.com/projectdiscovery/nuclei/v3/pkg/installer"
 	syncutil "github.com/projectdiscovery/utils/sync"
 )
 
 func main() {
+	ctx := context.Background()
+	// when running nuclei in parallel for first time it is a good practice to make sure
+	// templates exists first
+	tm := installer.TemplateManager{}
+	if err := tm.FreshInstallIfNotExists(); err != nil {
+		panic(err)
+	}
+
 	// create nuclei engine with options
-	ne, err := nuclei.NewThreadSafeNucleiEngine()
+	ne, err := nuclei.NewThreadSafeNucleiEngineCtx(ctx)
 	if err != nil {
 		panic(err)
 	}

examples/simple/simple.go

@@ -1,9 +1,13 @@
 package main
 
-import nuclei "github.com/projectdiscovery/nuclei/v3/lib"
+import (
+	"context"
+
+	nuclei "github.com/projectdiscovery/nuclei/v3/lib"
+)
 
 func main() {
-	ne, err := nuclei.NewNucleiEngine(
+	ne, err := nuclei.NewNucleiEngineCtx(context.Background(),
 		nuclei.WithTemplateFilters(nuclei.TemplateFilters{Tags: []string{"oast"}}),
 		nuclei.EnableStatsWithOpts(nuclei.StatsOptions{MetricServerPort: 6064}), // optionally enable metrics server for better observability
 	)

go.mod

@@ -20,12 +20,12 @@ require (
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/pkg/errors v0.9.1
 	github.com/projectdiscovery/clistats v0.0.20
-	github.com/projectdiscovery/fastdialer v0.1.5
-	github.com/projectdiscovery/hmap v0.0.47
+	github.com/projectdiscovery/fastdialer v0.2.3
+	github.com/projectdiscovery/hmap v0.0.54
 	github.com/projectdiscovery/interactsh v1.2.0
-	github.com/projectdiscovery/rawhttp v0.1.51
-	github.com/projectdiscovery/retryabledns v1.0.65
-	github.com/projectdiscovery/retryablehttp-go v1.0.66
+	github.com/projectdiscovery/rawhttp v0.1.60
+	github.com/projectdiscovery/retryabledns v1.0.69
+	github.com/projectdiscovery/retryablehttp-go v1.0.71
 	github.com/projectdiscovery/yamldoc-go v1.0.4
 	github.com/remeh/sizedwaitgroup v1.0.0
 	github.com/rs/xid v1.5.0
@@ -58,44 +58,46 @@ require (
 	github.com/aws/aws-sdk-go-v2/credentials v1.13.27
 	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.72
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.37.0
+	github.com/cespare/xxhash v1.1.0
 	github.com/charmbracelet/glamour v0.6.0
 	github.com/clbanning/mxj/v2 v2.7.0
-	github.com/denisenkom/go-mssqldb v0.12.3
 	github.com/ditashi/jsbeautifier-go v0.0.0-20141206144643-2520a8026a9c
 	github.com/docker/go-units v0.5.0
 	github.com/dop251/goja v0.0.0-20240220182346-e401ed450204
 	github.com/fatih/structs v1.1.0
-	github.com/getkin/kin-openapi v0.123.0
+	github.com/getkin/kin-openapi v0.126.0
 	github.com/go-git/go-git/v5 v5.11.0
 	github.com/go-ldap/ldap/v3 v3.4.5
 	github.com/go-pg/pg v8.0.7+incompatible
 	github.com/go-sql-driver/mysql v1.7.1
 	github.com/h2non/filetype v1.1.3
+	github.com/invopop/yaml v0.3.1
 	github.com/labstack/echo/v4 v4.10.2
 	github.com/leslie-qiwa/flat v0.0.0-20230424180412-f9d1cf014baa
 	github.com/lib/pq v1.10.9
 	github.com/mattn/go-sqlite3 v1.14.22
 	github.com/mholt/archiver v3.1.1+incompatible
+	github.com/microsoft/go-mssqldb v1.6.0
 	github.com/ory/dockertest/v3 v3.10.0
 	github.com/praetorian-inc/fingerprintx v1.1.9
-	github.com/projectdiscovery/dsl v0.1.3
+	github.com/projectdiscovery/dsl v0.1.8
 	github.com/projectdiscovery/fasttemplate v0.0.2
 	github.com/projectdiscovery/go-smb2 v0.0.0-20240129202741-052cc450c6cb
-	github.com/projectdiscovery/goflags v0.1.56
-	github.com/projectdiscovery/gologger v1.1.12
+	github.com/projectdiscovery/goflags v0.1.63
+	github.com/projectdiscovery/gologger v1.1.19
 	github.com/projectdiscovery/gostruct v0.0.2
 	github.com/projectdiscovery/gozero v0.0.2
-	github.com/projectdiscovery/httpx v1.6.3
+	github.com/projectdiscovery/httpx v1.6.7
 	github.com/projectdiscovery/mapcidr v1.1.34
 	github.com/projectdiscovery/n3iwf v0.0.0-20230523120440-b8cd232ff1f5
-	github.com/projectdiscovery/ratelimit v0.0.45
+	github.com/projectdiscovery/ratelimit v0.0.49
 	github.com/projectdiscovery/rdap v0.9.1-0.20221108103045-9865884d1917
 	github.com/projectdiscovery/sarif v0.0.1
 	github.com/projectdiscovery/tlsx v1.1.6
-	github.com/projectdiscovery/uncover v1.0.8
-	github.com/projectdiscovery/useragent v0.0.56
-	github.com/projectdiscovery/utils v0.1.4
-	github.com/projectdiscovery/wappalyzergo v0.1.6
+	github.com/projectdiscovery/uncover v1.0.9
+	github.com/projectdiscovery/useragent v0.0.65
+	github.com/projectdiscovery/utils v0.2.4
+	github.com/projectdiscovery/wappalyzergo v0.1.14
 	github.com/redis/go-redis/v9 v9.1.0
 	github.com/seh-msft/burpxml v1.0.1
 	github.com/stretchr/testify v1.9.0
@@ -129,7 +131,6 @@ require (
 	github.com/buger/jsonparser v1.1.1 // indirect
 	github.com/bytedance/sonic v1.9.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
-	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/cheggaaa/pb/v3 v3.1.4 // indirect
 	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
@@ -152,13 +153,13 @@ require (
 	github.com/gin-gonic/gin v1.9.1 // indirect
 	github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
 	github.com/go-fed/httpsig v1.1.0 // indirect
-	github.com/go-openapi/jsonpointer v0.20.2 // indirect
-	github.com/go-openapi/swag v0.22.9 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/go-sourcemap/sourcemap v2.1.4+incompatible // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
-	github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect
+	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
 	github.com/golang-sql/sqlexp v0.1.0 // indirect
 	github.com/google/certificate-transparency-go v1.1.4 // indirect
 	github.com/google/go-github/v30 v30.1.0 // indirect
@@ -168,7 +169,6 @@ require (
 	github.com/hashicorp/go-version v1.6.0 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.6 // indirect
 	github.com/hbakhtiyor/strsim v0.0.0-20190107154042-4d2bbb273edf // indirect
-	github.com/invopop/yaml v0.2.0 // indirect
 	github.com/jcmturner/aescts/v2 v2.0.0 // indirect
 	github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
 	github.com/jcmturner/gofork v1.7.6 // indirect
@@ -200,12 +200,12 @@ require (
 	github.com/pierrec/lz4/v4 v4.1.21 // indirect
 	github.com/pjbgf/sha1cd v0.3.0 // indirect
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
-	github.com/projectdiscovery/asnmap v1.1.0 // indirect
-	github.com/projectdiscovery/cdncheck v1.0.9 // indirect
+	github.com/projectdiscovery/asnmap v1.1.1 // indirect
+	github.com/projectdiscovery/cdncheck v1.1.0 // indirect
 	github.com/projectdiscovery/freeport v0.0.5 // indirect
 	github.com/projectdiscovery/ldapserver v1.0.2-0.20240219154113-dcc758ebc0cb // indirect
 	github.com/projectdiscovery/machineid v0.0.0-20240226150047-2e2c51e35983 // indirect
-	github.com/refraction-networking/utls v1.6.6 // indirect
+	github.com/refraction-networking/utls v1.6.7 // indirect
 	github.com/sashabaranov/go-openai v1.15.3 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
@@ -293,7 +293,6 @@ require (
 	github.com/trivago/tgo v1.0.7
 	github.com/ulikunitz/xz v0.5.12 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/yl2chen/cidranger v1.0.2 // indirect
 	github.com/ysmood/goob v0.4.0 // indirect
 	github.com/ysmood/gson v0.7.3 // indirect
 	github.com/ysmood/leakless v0.8.0 // indirect

go.sum

@@ -40,17 +40,18 @@ dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 git.mills.io/prologic/smtpd v0.0.0-20210710122116-a525b76c287a h1:3i+FJ7IpSZHL+VAjtpQeZCRhrpP0odl5XfoLBY4fxJ8=
 git.mills.io/prologic/smtpd v0.0.0-20210710122116-a525b76c287a/go.mod h1:C7hXLmFmPYPjIDGfQl1clsmQ5TMEQfmzWTrJk475bUs=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v0.19.0/go.mod h1:h6H6c8enJmmocHUbLiiGY6sx7f9i+X3m1CHdd5c6Rdw=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 h1:E+OJmp2tPvt1W+amx48v1eqbjDYsgN+RzP4q16yV5eM=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1/go.mod h1:a6xsAQUZg+VsS3TJ05SRp524Hs4pZ/AeFSr5ENf0Yjo=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.11.0/go.mod h1:HcM1YX14R7CJcghJGOYCgdezslRSVzqwLf/q+4Y2r/0=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0 h1:U2rTu3Ef+7w9FHKIAXM6ZyqF3UOWJZ12zIm8zECAFfg=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0/go.mod h1:9kIvujWAA58nmPmWB1m23fyWic1kYZMxD9CxaWn4Qpg=
-github.com/Azure/azure-sdk-for-go/sdk/internal v0.7.0/go.mod h1:yqy467j36fJxcRV2TzfVZ1pCb5vxm4BtZPUdYWe/Xo8=
 github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0 h1:jBQA3cKT4L2rWMpgE7Yt3Hwh2aUj8KXjIGLxjHeYNNo=
 github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0/go.mod h1:4OG6tQ9EOP/MT0NMjDlRzWoVFxfu9rN9B2X+tlSVktg=
 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.2.0 h1:Ma67P/GGprNwsslzEH6+Kb8nybI8jpDTm4Wmzu2ReK8=
 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.2.0/go.mod h1:c+Lifp3EDEamAkPVzMooRNOK6CZjNSdEnf1A7jsI9u4=
+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.0.0 h1:yfJe15aSwEQ6Oo6J+gdfdulPNoZ3TEhmbhLIoxZcA+U=
+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.0.0/go.mod h1:Q28U+75mpCaSCDowNEmhIo/rmgdkqmkmzI7N6TGR4UY=
+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v0.8.0 h1:T028gtTPiYt/RMUfs8nVsAL7FDQrfLlrm/NnRG/zcC4=
+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v0.8.0/go.mod h1:cw4zVQgBby0Z5f2v0itn6se2dDP17nTjbZFXW5uPyHA=
 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.1.0 h1:nVocQV40OQne5613EeLayJiRAJuKlBGy+m22qWG+WRg=
 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.1.0/go.mod h1:7QJP7dr2wznCMeqIrhMgWGf7XpAQnVrJqDm9nvV3Cu4=
 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=
@@ -260,8 +261,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davidmz/go-pageant v1.0.2 h1:bPblRCh5jGU+Uptpz6LgMZGD5hJoOt7otgT454WvHn0=
 github.com/davidmz/go-pageant v1.0.2/go.mod h1:P2EDDnMqIwG5Rrp05dTRITj9z2zpGcD9efWSkTNKLIE=
-github.com/denisenkom/go-mssqldb v0.12.3 h1:pBSGx9Tq67pBOTLmxNuirNTeB8Vjmf886Kx+8Y+8shw=
-github.com/denisenkom/go-mssqldb v0.12.3/go.mod h1:k0mtMFOnU+AihqFxPMiF05rtiDrorD1Vrm1KEz5hxDo=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
@@ -274,7 +273,6 @@ github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwu
 github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
 github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
-github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
 github.com/docker/cli v24.0.5+incompatible h1:WeBimjvS0eKdH4Ygx+ihVq1Q++xg36M/rMi4aXAvodc=
 github.com/docker/cli v24.0.5+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/docker v24.0.9+incompatible h1:HPGzNmwfLZWdxHqK9/II92pyi1EpYKsAqcl4G0Of9v0=
@@ -331,8 +329,8 @@ github.com/gaissmai/bart v0.9.5 h1:vy+r4Px6bjZ+v2QYXAsg63vpz9IfzdW146A8Cn4GPIo=
 github.com/gaissmai/bart v0.9.5/go.mod h1:KHeYECXQiBjTzQz/om2tqn3sZF1J7hw9m6z41ftj3fg=
 github.com/geoffgarside/ber v1.1.0 h1:qTmFG4jJbwiSzSXoNJeHcOprVzZ8Ulde2Rrrifu5U9w=
 github.com/geoffgarside/ber v1.1.0/go.mod h1:jVPKeCbj6MvQZhwLYsGwaGI52oUorHoHKNecGT85ZCc=
-github.com/getkin/kin-openapi v0.123.0 h1:zIik0mRwFNLyvtXK274Q6ut+dPh6nlxBp0x7mNrPhs8=
-github.com/getkin/kin-openapi v0.123.0/go.mod h1:wb1aSZA/iWmorQP9KTAS/phLj/t17B5jT7+fS8ed9NM=
+github.com/getkin/kin-openapi v0.126.0 h1:c2cSgLnAsS0xYfKsgt5oBV6MYRM/giU8/RtwUY4wyfY=
+github.com/getkin/kin-openapi v0.126.0/go.mod h1:7mONz8IwmSRg6RttPu6v8U/OJ+gr+J99qSFNjPGSQqw=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
@@ -371,10 +369,10 @@ github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG
 github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
-github.com/go-openapi/jsonpointer v0.20.2 h1:mQc3nmndL8ZBzStEo3JYF8wzmeWffDH4VbXz58sAx6Q=
-github.com/go-openapi/jsonpointer v0.20.2/go.mod h1:bHen+N0u1KEO3YlmqOjTT9Adn1RfD91Ar825/PuiRVs=
-github.com/go-openapi/swag v0.22.9 h1:XX2DssF+mQKM2DHsbgZK74y/zj4mo9I99+89xUmuZCE=
-github.com/go-openapi/swag v0.22.9/go.mod h1:3/OXnFfnMAwBD099SwYRk7GD3xOrr1iL7d/XNLXVVwE=
+github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
+github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
+github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
+github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
 github.com/go-pg/pg v8.0.7+incompatible h1:ty/sXL1OZLo+47KK9N8llRcmbA9tZasqbQ/OO4ld53g=
 github.com/go-pg/pg v8.0.7+incompatible/go.mod h1:a2oXow+aFOrvwcKs3eIA0lNFmMilrxK2sOkB5NWe0vA=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
@@ -420,8 +418,8 @@ github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOW
 github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
 github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
-github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
-github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
+github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA=
+github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A=
 github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@@ -574,8 +572,8 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
 github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
 github.com/invopop/jsonschema v0.12.0 h1:6ovsNSuvn9wEQVOyc72aycBMVQFKz7cPdMJn10CvzRI=
 github.com/invopop/jsonschema v0.12.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0=
-github.com/invopop/yaml v0.2.0 h1:7zky/qH+O0DwAyoobXUqvVBwgBFRxKoQ/3FjcVpjTMY=
-github.com/invopop/yaml v0.2.0/go.mod h1:2XuRLgs/ouIrW3XNzuNj7J3Nvu/Dig5MXvbCEdiBN3Q=
+github.com/invopop/yaml v0.3.1 h1:f0+ZpmhfBSS4MhG+4HYseMdJhoeeopbSKbq5Rpeelso=
+github.com/invopop/yaml v0.3.1/go.mod h1:PMOp3nn4/12yEZUFfmOuNHJsZToEEOwoWsT+D81KkeA=
 github.com/itchyny/gojq v0.12.13 h1:IxyYlHYIlspQHHTE0f3cJF0NKDMfajxViuhBLnHd/QU=
 github.com/itchyny/gojq v0.12.13/go.mod h1:JzwzAqenfhrPUuwbmEz3nu3JQmFLlQTQMUcOdnu/Sf4=
 github.com/itchyny/timefmt-go v0.1.5 h1:G0INE2la8S6ru/ZI5JecgyzbbJNs5lG1RcBqa7Jm6GE=
@@ -713,6 +711,8 @@ github.com/mholt/archiver/v3 v3.5.1/go.mod h1:e3dqJ7H78uzsRSEACH1joayhuSyhnonssn
 github.com/microcosm-cc/bluemonday v1.0.21/go.mod h1:ytNkv4RrDrLJ2pqlsSI46O6IVXmZOBBD4SaJyDwwTkM=
 github.com/microcosm-cc/bluemonday v1.0.26 h1:xbqSvqzQMeEHCqMi64VAs4d8uy6Mequs3rQ0k/Khz58=
 github.com/microcosm-cc/bluemonday v1.0.26/go.mod h1:JyzOCs9gkyQyjs+6h10UEVSe02CGwkhd72Xdqh78TWs=
+github.com/microsoft/go-mssqldb v1.6.0 h1:mM3gYdVwEPFrlg/Dvr2DNVEgYFG7L42l+dGc67NNNpc=
+github.com/microsoft/go-mssqldb v1.6.0/go.mod h1:00mDtPbeQCRGC1HwOOR5K/gr30P1NcEG0vx6Kbv2aJU=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
 github.com/miekg/dns v1.1.59 h1:C9EXc/UToRwKLhK5wKU/I4QVsBUc8kE6MkHBkeypWZs=
@@ -741,7 +741,6 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8=
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
 github.com/mreiferson/go-httpclient v0.0.0-20160630210159-31f0106b4474/go.mod h1:OQA4XLvDbMgS8P0CevmM4m9Q3Jq4phKUzcocxuGJ5m8=
@@ -811,7 +810,6 @@ github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ
 github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
 github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI=
-github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA=
 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -826,36 +824,36 @@ github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/praetorian-inc/fingerprintx v1.1.9 h1:zWbG/Fdan0s/dvXkeaHb/CdFTz/yEEzrAF4iCzok3r8=
 github.com/praetorian-inc/fingerprintx v1.1.9/go.mod h1:k6EJIHe/Da4DH5e4JuoZHe+qSGq/KPUmXGaK+xW74OI=
-github.com/projectdiscovery/asnmap v1.1.0 h1:ynvbLB5cNpyQ2+k9IP0Rpla+0JmCJpd3mw6KLAW13m0=
-github.com/projectdiscovery/asnmap v1.1.0/go.mod h1:QNjBnGLxUBEZAgaYk/Av5cjKKWFY3i/FOfoIWCUApoY=
+github.com/projectdiscovery/asnmap v1.1.1 h1:ImJiKIaACOT7HPx4Pabb5dksolzaFYsD1kID2iwsDqI=
+github.com/projectdiscovery/asnmap v1.1.1/go.mod h1:QT7jt9nQanj+Ucjr9BqGr1Q2veCCKSAVyUzLXfEcQ60=
 github.com/projectdiscovery/blackrock v0.0.1 h1:lHQqhaaEFjgf5WkuItbpeCZv2DUIE45k0VbGJyft6LQ=
 github.com/projectdiscovery/blackrock v0.0.1/go.mod h1:ANUtjDfaVrqB453bzToU+YB4cUbvBRpLvEwoWIwlTss=
-github.com/projectdiscovery/cdncheck v1.0.9 h1:BS15gzj9gb5AVSKqTDzPamfSgStu7nJQOocUvrssFlg=
-github.com/projectdiscovery/cdncheck v1.0.9/go.mod h1:18SSl1w7rMj53CGeRIZTbDoa286a6xZIxGbaiEo4Fxs=
+github.com/projectdiscovery/cdncheck v1.1.0 h1:qDITidmJsejzpk3rMkauCh6sjI2GH9hW/snk0cQ3kXE=
+github.com/projectdiscovery/cdncheck v1.1.0/go.mod h1:sZ8U4MjHSsyaTVjBbYWHT1cwUVvUYwDX1W+WvWRicIc=
 github.com/projectdiscovery/clistats v0.0.20 h1:5jO5SLiRJ7f0nDV0ndBNmBeesbROouPooH+DGMgoWq4=
 github.com/projectdiscovery/clistats v0.0.20/go.mod h1:GJ2av0KnOvK0AISQnP8hyDclYIji1LVkx2l0pwnzAu4=
-github.com/projectdiscovery/dsl v0.1.3 h1:Lxlgpx8lwq/CaBjVUmwF6KmkMDnYf9IVKlMsWCF72OE=
-github.com/projectdiscovery/dsl v0.1.3/go.mod h1:WAuQLD4KQ/94RASotE7cvk7X6kY7JQG9Fcqc3lRQfpI=
-github.com/projectdiscovery/fastdialer v0.1.5 h1:5rNJ8I+GVzDsUqRSVLUqGTm7LsshfNYmCh20lLn1aaI=
-github.com/projectdiscovery/fastdialer v0.1.5/go.mod h1:oVoMl9Y6da2timhszy0okyBvhbKDSk+zqFazGV4y6pU=
+github.com/projectdiscovery/dsl v0.1.8 h1:ulz+o097XsYgqP4QXaAQhVSkoeD2ZPWd29wX3CTodUA=
+github.com/projectdiscovery/dsl v0.1.8/go.mod h1:AYJS2WQ/q0smr2v4pEJTg4DPe6k56KFKR7UFXvzNz/4=
+github.com/projectdiscovery/fastdialer v0.2.3 h1:K03x5XEXGyVWxS2rtSR104E9kHF0aphN7kOCzbh8zv0=
+github.com/projectdiscovery/fastdialer v0.2.3/go.mod h1:a0BKvETrO1EAohUYp9gwtbbce0hKD1qGrTegyAUqyRo=
 github.com/projectdiscovery/fasttemplate v0.0.2 h1:h2cISk5xDhlJEinlBQS6RRx0vOlOirB2y3Yu4PJzpiA=
 github.com/projectdiscovery/fasttemplate v0.0.2/go.mod h1:XYWWVMxnItd+r0GbjA1GCsUopMw1/XusuQxdyAIHMCw=
 github.com/projectdiscovery/freeport v0.0.5 h1:jnd3Oqsl4S8n0KuFkE5Hm8WGDP24ITBvmyw5pFTHS8Q=
 github.com/projectdiscovery/freeport v0.0.5/go.mod h1:PY0bxSJ34HVy67LHIeF3uIutiCSDwOqKD8ruBkdiCwE=
 github.com/projectdiscovery/go-smb2 v0.0.0-20240129202741-052cc450c6cb h1:rutG906Drtbpz4DwU5mhGIeOhRcktDH4cGQitGUMAsg=
 github.com/projectdiscovery/go-smb2 v0.0.0-20240129202741-052cc450c6cb/go.mod h1:FLjF1DmZ+POoGEiIQdWuYVwS++C/GwpX8YaCsTSm1RY=
-github.com/projectdiscovery/goflags v0.1.56 h1:tJYiZN7s9Jk9DxfYOUiqOoybaIDlXyX4ZgT4B/06SyU=
-github.com/projectdiscovery/goflags v0.1.56/go.mod h1:DsGF0NPpM5hGg75N3MTSvWJ4MIT7HFEAOEeWZ074+Fg=
-github.com/projectdiscovery/gologger v1.1.12 h1:uX/QkQdip4PubJjjG0+uk5DtyAi1ANPJUvpmimXqv4A=
-github.com/projectdiscovery/gologger v1.1.12/go.mod h1:DI8nywPLERS5mo8QEA9E7gd5HZ3Je14SjJBH3F5/kLw=
+github.com/projectdiscovery/goflags v0.1.63 h1:xy3nqpzmSFEmG0LKTv3xLcp9LMbvbFkLZcjcnFe3xR4=
+github.com/projectdiscovery/goflags v0.1.63/go.mod h1:ptFbCm+5RmSHTSG4oniwBRRHJlguBTOOfMUfezeGbZ0=
+github.com/projectdiscovery/gologger v1.1.19 h1:b7cU32XuDrDiwhr7hlDeE6mfj/nENBtHEohe51txJCE=
+github.com/projectdiscovery/gologger v1.1.19/go.mod h1:DbeKwx9IEfcvnclImX5gBlhIKUuOZwOM5itdpYXl+54=
 github.com/projectdiscovery/gostruct v0.0.2 h1:s8gP8ApugGM4go1pA+sVlPDXaWqNP5BBDDSv7VEdG1M=
 github.com/projectdiscovery/gostruct v0.0.2/go.mod h1:H86peL4HKwMXcQQtEa6lmC8FuD9XFt6gkNR0B/Mu5PE=
 github.com/projectdiscovery/gozero v0.0.2 h1:8fJeaCjxL9tpm33uG/RsCQs6HGM/NE6eA3cjkilRQ+E=
 github.com/projectdiscovery/gozero v0.0.2/go.mod h1:d8bZvDWW07LWNYWrwjZ4OO1I0cpkfqaysyDfSs9ibK8=
-github.com/projectdiscovery/hmap v0.0.47 h1:NdakfvlFruevnOvehdllofg/hc0CQn2WQaLHaRcsGAk=
-github.com/projectdiscovery/hmap v0.0.47/go.mod h1:/9V6EnyTY33hAy71Quox6Ggu9ZkKp36tgepBh/NzNSg=
-github.com/projectdiscovery/httpx v1.6.3 h1:TSu3zEKOHGFfMsGeB0lZEFRl6Tq4nPuIgKDXi9NnYpg=
-github.com/projectdiscovery/httpx v1.6.3/go.mod h1:9FmsmkT71aTa4WnOyBIPzB8I9c0QAJ9PSVUqs2NkHRQ=
+github.com/projectdiscovery/hmap v0.0.54 h1:b3pdQZwCw4is3xiL2jBx7SJZcYaf/7vtozY7bjUzO/s=
+github.com/projectdiscovery/hmap v0.0.54/go.mod h1:j0oakxYOWEfk29wRq5gQgrCv1JnfAfzGaMsRWwEas80=
+github.com/projectdiscovery/httpx v1.6.7 h1:luJAtQ+iKpiyKKDpcWw1/fF1MaRX6JZ4R3P+ol5Uikk=
+github.com/projectdiscovery/httpx v1.6.7/go.mod h1:rqcuexBrb4v36ZyX0BHcHaovTurOJn2P65Tdt9cYdfE=
 github.com/projectdiscovery/interactsh v1.2.0 h1:Al6jHiR+Usl9egYJDLJaWNHOcH8Rugk8gWMasc8Cmw8=
 github.com/projectdiscovery/interactsh v1.2.0/go.mod h1:Wxt0fnzxsfrAZQQlpVrf3xMatP4OXZaZbjuDkIQKdYY=
 github.com/projectdiscovery/ldapserver v1.0.2-0.20240219154113-dcc758ebc0cb h1:MGtI4oE12ruWv11ZlPXXd7hl/uAaQZrFvrIDYDeVMd8=
@@ -868,30 +866,30 @@ github.com/projectdiscovery/n3iwf v0.0.0-20230523120440-b8cd232ff1f5 h1:L/e8z8yw
 github.com/projectdiscovery/n3iwf v0.0.0-20230523120440-b8cd232ff1f5/go.mod h1:pGW2ncnTxTxHtP9wzcIJAB+3/NMp6IiuQWd2NK7K+oc=
 github.com/projectdiscovery/networkpolicy v0.0.9 h1:IrlDoYZagNNO8y+7iZeHT8k5izE+nek7TdtvEBwCxqk=
 github.com/projectdiscovery/networkpolicy v0.0.9/go.mod h1:XFJ2Lnv8BE/ziQCFjBHMsH1w6VmkPiQtk+NlBpdMU7M=
-github.com/projectdiscovery/ratelimit v0.0.45 h1:h28oF+hJ0CHcdBZozT1Go7ppWmzTxSXDKNNh2G1Ot9Q=
-github.com/projectdiscovery/ratelimit v0.0.45/go.mod h1:1vSJUseDS7SjNwIBi9wNRcgsMKNTLxy/GfdlLFVbgI4=
-github.com/projectdiscovery/rawhttp v0.1.51 h1:T4sskU2fsX9zNR7nyae0tD/0fliIs73KwBzyoJwBs10=
-github.com/projectdiscovery/rawhttp v0.1.51/go.mod h1:ejBaw3dCfJSfbtFv0ib6YfFSjQzt7ZdRVpQWJASxIUs=
+github.com/projectdiscovery/ratelimit v0.0.49 h1:PYatMp8g5OuoFsZOA90e48nLd2vB6a4Tw0FZ8h9zqkQ=
+github.com/projectdiscovery/ratelimit v0.0.49/go.mod h1:Xi0LTMHg4HQlmCZFzRBIhRW6N+QW5RxQ8V/Qs+Vta4k=
+github.com/projectdiscovery/rawhttp v0.1.60 h1:L57kAATGRuCfOp8Fs0ly3j2wlip7R5pco2RVfwqh/II=
+github.com/projectdiscovery/rawhttp v0.1.60/go.mod h1:M97w6lsphTHKeqLSio4Lw9K4KLO2riJMYAOqVMIZ3ck=
 github.com/projectdiscovery/rdap v0.9.1-0.20221108103045-9865884d1917 h1:m03X4gBVSorSzvmm0bFa7gDV4QNSOWPL/fgZ4kTXBxk=
 github.com/projectdiscovery/rdap v0.9.1-0.20221108103045-9865884d1917/go.mod h1:JxXtZC9e195awe7EynrcnBJmFoad/BNDzW9mzFkK8Sg=
-github.com/projectdiscovery/retryabledns v1.0.65 h1:wOtMuVkrcrGkzaT8Jixb3BtUcJODXLRz+z9EjftmFsQ=
-github.com/projectdiscovery/retryabledns v1.0.65/go.mod h1:lf3xRdFhGh55fWVlzK1oAaDPrsKliqH3gGvsFNAOkCk=
-github.com/projectdiscovery/retryablehttp-go v1.0.66 h1:dY+sGVf/O8CvKcSdTx0rxJoKG+HyOScz5T89TijZohU=
-github.com/projectdiscovery/retryablehttp-go v1.0.66/go.mod h1:3QJt06j4hEZVpJOr31u49I3mDnqbAzhcjJX8Yvn/xnY=
+github.com/projectdiscovery/retryabledns v1.0.69 h1:6vhhlfxPQoJI0j1enYSzyagyAZJNfGSg9TNloVsxEBQ=
+github.com/projectdiscovery/retryabledns v1.0.69/go.mod h1:5SDuGtXgL4W1z/9V+xnmHFYg03Fi1Ud/F2kqlPlAgfE=
+github.com/projectdiscovery/retryablehttp-go v1.0.71 h1:yXPNShCOwoTz7dBSJsBhBh4g4ujX62XS/BrH/fL1VyE=
+github.com/projectdiscovery/retryablehttp-go v1.0.71/go.mod h1:wY3T89EwcCKAw6iyMDvwzGPyL3d8TaBU80hnDErEKgM=
 github.com/projectdiscovery/sarif v0.0.1 h1:C2Tyj0SGOKbCLgHrx83vaE6YkzXEVrMXYRGLkKCr/us=
 github.com/projectdiscovery/sarif v0.0.1/go.mod h1:cEYlDu8amcPf6b9dSakcz2nNnJsoz4aR6peERwV+wuQ=
 github.com/projectdiscovery/stringsutil v0.0.2 h1:uzmw3IVLJSMW1kEg8eCStG/cGbYYZAja8BH3LqqJXMA=
 github.com/projectdiscovery/stringsutil v0.0.2/go.mod h1:EJ3w6bC5fBYjVou6ryzodQq37D5c6qbAYQpGmAy+DC0=
 github.com/projectdiscovery/tlsx v1.1.6 h1:iw2zwKbd2+kRQ8J1G4dLmS0CLyemd/tKz1UzcNsC77A=
 github.com/projectdiscovery/tlsx v1.1.6/go.mod h1:s7SRRFdrwIZBK/RXXZi4CR/CubqFSvp8h5Bk1srEZIo=
-github.com/projectdiscovery/uncover v1.0.8 h1:nE8bYJuwhqk0BEMRQRhNbjPGMy40A9gkiMk5xq6U4u0=
-github.com/projectdiscovery/uncover v1.0.8/go.mod h1:1SwsNqjwMkJEzJQ7lQr5AHIdYd+BQlyqhO5IwIYmIAM=
-github.com/projectdiscovery/useragent v0.0.56 h1:KpUtOgq1vUerPrgRFZAIr1hF0lDxA2RF6YkT2PLwSoQ=
-github.com/projectdiscovery/useragent v0.0.56/go.mod h1:LAh9vudxXPA5JfNN3+1g/Unqvulq0BDkjxK7IrE+e/s=
-github.com/projectdiscovery/utils v0.1.4 h1:VSULN/RBEXbkgWuhrDey84ZDnSXtYMSev9p+QHXXDeI=
-github.com/projectdiscovery/utils v0.1.4/go.mod h1:mXs6OOeG9l/dVchjB2PGvQO3+wuMiE14Y/kmHeKogoM=
-github.com/projectdiscovery/wappalyzergo v0.1.6 h1:4iZDEnytsnAqjQgD5K6lmAzVx++KSQeMCDfomDtQM1M=
-github.com/projectdiscovery/wappalyzergo v0.1.6/go.mod h1:wBYGKmA5BQp/NWsAy1q/jSH8N1LHWQ/LV26DuR+KzPM=
+github.com/projectdiscovery/uncover v1.0.9 h1:s5RbkD/V4r8QcPkys4gTTqMuRSgXq0JprejqLSopN9Y=
+github.com/projectdiscovery/uncover v1.0.9/go.mod h1:2PUF3SpB5QNIJ8epaB2xbRzkPaxEAWRDm3Ir2ijt81U=
+github.com/projectdiscovery/useragent v0.0.65 h1:x78ZwWdqpzokOHxLITUXvq+ljkTKc19z3ILGtoV1N70=
+github.com/projectdiscovery/useragent v0.0.65/go.mod h1:deOP8YLJU6SCzM8k+K8PjkcOF4Ux0spqyO4ODZGIT4A=
+github.com/projectdiscovery/utils v0.2.4 h1:CHnlt2la4jr8TeL7ZK7UhQItHY7DDXqIuLnnxyAJLDY=
+github.com/projectdiscovery/utils v0.2.4/go.mod h1:2Vx7geSrBfCPqknZywqbChQm8SE30mcyrlB5YsxEnhA=
+github.com/projectdiscovery/wappalyzergo v0.1.14 h1:nt1IM4RUmqeymsXk4h6BsZbKDoS2hjFvPkT2GaI1rz4=
+github.com/projectdiscovery/wappalyzergo v0.1.14/go.mod h1:/hzgxkBFTMe2wDbA93nFfoMjULw7/vIZ9QPSAnCgUa8=
 github.com/projectdiscovery/yamldoc-go v1.0.4 h1:eZoESapnMw6WAHiVgRwNqvbJEfNHEH148uthhFbG5jE=
 github.com/projectdiscovery/yamldoc-go v1.0.4/go.mod h1:8PIPRcUD55UbtQdcfFR1hpIGRWG0P7alClXNGt1TBik=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
@@ -929,8 +927,8 @@ github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/redis/go-redis/v9 v9.1.0 h1:137FnGdk+EQdCbye1FW+qOEcY5S+SpY9T0NiuqvtfMY=
 github.com/redis/go-redis/v9 v9.1.0/go.mod h1:urWj3He21Dj5k4TK1y59xH8Uj6ATueP8AH1cY3lZl4c=
-github.com/refraction-networking/utls v1.6.6 h1:igFsYBUJPYM8Rno9xUuDoM5GQrVEqY4llzEXOkL43Ig=
-github.com/refraction-networking/utls v1.6.6/go.mod h1:BC3O4vQzye5hqpmDTWUqi4P5DDhzJfkV1tdqtawQIH0=
+github.com/refraction-networking/utls v1.6.7 h1:zVJ7sP1dJx/WtVuITug3qYUq034cDq9B2MR1K67ULZM=
+github.com/refraction-networking/utls v1.6.7/go.mod h1:BC3O4vQzye5hqpmDTWUqi4P5DDhzJfkV1tdqtawQIH0=
 github.com/remeh/sizedwaitgroup v1.0.0 h1:VNGGFwNo/R5+MJBf6yrsr110p0m4/OX4S3DCy7Kyl5E=
 github.com/remeh/sizedwaitgroup v1.0.0/go.mod h1:3j2R4OIe/SeS6YDhICBy22RWjJC5eNCJ1V+9+NVNYlo=
 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
@@ -1174,7 +1172,6 @@ golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
@@ -1268,7 +1265,6 @@ golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwY
 golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
@@ -1608,7 +1604,6 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools/v3 v3.3.0 h1:MfDY1b1/0xN1CyMlQDac0ziEy9zJQd9CXBRRDHw2jJo=

integration_tests/protocols/code/pre-condition.yaml

@@ -23,4 +23,4 @@ code:
       - type: dsl
         dsl:
           - true
-# digest: 490a004630440220192fb8f704b078c2885047b85ac1a0491be86485c033a976d201599683a35aab0220604b1c3781e9d97079d0e5c23c18e6a2d87493c8e2b930536e692ee7d06e9247:4a3eb6b4988d95847d4203be25ed1d46
+# digest: 4a0a0047304502200307590191cb7c766b6c21e5777d345bdddf7adf9d6da8f7d336d585d9ac4a8b022100fd30fb0c7722778eb3d861d60e721d805925b8d8df2b979ef2104c35ec57d5cb:4a3eb6b4988d95847d4203be25ed1d46

integration_tests/protocols/code/py-env-var.yaml

@@ -20,4 +20,4 @@ code:
       - type: word
         words:
           - "hello from input baz"
-# digest: 4a0a00473045022033f72f1b9d5143f58a2dc79c2597000f34080251ac3702c36c3fad00917dfeeb0221009ba05c715c9e2e36dba471be6c0106a09ae3822d8a3e9e4bcf377e9f4a395a01:4a3eb6b4988d95847d4203be25ed1d46
+# digest: 4a0a0047304502203fe1d7d52bc2a41886d576a90c82c3be42078baaa4b46e1f3d8519665d6f88b202210081feb82c41150c5b218e226fc4f299ded19f42ba01ef34ba60b0634b4ea6ee12:4a3eb6b4988d95847d4203be25ed1d46

integration_tests/protocols/code/py-file.yaml

@@ -18,4 +18,4 @@ code:
       - type: word
         words:
           - "hello from input"
-# digest: 4a0a004730450220377128cb11d9f6f0fee1f4dbd841e46783de26e90a216fa55a7609ee2bc823c60221009166ee0f85e3a1811588ab19e73ea96ab3d582dc8180dbcbbad0ea9ab7e9025d:4a3eb6b4988d95847d4203be25ed1d46
+# digest: 4b0a00483046022100afb5ebff14a40e7f9b679ffc4d93ce7849e33eb398ebb47f2e757cd24831f9dd02210089ffa21b2763e99ebce95dfc5b91e1e62da4ccdc9d2ad5c48584fa350ba335af:4a3eb6b4988d95847d4203be25ed1d46

integration_tests/protocols/code/py-interactsh.yaml

@@ -26,4 +26,4 @@ code:
         part: interactsh_protocol
         words:
           - "http"
-# digest: 4b0a00483046022100d472d50bd83117d334f5217c7a40dcdf34138e90029eaace51697d902296bf37022100a393b49420a96f60d6d89b79b5135ee2233b2468d374851890eea114b08195d1:4a3eb6b4988d95847d4203be25ed1d46
+# digest: 4b0a00483046022100939f83e74d43932a5bd792b1fd2c100eec2df60f2b2a8dd56b5c8ef5faa92b17022100f93031b0de373af7d78e623968ea5a2d67c4561ef70e3e6da15aef7e5c853115:4a3eb6b4988d95847d4203be25ed1d46

integration_tests/protocols/code/py-snippet.yaml

@@ -21,4 +21,4 @@ code:
       - type: word
         words:
           - "hello from input"
-# digest: 4b0a004830460221008886054bb5dd6345e434e30f31c8fddce3c484a4f33aa6321b5185675866029d022100d188a83d0fde029f8b586061c65ab72b43755c3fb10fdd59501bb9bbadbb1ff7:4a3eb6b4988d95847d4203be25ed1d46
+# digest: 4a0a00473045022100b8e676ce0c57b60c233a0203539dec20457bbb5f1790d351a5d45405b6668b2602204b1f2fa18e7db099f05329009597ceb2d9b7337562c1a676e8d50ea2f1c6fcbe:4a3eb6b4988d95847d4203be25ed1d46

integration_tests/workflow/code-template-1.yaml

@@ -19,4 +19,4 @@ code:
         regex:
           - 'hello from (.*)'
         group: 1
-# digest: 490a0046304402202c63d47bb0acdd40b3b852d95490d492ff5741b84071b2a8a40371be7797c13602202b6b977e157edf2ef70a402a2e57d4eb5a67c5ca91f0a2f9a10a966e8485ebaf:4a3eb6b4988d95847d4203be25ed1d46
+# digest: 490a00463044022050da011362cf08c2cb81e812c7f86d7282afe0562d4bf00d390f1300d19bc910022029e9d305da69e941ac18797645aecb217abde6557f891e141301b48e89a3c0cd:4a3eb6b4988d95847d4203be25ed1d46

integration_tests/workflow/code-template-2.yaml

@@ -18,4 +18,4 @@ code:
       - type: word
         words:
           - "hello from first"
-# digest: 490a00463044022025661eab353b7f359c0d428a86b6287545d7f759375e8025cc8c9c77b616ca6502200bc2c019059622df3c88e7caa6dd7d1fb9b956010aa0de2ee2b9f7dd0a3c4954:4a3eb6b4988d95847d4203be25ed1d46
+# digest: 4b0a00483046022100b3b8759c0df028455eb59b1433ac240e5d4604b011bb0c63680bd3cc159ac6f0022100f44aa11b640d11ad0e2902897f4eb51666ab3cd83c31dfd2590f6e43391e39b0:4a3eb6b4988d95847d4203be25ed1d46

internal/pdcp/utils.go

@@ -5,9 +5,17 @@ import (
 	urlutil "github.com/projectdiscovery/utils/url"
 )
 
-func getScanDashBoardURL(id string) string {
+func getScanDashBoardURL(id string, teamID string) string {
 	ux, _ := urlutil.Parse(pdcpauth.DashBoardURL)
 	ux.Path = "/scans/" + id
+	if ux.Params == nil {
+		ux.Params = urlutil.NewOrderedParams()
+	}
+	if teamID != "" {
+		ux.Params.Add("team_id", teamID)
+	} else {
+		ux.Params.Add("team_id", NoneTeamID)
+	}
 	ux.Update()
 	return ux.String()
 }

internal/pdcp/writer.go

@@ -32,13 +32,14 @@ const (
 	MaxChunkSize   = 4 * unitutils.Mega // 4 MB
 	xidRe          = `^[a-z0-9]{20}$`
 	teamIDHeader   = "X-Team-Id"
+	NoneTeamID     = "none"
 )
 
 var (
 	xidRegex               = regexp.MustCompile(xidRe)
 	_        output.Writer = &UploadWriter{}
 	// teamID if given
-	teamID = env.GetEnvOrDefault("PDCP_TEAM_ID", "")
+	TeamIDEnv = env.GetEnvOrDefault("PDCP_TEAM_ID", NoneTeamID)
 )
 
 // UploadWriter is a writer that uploads its output to pdcp
@@ -53,6 +54,7 @@ type UploadWriter struct {
 	scanID    string
 	scanName  string
 	counter   atomic.Int32
+	TeamID    string
 }
 
 // NewUploadWriter creates a new upload writer
@@ -61,8 +63,9 @@ func NewUploadWriter(ctx context.Context, creds *pdcpauth.PDCPCredentials) (*Upl
 		return nil, fmt.Errorf("no credentials provided")
 	}
 	u := &UploadWriter{
-		creds: creds,
-		done:  make(chan struct{}, 1),
+		creds:  creds,
+		done:   make(chan struct{}, 1),
+		TeamID: NoneTeamID,
 	}
 	var err error
 	reader, writer := io.Pipe()
@@ -110,6 +113,14 @@ func (u *UploadWriter) SetScanName(name string) {
 	u.scanName = name
 }
 
+func (u *UploadWriter) SetTeamID(id string) {
+	if id == "" {
+		u.TeamID = NoneTeamID
+	} else {
+		u.TeamID = id
+	}
+}
+
 func (u *UploadWriter) autoCommit(ctx context.Context, r *io.PipeReader) {
 	reader := bufio.NewReader(r)
 	ch := make(chan string, 4)
@@ -136,13 +147,13 @@ func (u *UploadWriter) autoCommit(ctx context.Context, r *io.PipeReader) {
 		if u.scanID == "" {
 			gologger.Verbose().Msgf("Scan results upload to cloud skipped, no results found to upload")
 		} else {
-			gologger.Info().Msgf("%v Scan results uploaded to cloud, you can view scan results at %v", u.counter.Load(), getScanDashBoardURL(u.scanID))
+			gologger.Info().Msgf("%v Scan results uploaded to cloud, you can view scan results at %v", u.counter.Load(), getScanDashBoardURL(u.scanID, u.TeamID))
 		}
 	}()
 	// temporary buffer to store the results
 	buff := &bytes.Buffer{}
 	ticker := time.NewTicker(flushTimer)
-
+	defer ticker.Stop()
 	for {
 		select {
 		case <-ctx.Done():
@@ -189,7 +200,7 @@ func (u *UploadWriter) uploadChunk(buff *bytes.Buffer) error {
 	// if successful, reset the buffer
 	buff.Reset()
 	// log in verbose mode
-	gologger.Warning().Msgf("Uploaded results chunk, you can view scan results at %v", getScanDashBoardURL(u.scanID))
+	gologger.Warning().Msgf("Uploaded results chunk, you can view scan results at %v", getScanDashBoardURL(u.scanID, u.TeamID))
 	return nil
 }
 
@@ -248,8 +259,8 @@ func (u *UploadWriter) getRequest(bin []byte) (*retryablehttp.Request, error) {
 	req.URL.Update()
 
 	req.Header.Set(pdcpauth.ApiKeyHeaderName, u.creds.APIKey)
-	if teamID != "" {
-		req.Header.Set(teamIDHeader, teamID)
+	if u.TeamID != NoneTeamID && u.TeamID != "" {
+		req.Header.Set(teamIDHeader, u.TeamID)
 	}
 	req.Header.Set("Content-Type", "application/octet-stream")
 	req.Header.Set("Accept", "application/json")

internal/runner/options.go

@@ -19,7 +19,6 @@ import (
 	"github.com/projectdiscovery/gologger/levels"
 	"github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolinit"
-	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/utils/vardump"
 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/headless/engine"
 	"github.com/projectdiscovery/nuclei/v3/pkg/reporting"
@@ -115,12 +114,7 @@ func ParseOptions(options *types.Options) {
 	// Load the resolvers if user asked for them
 	loadResolvers(options)
 
-	err := protocolstate.Init(options)
-	if err != nil {
-		gologger.Fatal().Msgf("Could not initialize protocol state: %s\n", err)
-	}
-
-	err = protocolinit.Init(options)
+	err := protocolinit.Init(options)
 	if err != nil {
 		gologger.Fatal().Msgf("Could not initialize protocols: %s\n", err)
 	}

internal/runner/runner.go

@@ -426,6 +426,9 @@ func (r *Runner) setupPDCPUpload(writer output.Writer) output.Writer {
 	if r.options.ScanName != "" {
 		uploadWriter.SetScanName(r.options.ScanName)
 	}
+	if r.options.TeamID != "" {
+		uploadWriter.SetTeamID(r.options.TeamID)
+	}
 	return output.NewMultiWriter(writer, uploadWriter)
 }
 

lib/config.go

@@ -396,6 +396,7 @@ func WithHeaders(headers []string) NucleiSDKOptions {
 func EnablePassiveMode() NucleiSDKOptions {
 	return func(e *NucleiEngine) error {
 		e.opts.OfflineHTTP = true
+		e.opts.DisableHTTPProbe = true
 		return nil
 	}
 }
@@ -440,3 +441,11 @@ func WithCatalog(cat catalog.Catalog) NucleiSDKOptions {
 		return nil
 	}
 }
+
+// DisableUpdateCheck disables nuclei update check
+func DisableUpdateCheck() NucleiSDKOptions {
+	return func(e *NucleiEngine) error {
+		DefaultConfig.DisableUpdateCheck()
+		return nil
+	}
+}

lib/example_test.go

@@ -82,5 +82,5 @@ func TestMain(m *testing.M) {
 		// no need to run this test on github actions
 		return
 	}
-	m.Run()
+	os.Exit(m.Run())
 }

lib/sdk.go

@@ -243,7 +243,12 @@ func (e *NucleiEngine) ExecuteCallbackWithCtx(ctx context.Context, callback ...f
 	}
 	e.resultCallbacks = append(e.resultCallbacks, filtered...)
 
-	_ = e.engine.ExecuteScanWithOpts(ctx, e.store.Templates(), e.inputProvider, false)
+	templatesAndWorkflows := append(e.store.Templates(), e.store.Workflows()...)
+	if len(templatesAndWorkflows) == 0 {
+		return ErrNoTemplatesAvailable
+	}
+
+	_ = e.engine.ExecuteScanWithOpts(ctx, templatesAndWorkflows, e.inputProvider, false)
 	defer e.engine.WorkPool().Wait()
 	return nil
 }

lib/sdk_private.go

@@ -108,6 +108,14 @@ func (e *NucleiEngine) init(ctx context.Context) error {
 		return err
 	}
 
+	if e.opts.ProxyInternal && types.ProxyURL != "" || types.ProxySocksURL != "" {
+		httpclient, err := httpclientpool.Get(e.opts, &httpclientpool.Configuration{})
+		if err != nil {
+			return err
+		}
+		e.httpClient = httpclient
+	}
+
 	e.parser = templates.NewParser()
 
 	if sharedInit == nil || protocolstate.ShouldInit() {
@@ -121,14 +129,6 @@ func (e *NucleiEngine) init(ctx context.Context) error {
 	e.applyRequiredDefaults(ctx)
 	var err error
 
-	if e.opts.ProxyInternal && types.ProxyURL != "" || types.ProxySocksURL != "" {
-		httpclient, err := httpclientpool.Get(e.opts, &httpclientpool.Configuration{})
-		if err != nil {
-			return err
-		}
-		e.httpClient = httpclient
-	}
-
 	// setup progressbar
 	if e.enableStats {
 		progressInstance, progressErr := progress.NewStatsTicker(e.opts.StatsInterval, e.enableStats, e.opts.StatsJSON, false, e.opts.MetricsPort)

nuclei-jsonschema.json

@@ -787,6 +787,11 @@
           "title": "signature is the http request signature method",
           "description": "Signature is the HTTP Request signature Method"
         },
+        "skip-secret-file": {
+          "type": "boolean",
+          "title": "bypass secret file",
+          "description": "Skips the authentication or authorization configured in the secret file"
+        },
         "cookie-reuse": {
           "type": "boolean",
           "title": "optional cookie reuse enable",
@@ -941,11 +946,6 @@
           "title": "code to execute in javascript",
           "description": "Executes inline javascript code for the request"
         },
-        "timeout": {
-          "type": "integer",
-          "title": "timeout for javascript execution",
-          "description": "Timeout in seconds is optional timeout for entire javascript script execution"
-        },
         "stop-at-first-match": {
           "type": "boolean",
           "title": "stop at first match",

pkg/authprovider/file.go

@@ -16,8 +16,8 @@ import (
 type FileAuthProvider struct {
 	Path     string
 	store    *authx.Authx
-	compiled map[*regexp.Regexp]authx.AuthStrategy
-	domains  map[string]authx.AuthStrategy
+	compiled map[*regexp.Regexp][]authx.AuthStrategy
+	domains  map[string][]authx.AuthStrategy
 }
 
 // NewFileAuthProvider creates a new file based auth provider
@@ -51,29 +51,36 @@ func NewFileAuthProvider(path string, callback authx.LazyFetchSecret) (AuthProvi
 
 // init initializes the file auth provider
 func (f *FileAuthProvider) init() {
-	for _, secret := range f.store.Secrets {
+	for _, _secret := range f.store.Secrets {
+		secret := _secret // allocate copy of pointer
 		if len(secret.DomainsRegex) > 0 {
 			for _, domain := range secret.DomainsRegex {
 				if f.compiled == nil {
-					f.compiled = make(map[*regexp.Regexp]authx.AuthStrategy)
+					f.compiled = make(map[*regexp.Regexp][]authx.AuthStrategy)
 				}
 				compiled, err := regexp.Compile(domain)
 				if err != nil {
 					continue
 				}
-				f.compiled[compiled] = secret.GetStrategy()
+
+				if ss, ok := f.compiled[compiled]; ok {
+					f.compiled[compiled] = append(ss, secret.GetStrategy())
+				} else {
+					f.compiled[compiled] = []authx.AuthStrategy{secret.GetStrategy()}
+				}
 			}
 		}
 		for _, domain := range secret.Domains {
 			if f.domains == nil {
-				f.domains = make(map[string]authx.AuthStrategy)
+				f.domains = make(map[string][]authx.AuthStrategy)
 			}
-			f.domains[strings.TrimSpace(domain)] = secret.GetStrategy()
-			if strings.HasSuffix(domain, ":80") {
-				f.domains[strings.TrimSuffix(domain, ":80")] = secret.GetStrategy()
-			}
-			if strings.HasSuffix(domain, ":443") {
-				f.domains[strings.TrimSuffix(domain, ":443")] = secret.GetStrategy()
+			domain = strings.TrimSpace(domain)
+			domain = strings.TrimSuffix(domain, ":80")
+			domain = strings.TrimSuffix(domain, ":443")
+			if ss, ok := f.domains[domain]; ok {
+				f.domains[domain] = append(ss, secret.GetStrategy())
+			} else {
+				f.domains[domain] = []authx.AuthStrategy{secret.GetStrategy()}
 			}
 		}
 	}
@@ -81,32 +88,38 @@ func (f *FileAuthProvider) init() {
 		if len(dynamic.DomainsRegex) > 0 {
 			for _, domain := range dynamic.DomainsRegex {
 				if f.compiled == nil {
-					f.compiled = make(map[*regexp.Regexp]authx.AuthStrategy)
+					f.compiled = make(map[*regexp.Regexp][]authx.AuthStrategy)
 				}
 				compiled, err := regexp.Compile(domain)
 				if err != nil {
 					continue
 				}
-				f.compiled[compiled] = &authx.DynamicAuthStrategy{Dynamic: dynamic}
+				if ss, ok := f.compiled[compiled]; !ok {
+					f.compiled[compiled] = []authx.AuthStrategy{&authx.DynamicAuthStrategy{Dynamic: dynamic}}
+				} else {
+					f.compiled[compiled] = append(ss, &authx.DynamicAuthStrategy{Dynamic: dynamic})
+				}
 			}
 		}
 		for _, domain := range dynamic.Domains {
 			if f.domains == nil {
-				f.domains = make(map[string]authx.AuthStrategy)
+				f.domains = make(map[string][]authx.AuthStrategy)
 			}
-			f.domains[strings.TrimSpace(domain)] = &authx.DynamicAuthStrategy{Dynamic: dynamic}
-			if strings.HasSuffix(domain, ":80") {
-				f.domains[strings.TrimSuffix(domain, ":80")] = &authx.DynamicAuthStrategy{Dynamic: dynamic}
-			}
-			if strings.HasSuffix(domain, ":443") {
-				f.domains[strings.TrimSuffix(domain, ":443")] = &authx.DynamicAuthStrategy{Dynamic: dynamic}
+			domain = strings.TrimSpace(domain)
+			domain = strings.TrimSuffix(domain, ":80")
+			domain = strings.TrimSuffix(domain, ":443")
+
+			if ss, ok := f.domains[domain]; !ok {
+				f.domains[domain] = []authx.AuthStrategy{&authx.DynamicAuthStrategy{Dynamic: dynamic}}
+			} else {
+				f.domains[domain] = append(ss, &authx.DynamicAuthStrategy{Dynamic: dynamic})
 			}
 		}
 	}
 }
 
 // LookupAddr looks up a given domain/address and returns appropriate auth strategy
-func (f *FileAuthProvider) LookupAddr(addr string) authx.AuthStrategy {
+func (f *FileAuthProvider) LookupAddr(addr string) []authx.AuthStrategy {
 	if strings.Contains(addr, ":") {
 		// default normalization for host:port
 		host, port, err := net.SplitHostPort(addr)
@@ -128,12 +141,12 @@ func (f *FileAuthProvider) LookupAddr(addr string) authx.AuthStrategy {
 }
 
 // LookupURL looks up a given URL and returns appropriate auth strategy
-func (f *FileAuthProvider) LookupURL(u *url.URL) authx.AuthStrategy {
+func (f *FileAuthProvider) LookupURL(u *url.URL) []authx.AuthStrategy {
 	return f.LookupAddr(u.Host)
 }
 
 // LookupURLX looks up a given URL and returns appropriate auth strategy
-func (f *FileAuthProvider) LookupURLX(u *urlutil.URL) authx.AuthStrategy {
+func (f *FileAuthProvider) LookupURLX(u *urlutil.URL) []authx.AuthStrategy {
 	return f.LookupAddr(u.Host)
 }
 
@@ -150,17 +163,21 @@ func (f *FileAuthProvider) GetTemplatePaths() []string {
 
 // PreFetchSecrets pre-fetches the secrets from the auth provider
 func (f *FileAuthProvider) PreFetchSecrets() error {
-	for _, s := range f.domains {
-		if val, ok := s.(*authx.DynamicAuthStrategy); ok {
-			if err := val.Dynamic.Fetch(false); err != nil {
-				return err
+	for _, ss := range f.domains {
+		for _, s := range ss {
+			if val, ok := s.(*authx.DynamicAuthStrategy); ok {
+				if err := val.Dynamic.Fetch(false); err != nil {
+					return err
+				}
 			}
 		}
 	}
-	for _, s := range f.compiled {
-		if val, ok := s.(*authx.DynamicAuthStrategy); ok {
-			if err := val.Dynamic.Fetch(false); err != nil {
-				return err
+	for _, ss := range f.compiled {
+		for _, s := range ss {
+			if val, ok := s.(*authx.DynamicAuthStrategy); ok {
+				if err := val.Dynamic.Fetch(false); err != nil {
+					return err
+				}
 			}
 		}
 	}

pkg/authprovider/interface.go

@@ -22,13 +22,13 @@ var (
 type AuthProvider interface {
 	// LookupAddr looks up a given domain/address and returns appropriate auth strategy
 	// for it (accepted inputs are scanme.sh or scanme.sh:443)
-	LookupAddr(string) authx.AuthStrategy
+	LookupAddr(string) []authx.AuthStrategy
 	// LookupURL looks up a given URL and returns appropriate auth strategy
 	// it accepts a valid url struct and returns the auth strategy
-	LookupURL(*url.URL) authx.AuthStrategy
+	LookupURL(*url.URL) []authx.AuthStrategy
 	// LookupURLX looks up a given URL and returns appropriate auth strategy
 	// it accepts pd url struct (i.e urlutil.URL) and returns the auth strategy
-	LookupURLX(*urlutil.URL) authx.AuthStrategy
+	LookupURLX(*urlutil.URL) []authx.AuthStrategy
 	// GetTemplatePaths returns the template path for the auth provider
 	// that will be used for dynamic secret fetching
 	GetTemplatePaths() []string

pkg/authprovider/multi.go

@@ -19,7 +19,7 @@ func NewMultiAuthProvider(providers ...AuthProvider) AuthProvider {
 	return &MultiAuthProvider{Providers: providers}
 }
 
-func (m *MultiAuthProvider) LookupAddr(host string) authx.AuthStrategy {
+func (m *MultiAuthProvider) LookupAddr(host string) []authx.AuthStrategy {
 	for _, provider := range m.Providers {
 		strategy := provider.LookupAddr(host)
 		if strategy != nil {
@@ -29,7 +29,7 @@ func (m *MultiAuthProvider) LookupAddr(host string) authx.AuthStrategy {
 	return nil
 }
 
-func (m *MultiAuthProvider) LookupURL(u *url.URL) authx.AuthStrategy {
+func (m *MultiAuthProvider) LookupURL(u *url.URL) []authx.AuthStrategy {
 	for _, provider := range m.Providers {
 		strategy := provider.LookupURL(u)
 		if strategy != nil {
@@ -39,7 +39,7 @@ func (m *MultiAuthProvider) LookupURL(u *url.URL) authx.AuthStrategy {
 	return nil
 }
 
-func (m *MultiAuthProvider) LookupURLX(u *urlutil.URL) authx.AuthStrategy {
+func (m *MultiAuthProvider) LookupURLX(u *urlutil.URL) []authx.AuthStrategy {
 	for _, provider := range m.Providers {
 		strategy := provider.LookupURLX(u)
 		if strategy != nil {

pkg/catalog/config/constants.go

@@ -31,7 +31,7 @@ const (
 	CLIConfigFileName               = "config.yaml"
 	ReportingConfigFilename         = "reporting-config.yaml"
 	// Version is the current version of nuclei
-	Version = `v3.2.9`
+	Version = `v3.3.1`
 	// Directory Names of custom templates
 	CustomS3TemplatesDirName     = "s3"
 	CustomGitHubTemplatesDirName = "github"

pkg/core/executors.go

@@ -27,7 +27,7 @@ func (e *Engine) executeAllSelfContained(ctx context.Context, alltemplates []*te
 			var match bool
 			ctx := scan.NewScanContext(ctx, contextargs.New(ctx))
 			if e.Callback != nil {
-				if results, err := template.Executer.ExecuteWithResults(ctx); err != nil {
+				if results, err := template.Executer.ExecuteWithResults(ctx); err == nil {
 					for _, result := range results {
 						e.Callback(result)
 					}
@@ -129,7 +129,7 @@ func (e *Engine) executeTemplateWithTargets(ctx context.Context, template *templ
 				match = e.executeWorkflow(ctx, template.CompiledWorkflow)
 			default:
 				if e.Callback != nil {
-					if results, err := template.Executer.ExecuteWithResults(ctx); err != nil {
+					if results, err := template.Executer.ExecuteWithResults(ctx); err == nil {
 						for _, result := range results {
 							e.Callback(result)
 						}
@@ -194,7 +194,7 @@ func (e *Engine) executeTemplatesOnTarget(ctx context.Context, alltemplates []*t
 				match = e.executeWorkflow(ctx, template.CompiledWorkflow)
 			default:
 				if e.Callback != nil {
-					if results, err := template.Executer.ExecuteWithResults(ctx); err != nil {
+					if results, err := template.Executer.ExecuteWithResults(ctx); err == nil {
 						for _, result := range results {
 							e.Callback(result)
 						}

pkg/fuzz/execute.go

@@ -16,6 +16,7 @@ import (
 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
 	"github.com/projectdiscovery/retryablehttp-go"
 	errorutil "github.com/projectdiscovery/utils/errors"
+	mapsutil "github.com/projectdiscovery/utils/maps"
 	sliceutil "github.com/projectdiscovery/utils/slice"
 	urlutil "github.com/projectdiscovery/utils/url"
 )
@@ -165,14 +166,27 @@ mainLoop:
 func (rule *Rule) evaluateVarsWithInteractsh(data map[string]interface{}, interactshUrls []string) (map[string]interface{}, []string) {
 	// Check if Interactsh options are configured
 	if rule.options.Interactsh != nil {
+		interactshUrlsMap := make(map[string]struct{})
+		for _, url := range interactshUrls {
+			interactshUrlsMap[url] = struct{}{}
+		}
+		interactshUrls = mapsutil.GetKeys(interactshUrlsMap)
 		// Iterate through the data to replace and evaluate variables with Interactsh URLs
 		for k, v := range data {
+			value := fmt.Sprint(v)
 			// Replace variables with Interactsh URLs and collect new URLs
-			got, oastUrls := rule.options.Interactsh.Replace(fmt.Sprint(v), interactshUrls)
-
+			got, oastUrls := rule.options.Interactsh.Replace(value, interactshUrls)
+			if got != value {
+				data[k] = got
+			}
 			// Append new OAST URLs if any
 			if len(oastUrls) > 0 {
-				interactshUrls = append(interactshUrls, oastUrls...)
+				for _, url := range oastUrls {
+					if _, ok := interactshUrlsMap[url]; !ok {
+						interactshUrlsMap[url] = struct{}{}
+						interactshUrls = append(interactshUrls, url)
+					}
+				}
 			}
 			// Evaluate the replaced data
 			evaluatedData, err := expressions.Evaluate(got, data)

pkg/fuzz/parts.go

@@ -181,9 +181,9 @@ func (rule *Rule) execWithInput(input *ExecuteRuleInput, httpReq *retryablehttp.
 // for fuzzing.
 func (rule *Rule) executeEvaluate(input *ExecuteRuleInput, _, value, payload string, interactshURLs []string) (string, []string) {
 	// TODO: Handle errors
-	values := generators.MergeMaps(input.Values, map[string]interface{}{
+	values := generators.MergeMaps(rule.options.Variables.GetAll(), map[string]interface{}{
 		"value": value,
-	}, rule.options.Options.Vars.AsMap(), rule.options.Variables.GetAll())
+	}, rule.options.Options.Vars.AsMap(), input.Values)
 	firstpass, _ := expressions.Evaluate(payload, values)
 	interactData, interactshURLs := rule.options.Interactsh.Replace(firstpass, interactshURLs)
 	evaluated, _ := expressions.Evaluate(interactData, values)

pkg/input/formats/openapi/examples.go

@@ -18,7 +18,7 @@ func getSchemaExample(schema *openapi3.Schema) (interface{}, bool) {
 		return schema.Default, true
 	}
 
-	if schema.Enum != nil && len(schema.Enum) > 0 {
+	if len(schema.Enum) > 0 {
 		return schema.Enum[0], true
 	}
 	return nil, false
@@ -175,9 +175,9 @@ func openAPIExample(schema *openapi3.Schema, cache map[*openapi3.Schema]*cachedS
 	}
 
 	switch {
-	case schema.Type == "boolean":
+	case schema.Type.Is("boolean"):
 		return true, nil
-	case schema.Type == "number", schema.Type == "integer":
+	case schema.Type.Is("number"), schema.Type.Is("integer"):
 		value := 0.0
 
 		if schema.Min != nil && *schema.Min > value {
@@ -208,11 +208,11 @@ func openAPIExample(schema *openapi3.Schema, cache map[*openapi3.Schema]*cachedS
 			value += float64(int(*schema.MultipleOf) - (int(value) % int(*schema.MultipleOf)))
 		}
 
-		if schema.Type == "integer" {
+		if schema.Type.Is("integer") {
 			return int(value), nil
 		}
 		return value, nil
-	case schema.Type == "string":
+	case schema.Type.Is("string"):
 		if ex := stringFormatExample(schema.Format); ex != "" {
 			return ex, nil
 		}
@@ -226,7 +226,7 @@ func openAPIExample(schema *openapi3.Schema, cache map[*openapi3.Schema]*cachedS
 			example = example[:*schema.MaxLength]
 		}
 		return example, nil
-	case schema.Type == "array", schema.Items != nil:
+	case schema.Type.Is("array"), schema.Items != nil:
 		example := []interface{}{}
 
 		if schema.Items != nil && schema.Items.Value != nil {
@@ -242,7 +242,7 @@ func openAPIExample(schema *openapi3.Schema, cache map[*openapi3.Schema]*cachedS
 			}
 		}
 		return example, nil
-	case schema.Type == "object", len(schema.Properties) > 0:
+	case schema.Type.Is("object"), len(schema.Properties) > 0:
 		example := map[string]interface{}{}
 
 		for k, v := range schema.Properties {

pkg/input/formats/openapi/generator.go

@@ -75,16 +75,26 @@ func GenerateRequestsFromSchema(schema *openapi3.T, opts formats.InputFormatOpti
 
 	for _, serverURL := range schema.Servers {
 		pathURL := serverURL.URL
+		// Split the server URL into baseURL and serverPath
+		u, err := url.Parse(pathURL)
+		if err != nil {
+			return errors.Wrap(err, "could not parse server url")
+		}
+		baseURL := fmt.Sprintf("%s://%s", u.Scheme, u.Host)
+		serverPath := u.Path
 
 		for path, v := range schema.Paths.Map() {
 			// a path item can have parameters
 			ops := v.Operations()
 			requestPath := path
+			if serverPath != "" {
+				requestPath = serverPath + path
+			}
 			for method, ov := range ops {
 				if err := generateRequestsFromOp(&generateReqOptions{
 					requiredOnly:              opts.RequiredOnly,
 					method:                    method,
-					pathURL:                   pathURL,
+					pathURL:                   baseURL,
 					requestPath:               requestPath,
 					op:                        ov,
 					schema:                    schema,
@@ -193,7 +203,7 @@ func generateRequestsFromOp(opts *generateReqOptions) error {
 			paramValue = value.Schema.Value.Default
 		} else if value.Schema.Value.Example != nil {
 			paramValue = value.Schema.Value.Example
-		} else if value.Schema.Value.Enum != nil && len(value.Schema.Value.Enum) > 0 {
+		} else if len(value.Schema.Value.Enum) > 0 {
 			paramValue = value.Schema.Value.Enum[0]
 		} else {
 			if !opts.opts.SkipFormatValidation {

pkg/input/formats/swagger/swagger.go

@@ -2,6 +2,7 @@ package swagger
 
 import (
 	"encoding/json"
+	"io"
 	"os"
 	"path"
 
@@ -10,7 +11,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/projectdiscovery/nuclei/v3/pkg/input/formats"
 	"github.com/projectdiscovery/nuclei/v3/pkg/input/formats/openapi"
-	"gopkg.in/yaml.v2"
+	"github.com/invopop/yaml"
 
 	"github.com/getkin/kin-openapi/openapi2conv"
 )
@@ -49,7 +50,11 @@ func (j *SwaggerFormat) Parse(input string, resultsCb formats.ParseReqRespCallba
 	ext := path.Ext(input)
 
 	if ext == ".yaml" || ext == ".yml" {
-		err = yaml.NewDecoder(file).Decode(schemav2)
+		data, err_data := io.ReadAll(file)
+		if err_data != nil {
+			return errors.Wrap(err, "could not read data file")
+		}
+		err = yaml.Unmarshal(data, schemav2)
 	} else {
 		err = json.NewDecoder(file).Decode(schemav2)
 	}

pkg/input/formats/swagger/swagger_test.go

@@ -27,8 +27,8 @@ func TestSwaggerAPIParser(t *testing.T) {
 	}
 
 	expectedURLs := []string{
-		"https://localhost/users",
-		"https://localhost/users/1?test=asc",
+		"https://localhost/v1/users",
+		"https://localhost/v1/users/1?test=asc",
 	}
 	require.ElementsMatch(t, gotMethodsToURLs, expectedURLs, "could not get swagger urls")
 }

pkg/input/provider/http/multiformat.go

@@ -66,9 +66,10 @@ func (i *HttpInputProvider) Count() int64 {
 // Iterate over all inputs in order
 func (i *HttpInputProvider) Iterate(callback func(value *contextargs.MetaInput) bool) {
 	err := i.format.Parse(i.inputFile, func(request *types.RequestResponse) bool {
-		return callback(&contextargs.MetaInput{
-			ReqResp: request,
-		})
+		metaInput := contextargs.NewMetaInput()
+		metaInput.ReqResp = request
+		metaInput.Input = request.URL.String()
+		return callback(metaInput)
 	})
 	if err != nil {
 		gologger.Warning().Msgf("Could not parse input file while iterating: %s\n", err)

pkg/input/provider/interface.go

@@ -14,6 +14,7 @@ import (
 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
 	configTypes "github.com/projectdiscovery/nuclei/v3/pkg/types"
 	errorutil "github.com/projectdiscovery/utils/errors"
+	stringsutil "github.com/projectdiscovery/utils/strings"
 )
 
 var (
@@ -32,7 +33,7 @@ func IsErrNotImplemented(err error) bool {
 	if err == nil {
 		return false
 	}
-	if strings.Contains(err.Error(), "provider") && strings.Contains(err.Error(), "does not implement") {
+	if stringsutil.ContainsAll(err.Error(), "provider", "does not implement") {
 		return true
 	}
 	return false

pkg/input/provider/list/hmap.go

@@ -122,7 +122,7 @@ func (i *ListInputProvider) Iterate(callback func(value *contextargs.MetaInput)
 		})
 	}
 	callbackFunc := func(k, _ []byte) error {
-		metaInput := &contextargs.MetaInput{}
+		metaInput := contextargs.NewMetaInput()
 		if err := metaInput.Unmarshal(string(k)); err != nil {
 			return err
 		}
@@ -153,14 +153,16 @@ func (i *ListInputProvider) Set(value string) {
 			}
 			return fmt.Sprintf("got empty hostname for %v skipping ip selection", URL)
 		})
-		metaInput := &contextargs.MetaInput{Input: URL}
+		metaInput := contextargs.NewMetaInput()
+		metaInput.Input = URL
 		i.setItem(metaInput)
 		return
 	}
 
 	// Check if input is ip or hostname
 	if iputil.IsIP(urlx.Hostname()) {
-		metaInput := &contextargs.MetaInput{Input: URL}
+		metaInput := contextargs.NewMetaInput()
+		metaInput.Input = URL
 		i.setItem(metaInput)
 		return
 	}
@@ -181,7 +183,9 @@ func (i *ListInputProvider) Set(value string) {
 					if ip == "" {
 						continue
 					}
-					metaInput := &contextargs.MetaInput{Input: value, CustomIP: ip}
+					metaInput := contextargs.NewMetaInput()
+					metaInput.Input = value
+					metaInput.CustomIP = ip
 					i.setItem(metaInput)
 				}
 				return
@@ -211,11 +215,13 @@ func (i *ListInputProvider) Set(value string) {
 	}
 
 	for _, ip := range ips {
+		metaInput := contextargs.NewMetaInput()
 		if ip != "" {
-			metaInput := &contextargs.MetaInput{Input: URL, CustomIP: ip}
+			metaInput.Input = URL
+			metaInput.CustomIP = ip
 			i.setItem(metaInput)
 		} else {
-			metaInput := &contextargs.MetaInput{Input: URL}
+			metaInput.Input = URL
 			i.setItem(metaInput)
 		}
 	}
@@ -353,7 +359,8 @@ func (i *ListInputProvider) scanInputFromReader(reader io.Reader) {
 
 // isExcluded checks if a URL is in the exclusion list
 func (i *ListInputProvider) isExcluded(URL string) bool {
-	metaInput := &contextargs.MetaInput{Input: URL}
+	metaInput := contextargs.NewMetaInput()
+	metaInput.Input = URL
 	key, err := metaInput.MarshalString()
 	if err != nil {
 		gologger.Warning().Msgf("%s\n", err)
@@ -378,14 +385,16 @@ func (i *ListInputProvider) Del(value string) {
 			}
 			return fmt.Sprintf("got empty hostname for %v skipping ip selection", URL)
 		})
-		metaInput := &contextargs.MetaInput{Input: URL}
+		metaInput := contextargs.NewMetaInput()
+		metaInput.Input = URL
 		i.delItem(metaInput)
 		return
 	}
 
 	// Check if input is ip or hostname
 	if iputil.IsIP(urlx.Hostname()) {
-		metaInput := &contextargs.MetaInput{Input: URL}
+		metaInput := contextargs.NewMetaInput()
+		metaInput.Input = URL
 		i.delItem(metaInput)
 		return
 	}
@@ -406,7 +415,9 @@ func (i *ListInputProvider) Del(value string) {
 					if ip == "" {
 						continue
 					}
-					metaInput := &contextargs.MetaInput{Input: value, CustomIP: ip}
+					metaInput := contextargs.NewMetaInput()
+					metaInput.Input = value
+					metaInput.CustomIP = ip
 					i.delItem(metaInput)
 				}
 				return
@@ -436,11 +447,13 @@ func (i *ListInputProvider) Del(value string) {
 	}
 
 	for _, ip := range ips {
+		metaInput := contextargs.NewMetaInput()
 		if ip != "" {
-			metaInput := &contextargs.MetaInput{Input: URL, CustomIP: ip}
+			metaInput.Input = URL
+			metaInput.CustomIP = ip
 			i.delItem(metaInput)
 		} else {
-			metaInput := &contextargs.MetaInput{Input: URL}
+			metaInput.Input = URL
 			i.delItem(metaInput)
 		}
 	}
@@ -514,7 +527,8 @@ func (i *ListInputProvider) addTargets(targets []string) {
 
 func (i *ListInputProvider) removeTargets(targets []string) {
 	for _, target := range targets {
-		metaInput := &contextargs.MetaInput{Input: target}
+		metaInput := contextargs.NewMetaInput()
+		metaInput.Input = target
 		i.delItem(metaInput)
 	}
 }

pkg/input/provider/list/hmap_test.go

@@ -40,7 +40,7 @@ func Test_expandCIDR(t *testing.T) {
 		// scan
 		got := []string{}
 		input.hostMap.Scan(func(k, _ []byte) error {
-			var metainput contextargs.MetaInput
+			metainput := contextargs.NewMetaInput()
 			if err := metainput.Unmarshal(string(k)); err != nil {
 				return err
 			}
@@ -141,7 +141,7 @@ func Test_scanallips_normalizeStoreInputValue(t *testing.T) {
 		// scan
 		got := []string{}
 		input.hostMap.Scan(func(k, v []byte) error {
-			var metainput contextargs.MetaInput
+			metainput := contextargs.NewMetaInput()
 			if err := metainput.Unmarshal(string(k)); err != nil {
 				return err
 			}
@@ -184,7 +184,7 @@ func Test_expandASNInputValue(t *testing.T) {
 		// scan the hmap
 		got := []string{}
 		input.hostMap.Scan(func(k, v []byte) error {
-			var metainput contextargs.MetaInput
+			metainput := contextargs.NewMetaInput()
 			if err := metainput.Unmarshal(string(k)); err != nil {
 				return err
 			}

pkg/input/provider/simple.go

@@ -43,7 +43,9 @@ func (s *SimpleInputProvider) Iterate(callback func(value *contextargs.MetaInput
 
 // Set adds an item to the input provider
 func (s *SimpleInputProvider) Set(value string) {
-	s.Inputs = append(s.Inputs, &contextargs.MetaInput{Input: value})
+	metaInput := contextargs.NewMetaInput()
+	metaInput.Input = value
+	s.Inputs = append(s.Inputs, metaInput)
 }
 
 // SetWithProbe adds an item to the input provider with HTTP probing
@@ -52,13 +54,17 @@ func (s *SimpleInputProvider) SetWithProbe(value string, probe types.InputLivene
 	if err != nil {
 		return err
 	}
-	s.Inputs = append(s.Inputs, &contextargs.MetaInput{Input: probedValue})
+	metaInput := contextargs.NewMetaInput()
+	metaInput.Input = probedValue
+	s.Inputs = append(s.Inputs, metaInput)
 	return nil
 }
 
 // SetWithExclusions adds an item to the input provider if it doesn't match any of the exclusions
 func (s *SimpleInputProvider) SetWithExclusions(value string) error {
-	s.Inputs = append(s.Inputs, &contextargs.MetaInput{Input: value})
+	metaInput := contextargs.NewMetaInput()
+	metaInput.Input = value
+	s.Inputs = append(s.Inputs, metaInput)
 	return nil
 }
 

pkg/input/transform.go

@@ -47,6 +47,8 @@ func (h *Helper) Transform(input string, protocol templateTypes.ProtocolType) st
 		return h.convertInputToType(input, typeHostWithOptionalPort, "")
 	case templateTypes.WebsocketProtocol:
 		return h.convertInputToType(input, typeWebsocket, "")
+	case templateTypes.SSLProtocol:
+		return h.convertInputToType(input, typeHostWithPort, "443")
 	}
 	return input
 }
@@ -94,6 +96,8 @@ func (h *Helper) convertInputToType(input string, inputType inputType, defaultPo
 		if _, err := filepath.Match(input, ""); err != filepath.ErrBadPattern && !isURL {
 			return input
 		}
+		// if none of these satisfy the condition return empty
+		return ""
 	case typeHostOnly:
 		if hasHost {
 			return host
@@ -111,6 +115,10 @@ func (h *Helper) convertInputToType(input string, inputType inputType, defaultPo
 				return string(probed)
 			}
 		}
+		// try to parse it as absolute url and return
+		if absUrl, err := urlutil.ParseAbsoluteURL(input, false); err == nil {
+			return absUrl.String()
+		}
 	case typeHostWithPort, typeHostWithOptionalPort:
 		if hasHost && hasPort {
 			return net.JoinHostPort(host, port)
@@ -128,6 +136,9 @@ func (h *Helper) convertInputToType(input string, inputType inputType, defaultPo
 		if uri != nil && stringsutil.EqualFoldAny(uri.Scheme, "ws", "wss") {
 			return input
 		}
+		// empty if prefix is not given
+		return ""
 	}
-	return ""
+	// do not return empty
+	return input
 }

pkg/input/transform_test.go

@@ -30,7 +30,7 @@ func TestConvertInputToType(t *testing.T) {
 		{"https://google.com:443", typeHostOnly, "google.com", ""},
 
 		// url
-		{"test.com", typeURL, "", ""},
+		{"test.com", typeURL, "test.com", ""},
 		{"google.com", typeURL, "https://google.com", ""},
 		{"https://google.com", typeURL, "https://google.com", ""},
 
@@ -43,7 +43,7 @@ func TestConvertInputToType(t *testing.T) {
 		{"input_test.*", typeFilepath, "input_test.*", ""},
 
 		// host-port
-		{"google.com", typeHostWithPort, "", ""},
+		{"google.com", typeHostWithPort, "google.com", ""},
 		{"google.com:443", typeHostWithPort, "google.com:443", ""},
 		{"https://google.com", typeHostWithPort, "google.com:443", ""},
 		{"https://google.com:443", typeHostWithPort, "google.com:443", ""},

pkg/js/compiler/compiler.go

@@ -4,11 +4,11 @@ package compiler
 import (
 	"context"
 	"fmt"
-	"time"
 
 	"github.com/dop251/goja"
 
 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
+	"github.com/projectdiscovery/nuclei/v3/pkg/types"
 	contextutil "github.com/projectdiscovery/utils/context"
 	"github.com/projectdiscovery/utils/errkit"
 	stringsutil "github.com/projectdiscovery/utils/strings"
@@ -38,13 +38,13 @@ type ExecuteOptions struct {
 	// Cleanup is extra cleanup function to be called after execution
 	Cleanup func(runtime *goja.Runtime)
 
-	/// Timeout for this script execution
-	Timeout int
 	// Source is original source of the script
 	Source *string
 
 	Context context.Context
 
+	TimeoutVariants *types.Timeouts
+
 	// Manually exported objects
 	exports map[string]interface{}
 }
@@ -55,6 +55,11 @@ type ExecuteArgs struct {
 	TemplateCtx map[string]interface{} // templateCtx contains template scoped variables
 }
 
+// Map returns a merged map of the TemplateCtx and Args fields.
+func (e *ExecuteArgs) Map() map[string]interface{} {
+	return generators.MergeMaps(e.TemplateCtx, e.Args)
+}
+
 // NewExecuteArgs returns a new execute arguments.
 func NewExecuteArgs() *ExecuteArgs {
 	return &ExecuteArgs{
@@ -66,12 +71,24 @@ func NewExecuteArgs() *ExecuteArgs {
 // ExecuteResult is the result of executing a script.
 type ExecuteResult map[string]interface{}
 
+// Map returns the map representation of the ExecuteResult
+func (e ExecuteResult) Map() map[string]interface{} {
+	if e == nil {
+		return make(map[string]interface{})
+	}
+	return e
+}
+
+// NewExecuteResult returns a new execute result instance
 func NewExecuteResult() ExecuteResult {
 	return make(map[string]interface{})
 }
 
 // GetSuccess returns whether the script was successful or not.
 func (e ExecuteResult) GetSuccess() bool {
+	if e == nil {
+		return false
+	}
 	val, ok := e["success"].(bool)
 	if !ok {
 		return false
@@ -79,15 +96,6 @@ func (e ExecuteResult) GetSuccess() bool {
 	return val
 }
 
-// Execute executes a script with the default options.
-func (c *Compiler) Execute(code string, args *ExecuteArgs) (ExecuteResult, error) {
-	p, err := WrapScriptNCompile(code, false)
-	if err != nil {
-		return nil, err
-	}
-	return c.ExecuteWithOptions(p, args, &ExecuteOptions{Context: context.Background()})
-}
-
 // ExecuteWithOptions executes a script with the provided options.
 func (c *Compiler) ExecuteWithOptions(program *goja.Program, args *ExecuteArgs, opts *ExecuteOptions) (ExecuteResult, error) {
 	if opts == nil {
@@ -106,14 +114,9 @@ func (c *Compiler) ExecuteWithOptions(program *goja.Program, args *ExecuteArgs,
 	// merge all args into templatectx
 	args.TemplateCtx = generators.MergeMaps(args.TemplateCtx, args.Args)
 
-	if opts.Timeout <= 0 || opts.Timeout > 180 {
-		// some js scripts can take longer time so allow configuring timeout
-		// from template but keep it within sane limits (180s)
-		opts.Timeout = JsProtocolTimeout
-	}
-
 	// execute with context and timeout
-	ctx, cancel := context.WithTimeoutCause(opts.Context, time.Duration(opts.Timeout)*time.Second, ErrJSExecDeadline)
+
+	ctx, cancel := context.WithTimeoutCause(opts.Context, opts.TimeoutVariants.JsCompilerExecutionTimeout, ErrJSExecDeadline)
 	defer cancel()
 	// execute the script
 	results, err := contextutil.ExecFuncWithTwoReturns(ctx, func() (val goja.Value, err error) {
@@ -126,9 +129,13 @@ func (c *Compiler) ExecuteWithOptions(program *goja.Program, args *ExecuteArgs,
 	})
 	if err != nil {
 		if val, ok := err.(*goja.Exception); ok {
-			err = val.Unwrap()
+			if x := val.Unwrap(); x != nil {
+				err = x
+			}
 		}
-		return nil, err
+		e := NewExecuteResult()
+		e["error"] = err.Error()
+		return e, err
 	}
 	var res ExecuteResult
 	if opts.exports != nil {

pkg/js/compiler/compiler_test.go

@@ -1,11 +1,14 @@
 package compiler
 
 import (
+	"context"
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/projectdiscovery/gologger"
 	"github.com/projectdiscovery/gologger/levels"
+	"github.com/projectdiscovery/nuclei/v3/pkg/types"
 )
 
 func TestNewCompilerConsoleDebug(t *testing.T) {
@@ -18,7 +21,14 @@ func TestNewCompilerConsoleDebug(t *testing.T) {
 	})
 
 	compiler := New()
-	_, err := compiler.Execute("console.log('hello world');", NewExecuteArgs())
+	p, err := WrapScriptNCompile("console.log('hello world');", false)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = compiler.ExecuteWithOptions(p, NewExecuteArgs(), &ExecuteOptions{Context: context.Background(),
+		TimeoutVariants: &types.Timeouts{JsCompilerExecutionTimeout: time.Duration(20) * time.Second}},
+	)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -27,17 +37,6 @@ func TestNewCompilerConsoleDebug(t *testing.T) {
 	}
 }
 
-func TestExecuteResultGetSuccess(t *testing.T) {
-	compiler := New()
-	result, err := compiler.Execute("1+1 == 2", NewExecuteArgs())
-	if err != nil {
-		t.Fatal(err)
-	}
-	if result.GetSuccess() != true {
-		t.Fatalf("expected true, got=%v", result.GetSuccess())
-	}
-}
-
 type noopWriter struct {
 	Callback func(data []byte, level levels.Level)
 }

pkg/js/compiler/init.go

@@ -7,26 +7,17 @@ import (
 // jsprotocolInit
 
 var (
-	// Per Execution Javascript timeout in seconds
-	JsProtocolTimeout       = 10
 	PoolingJsVmConcurrency  = 100
 	NonPoolingVMConcurrency = 20
-	JsTimeoutMultiplier     = 1.5
 )
 
 // Init initializes the javascript protocol
 func Init(opts *types.Options) error {
-	if opts.Timeout < 10 {
-		// keep existing 10s timeout
-		return nil
-	}
+
 	if opts.JsConcurrency < 100 {
 		// 100 is reasonable default
 		opts.JsConcurrency = 100
 	}
-	// we have dialer timeout set to 10s so js needs to be at least
-	// 15s to return the actual error if not it will be a dialer timeout
-	JsProtocolTimeout = int(float64(opts.Timeout) * JsTimeoutMultiplier)
 	PoolingJsVmConcurrency = opts.JsConcurrency
 	PoolingJsVmConcurrency -= NonPoolingVMConcurrency
 	return nil

pkg/js/compiler/pool.go

@@ -241,5 +241,5 @@ func stringify(gojaValue goja.Value, runtime *goja.Runtime) string {
 		}
 	}
 	// for everything else stringify
-	return fmt.Sprintf("%v", value)
+	return fmt.Sprintf("%+v", value)
 }

pkg/js/devtools/bindgen/generator.go

@@ -249,7 +249,7 @@ func identifyGenDecl(pkg *ast.Package, decl *ast.GenDecl, data *TemplateData) {
 			if !spec.Names[0].IsExported() {
 				continue
 			}
-			if spec.Values == nil || len(spec.Values) == 0 {
+			if len(spec.Values) == 0 {
 				continue
 			}
 			data.PackageVars[spec.Names[0].Name] = spec.Names[0].Name

pkg/js/devtools/scrapefuncs/README.md

@@ -42,7 +42,11 @@ Description: getNetworkPort registers defaultPort and returns defaultPort if it
 
 Name: isPortOpen
 Signatures: "isPortOpen(host string, port string, [timeout int]) bool"
-Description: isPortOpen checks if given port is open on host. timeout is optional and defaults to 5 seconds
+Description: isPortOpen checks if given TCP port is open on host. timeout is optional and defaults to 5 seconds
+
+Name: isUDPPortOpen
+Signatures: "isUDPPortOpen(host string, port string, [timeout int]) bool"
+Description: isUDPPortOpen checks if the given UDP port is open on the host. Timeout is optional and defaults to 5 seconds.
 
 Name: ToBytes
 Signatures: "ToBytes(...interface{}) []byte"

pkg/js/devtools/tsgen/parser.go

@@ -489,7 +489,7 @@ func (p *EntityParser) extractVarsNConstants() {
 					if !spec.Names[0].IsExported() {
 						continue
 					}
-					if spec.Values == nil || len(spec.Values) == 0 {
+					if len(spec.Values) == 0 {
 						continue
 					}
 					// get comments or description

pkg/js/generated/go/libldap/ldap.go

@@ -53,10 +53,12 @@ func init() {
 			"FilterWorkstationTrustAccount":    lib_ldap.FilterWorkstationTrustAccount,
 
 			// Objects / Classes
-			"ADObject": gojs.GetClassConstructor[lib_ldap.ADObject](&lib_ldap.ADObject{}),
-			"Client":   lib_ldap.NewClient,
-			"Config":   gojs.GetClassConstructor[lib_ldap.Config](&lib_ldap.Config{}),
-			"Metadata": gojs.GetClassConstructor[lib_ldap.Metadata](&lib_ldap.Metadata{}),
+			"Client":         lib_ldap.NewClient,
+			"Config":         gojs.GetClassConstructor[lib_ldap.Config](&lib_ldap.Config{}),
+			"LdapAttributes": gojs.GetClassConstructor[lib_ldap.LdapAttributes](&lib_ldap.LdapAttributes{}),
+			"LdapEntry":      gojs.GetClassConstructor[lib_ldap.LdapEntry](&lib_ldap.LdapEntry{}),
+			"Metadata":       gojs.GetClassConstructor[lib_ldap.Metadata](&lib_ldap.Metadata{}),
+			"SearchResult":   gojs.GetClassConstructor[lib_ldap.SearchResult](&lib_ldap.SearchResult{}),
 		},
 	).Register()
 }

pkg/js/generated/ts/kerberos.ts

@@ -188,9 +188,9 @@ export class Config {
  */
 export interface AuthorizationDataEntry {
     
-    ADType?: number,
-    
     ADData?: Uint8Array,
+    
+    ADType?: number,
 }
 
 
@@ -200,9 +200,9 @@ export interface AuthorizationDataEntry {
  */
 export interface BitString {
     
-    BitLength?: number,
-    
     Bytes?: Uint8Array,
+    
+    BitLength?: number,
 }
 
 
@@ -212,9 +212,9 @@ export interface BitString {
  */
 export interface BitString {
     
-    BitLength?: number,
-    
     Bytes?: Uint8Array,
+    
+    BitLength?: number,
 }
 
 
@@ -236,19 +236,15 @@ export interface Config {
  */
 export interface EncTicketPart {
     
-    AuthTime?: Date,
-    
-    StartTime?: Date,
-    
     EndTime?: Date,
     
     RenewTill?: Date,
     
     CRealm?: string,
     
-    CAddr?: HostAddress,
+    AuthTime?: Date,
     
-    AuthorizationData?: AuthorizationDataEntry,
+    StartTime?: Date,
     
     Flags?: BitString,
     
@@ -257,6 +253,10 @@ export interface EncTicketPart {
     CName?: PrincipalName,
     
     Transited?: TransitedEncoding,
+    
+    CAddr?: HostAddress,
+    
+    AuthorizationData?: AuthorizationDataEntry,
 }
 
 
@@ -266,11 +266,11 @@ export interface EncTicketPart {
  */
 export interface EncryptedData {
     
+    EType?: number,
+    
     KVNO?: number,
     
     Cipher?: Uint8Array,
-    
-    EType?: number,
 }
 
 
@@ -318,41 +318,33 @@ export interface HostAddress {
  */
 export interface LibDefaults {
     
-    NoAddresses?: boolean,
-    
-    RealmTryDomains?: number,
-    
-    DNSLookupKDC?: boolean,
-    
-    DefaultRealm?: string,
-    
-    SafeChecksumType?: number,
-    
-    VerifyAPReqNofail?: boolean,
-    
-    AllowWeakCrypto?: boolean,
-    
-    DefaultTGSEnctypes?: string[],
-    
-    DefaultTktEnctypeIDs?: number[],
-    
-    IgnoreAcceptorHostname?: boolean,
+    CCacheType?: number,
     
     K5LoginAuthoritative?: boolean,
     
-    PermittedEnctypes?: string[],
+    Proxiable?: boolean,
+    
+    RDNS?: boolean,
+    
+    K5LoginDirectory?: string,
+    
+    KDCTimeSync?: number,
+    
+    VerifyAPReqNofail?: boolean,
+    
+    DefaultTGSEnctypes?: string[],
+    
+    DefaultTGSEnctypeIDs?: number[],
+    
+    DNSCanonicalizeHostname?: boolean,
+    
+    Forwardable?: boolean,
     
     /**
     * time in nanoseconds
     */
     
-    Clockskew?: number,
-    
-    DNSCanonicalizeHostname?: boolean,
-    
-    Proxiable?: boolean,
-    
-    RDNS?: boolean,
+    RenewLifetime?: number,
     
     /**
     * time in nanoseconds
@@ -362,37 +354,45 @@ export interface LibDefaults {
     
     DefaultClientKeytabName?: string,
     
-    PermittedEnctypeIDs?: number[],
-    
-    UDPPreferenceLimit?: number,
-    
-    DefaultTGSEnctypeIDs?: number[],
-    
-    DefaultTktEnctypes?: string[],
-    
-    CCacheType?: number,
+    DefaultTktEnctypeIDs?: number[],
     
     DNSLookupRealm?: boolean,
     
     ExtraAddresses?: Uint8Array,
     
+    DefaultRealm?: string,
+    
+    NoAddresses?: boolean,
+    
     PreferredPreauthTypes?: number[],
     
+    PermittedEnctypeIDs?: number[],
+    
+    RealmTryDomains?: number,
+    
+    DefaultKeytabName?: string,
+    
+    DefaultTktEnctypes?: string[],
+    
+    DNSLookupKDC?: boolean,
+    
+    IgnoreAcceptorHostname?: boolean,
+    
+    AllowWeakCrypto?: boolean,
+    
     Canonicalize?: boolean,
     
-    Forwardable?: boolean,
+    SafeChecksumType?: number,
     
-    K5LoginDirectory?: string,
-    
-    KDCTimeSync?: number,
+    UDPPreferenceLimit?: number,
     
     /**
     * time in nanoseconds
     */
     
-    RenewLifetime?: number,
+    Clockskew?: number,
     
-    DefaultKeytabName?: string,
+    PermittedEnctypes?: string[],
     
     KDCDefaultOptions?: BitString,
 }
@@ -416,6 +416,8 @@ export interface PrincipalName {
  */
 export interface Realm {
     
+    Realm?: string,
+    
     AdminServer?: string[],
     
     DefaultDomain?: string,
@@ -425,8 +427,6 @@ export interface Realm {
     KPasswdServer?: string[],
     
     MasterKDC?: string[],
-    
-    Realm?: string,
 }
 
 

pkg/js/generated/ts/ldap.ts

@@ -209,8 +209,8 @@ export class Client {
     * log(to_json(users));
     * ```
     */
-    public FindADObjects(filter: string): ADObject[] {
-        return [];
+    public FindADObjects(filter: string): SearchResult | null {
+        return null;
     }
     
 
@@ -225,8 +225,8 @@ export class Client {
     * log(to_json(users));
     * ```
     */
-    public GetADUsers(): ADObject[] {
-        return [];
+    public GetADUsers(): SearchResult | null {
+        return null;
     }
     
 
@@ -241,8 +241,8 @@ export class Client {
     * log(to_json(users));
     * ```
     */
-    public GetADActiveUsers(): ADObject[] {
-        return [];
+    public GetADActiveUsers(): SearchResult | null {
+        return null;
     }
     
 
@@ -257,8 +257,8 @@ export class Client {
     * log(to_json(users));
     * ```
     */
-    public GetADUserWithNeverExpiringPasswords(): ADObject[] {
-        return [];
+    public GetADUserWithNeverExpiringPasswords(): SearchResult | null {
+        return null;
     }
     
 
@@ -273,8 +273,8 @@ export class Client {
     * log(to_json(users));
     * ```
     */
-    public GetADUserTrustedForDelegation(): ADObject[] {
-        return [];
+    public GetADUserTrustedForDelegation(): SearchResult | null {
+        return null;
     }
     
 
@@ -289,8 +289,8 @@ export class Client {
     * log(to_json(users));
     * ```
     */
-    public GetADUserWithPasswordNotRequired(): ADObject[] {
-        return [];
+    public GetADUserWithPasswordNotRequired(): SearchResult | null {
+        return null;
     }
     
 
@@ -305,8 +305,8 @@ export class Client {
     * log(to_json(groups));
     * ```
     */
-    public GetADGroups(): ADObject[] {
-        return [];
+    public GetADGroups(): SearchResult | null {
+        return null;
     }
     
 
@@ -321,8 +321,8 @@ export class Client {
     * log(to_json(dcs));
     * ```
     */
-    public GetADDCList(): ADObject[] {
-        return [];
+    public GetADDCList(): SearchResult | null {
+        return null;
     }
     
 
@@ -337,8 +337,8 @@ export class Client {
     * log(to_json(admins));
     * ```
     */
-    public GetADAdmins(): ADObject[] {
-        return [];
+    public GetADAdmins(): SearchResult | null {
+        return null;
     }
     
 
@@ -353,8 +353,8 @@ export class Client {
     * log(to_json(kerberoastable));
     * ```
     */
-    public GetADUserKerberoastable(): ADObject[] {
-        return [];
+    public GetADUserKerberoastable(): SearchResult | null {
+        return null;
     }
     
 
@@ -369,8 +369,8 @@ export class Client {
     * log(to_json(AsRepRoastable));
     * ```
     */
-    public GetADUserAsRepRoastable(): ADObject[] {
-        return [];
+    public GetADUserAsRepRoastable(): SearchResult | null {
+        return null;
     }
     
 
@@ -428,8 +428,8 @@ export class Client {
     * const results = client.Search('(objectClass=*)', 'cn', 'mail');
     * ```
     */
-    public Search(filter: string, attributes: any): Record<string, string[]>[] {
-        return [];
+    public Search(filter: string, attributes: any): SearchResult | null {
+        return null;
     }
     
 
@@ -481,33 +481,6 @@ export class Client {
 
 
 
-/**
- * ADObject represents an Active Directory object
- * @example
- * ```javascript
- * const ldap = require('nuclei/ldap');
- * const client = new ldap.Client('ldap://ldap.example.com', 'acme.com');
- * const users = client.GetADUsers();
- * log(to_json(users));
- * ```
- */
-export interface ADObject {
-    
-    DistinguishedName?: string,
-    
-    SAMAccountName?: string,
-    
-    PWDLastSet?: string,
-    
-    LastLogon?: string,
-    
-    MemberOf?: string[],
-    
-    ServicePrincipalName?: string[],
-}
-
-
-
 /**
  * Config is extra configuration for the ldap client
  * @example
@@ -535,27 +508,186 @@ export interface Config {
 
 
 /**
- * Entry Interface
+ * LdapAttributes represents all LDAP attributes of a particular
+ * ldap entry
  */
-export interface Entry {
+export interface LdapAttributes {
     
-    DN?: string,
+    /**
+    * CurrentTime contains current time
+    */
     
-    Attributes?: EntryAttribute,
+    CurrentTime?: string[],
+    
+    /**
+    * SubschemaSubentry contains subschema subentry
+    */
+    
+    SubschemaSubentry?: string[],
+    
+    /**
+    * DsServiceName contains ds service name
+    */
+    
+    DsServiceName?: string[],
+    
+    /**
+    * NamingContexts contains naming contexts
+    */
+    
+    NamingContexts?: string[],
+    
+    /**
+    * DefaultNamingContext contains default naming context
+    */
+    
+    DefaultNamingContext?: string[],
+    
+    /**
+    * SchemaNamingContext contains schema naming context
+    */
+    
+    SchemaNamingContext?: string[],
+    
+    /**
+    * ConfigurationNamingContext contains configuration naming context
+    */
+    
+    ConfigurationNamingContext?: string[],
+    
+    /**
+    * RootDomainNamingContext contains root domain naming context
+    */
+    
+    RootDomainNamingContext?: string[],
+    
+    /**
+    * SupportedLDAPVersion contains supported LDAP version
+    */
+    
+    SupportedLDAPVersion?: string[],
+    
+    /**
+    * HighestCommittedUSN contains highest committed USN
+    */
+    
+    HighestCommittedUSN?: string[],
+    
+    /**
+    * SupportedSASLMechanisms contains supported SASL mechanisms
+    */
+    
+    SupportedSASLMechanisms?: string[],
+    
+    /**
+    * DnsHostName contains DNS host name
+    */
+    
+    DnsHostName?: string[],
+    
+    /**
+    * LdapServiceName contains LDAP service name
+    */
+    
+    LdapServiceName?: string[],
+    
+    /**
+    * ServerName contains server name
+    */
+    
+    ServerName?: string[],
+    
+    /**
+    * IsSynchronized contains is synchronized
+    */
+    
+    IsSynchronized?: string[],
+    
+    /**
+    * IsGlobalCatalogReady contains is global catalog ready
+    */
+    
+    IsGlobalCatalogReady?: string[],
+    
+    /**
+    * DomainFunctionality contains domain functionality
+    */
+    
+    DomainFunctionality?: string[],
+    
+    /**
+    * ForestFunctionality contains forest functionality
+    */
+    
+    ForestFunctionality?: string[],
+    
+    /**
+    * DomainControllerFunctionality contains domain controller functionality
+    */
+    
+    DomainControllerFunctionality?: string[],
+    
+    /**
+    * DistinguishedName contains the distinguished name
+    */
+    
+    DistinguishedName?: string[],
+    
+    /**
+    * SAMAccountName contains the SAM account name
+    */
+    
+    SAMAccountName?: string[],
+    
+    /**
+    * PWDLastSet contains the password last set time
+    */
+    
+    PWDLastSet?: string[],
+    
+    /**
+    * LastLogon contains the last logon time
+    */
+    
+    LastLogon?: string[],
+    
+    /**
+    * MemberOf contains the groups the entry is a member of
+    */
+    
+    MemberOf?: string[],
+    
+    /**
+    * ServicePrincipalName contains the service principal names
+    */
+    
+    ServicePrincipalName?: string[],
+    
+    /**
+    * Extra contains other extra fields which might be present
+    */
+    
+    Extra?: Record<string, any>,
 }
 
 
 
 /**
- * EntryAttribute Interface
+ * LdapEntry represents a single LDAP entry
  */
-export interface EntryAttribute {
+export interface LdapEntry {
     
-    Name?: string,
+    /**
+    * DN contains distinguished name
+    */
     
-    Values?: string[],
+    DN?: string,
     
-    ByteValues?: Uint8Array,
+    /**
+    * Attributes contains list of attributes
+    */
+    
+    Attributes?: LdapAttributes,
 }
 
 
@@ -584,12 +716,32 @@ export interface Metadata {
 
 
 /**
- * SearchResult Interface
+ * SearchResult contains search result of any / all ldap search request
+ * @example
+ * ```javascript
+ * const ldap = require('nuclei/ldap');
+ * const client = new ldap.Client('ldap://ldap.example.com', 'acme.com');
+ * const results = client.Search('(objectinterface=*)', 'cn', 'mail');
+ * ```
  */
 export interface SearchResult {
     
+    /**
+    * Referrals contains list of referrals
+    */
+    
     Referrals?: string[],
     
-    Entries?: Entry,
+    /**
+    * Controls contains list of controls
+    */
+    
+    Controls?: string[],
+    
+    /**
+    * Entries contains list of entries
+    */
+    
+    Entries?: LdapEntry[],
 }
 

pkg/js/generated/ts/mssql.ts

@@ -2,7 +2,7 @@
 
 /**
  * Client is a client for MS SQL database.
- * Internally client uses denisenkom/go-mssqldb driver.
+ * Internally client uses microsoft/go-mssqldb driver.
  * @example
  * ```javascript
  * const mssql = require('nuclei/mssql');

pkg/js/generated/ts/rdp.ts

@@ -78,8 +78,6 @@ export interface IsRDPResponse {
  */
 export interface ServiceRDP {
     
-    DNSDomainName?: string,
-    
     ForestName?: string,
     
     OSFingerprint?: string,
@@ -93,5 +91,7 @@ export interface ServiceRDP {
     NetBIOSDomainName?: string,
     
     DNSComputerName?: string,
+    
+    DNSDomainName?: string,
 }
 

pkg/js/generated/ts/smb.ts

@@ -137,6 +137,10 @@ export interface NegotiationLog {
  */
 export interface SMBCapabilities {
     
+    DFSSupport?: boolean,
+    
+    Leasing?: boolean,
+    
     LargeMTU?: boolean,
     
     MultiChan?: boolean,
@@ -146,10 +150,6 @@ export interface SMBCapabilities {
     DirLeasing?: boolean,
     
     Encryption?: boolean,
-    
-    DFSSupport?: boolean,
-    
-    Leasing?: boolean,
 }
 
 
@@ -159,16 +159,16 @@ export interface SMBCapabilities {
  */
 export interface SMBLog {
     
-    SupportV1?: boolean,
-    
-    NativeOs?: string,
-    
     NTLM?: string,
     
     GroupName?: string,
     
     HasNTLM?: boolean,
     
+    SupportV1?: boolean,
+    
+    NativeOs?: string,
+    
     Version?: SMBVersions,
     
     Capabilities?: SMBCapabilities,
@@ -185,13 +185,13 @@ export interface SMBLog {
  */
 export interface SMBVersions {
     
-    VerString?: string,
-    
     Major?: number,
     
     Minor?: number,
     
     Revision?: number,
+    
+    VerString?: string,
 }
 
 
@@ -225,12 +225,12 @@ export interface ServiceSMB {
  */
 export interface SessionSetupLog {
     
-    NegotiateFlags?: number,
-    
     SetupFlags?: number,
     
     TargetName?: string,
     
+    NegotiateFlags?: number,
+    
     HeaderLog?: HeaderLog,
 }
 

pkg/js/generated/ts/ssh.ts

@@ -133,9 +133,9 @@ export interface Algorithms {
     
     HostKey?: string,
     
-    R?: DirectionAlgorithms,
-    
     W?: DirectionAlgorithms,
+    
+    R?: DirectionAlgorithms,
 }
 
 
@@ -159,13 +159,13 @@ export interface DirectionAlgorithms {
  */
 export interface EndpointId {
     
-    Raw?: string,
-    
-    ProtoVersion?: string,
-    
     SoftwareVersion?: string,
     
     Comment?: string,
+    
+    Raw?: string,
+    
+    ProtoVersion?: string,
 }
 
 
@@ -197,34 +197,34 @@ export interface HandshakeLog {
  */
 export interface KexInitMsg {
     
+    KexAlgos?: string[],
+    
+    CiphersClientServer?: string[],
+    
+    MACsServerClient?: string[],
+    
+    LanguagesClientServer?: string[],
+    
+    CompressionClientServer?: string[],
+    
+    CompressionServerClient?: string[],
+    
     Reserved?: number,
     
+    MACsClientServer?: string[],
+    
     /**
     * fixed size array of length: [16]
     */
     
     Cookie?: Uint8Array,
     
-    CiphersClientServer?: string[],
-    
-    MACsClientServer?: string[],
-    
-    MACsServerClient?: string[],
-    
-    CompressionServerClient?: string[],
-    
-    LanguagesClientServer?: string[],
-    
-    FirstKexFollows?: boolean,
-    
-    KexAlgos?: string[],
+    ServerHostKeyAlgos?: string[],
     
     CiphersServerClient?: string[],
     
-    CompressionClientServer?: string[],
-    
     LanguagesServerClient?: string[],
     
-    ServerHostKeyAlgos?: string[],
+    FirstKexFollows?: boolean,
 }
 

pkg/js/global/scripts.go

@@ -2,6 +2,7 @@ package global
 
 import (
 	"bytes"
+	"context"
 	"embed"
 	"math/rand"
 	"net"
@@ -12,8 +13,10 @@ import (
 	"github.com/logrusorgru/aurora"
 	"github.com/projectdiscovery/gologger"
 	"github.com/projectdiscovery/nuclei/v3/pkg/js/gojs"
+	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/utils/vardump"
 	"github.com/projectdiscovery/nuclei/v3/pkg/types"
+	"github.com/projectdiscovery/utils/errkit"
 	errorutil "github.com/projectdiscovery/utils/errors"
 	stringsutil "github.com/projectdiscovery/utils/strings"
 )
@@ -109,13 +112,43 @@ func initBuiltInFunc(runtime *goja.Runtime) {
 		Signatures: []string{
 			"isPortOpen(host string, port string, [timeout int]) bool",
 		},
-		Description: "isPortOpen checks if given port is open on host. timeout is optional and defaults to 5 seconds",
+		Description: "isPortOpen checks if given TCP port is open on host. timeout is optional and defaults to 5 seconds",
 		FuncDecl: func(host string, port string, timeout ...int) (bool, error) {
-			timeoutInSec := 5
+			ctx := context.Background()
 			if len(timeout) > 0 {
-				timeoutInSec = timeout[0]
+				var cancel context.CancelFunc
+				ctx, cancel = context.WithTimeout(ctx, time.Duration(timeout[0])*time.Second)
+				defer cancel()
 			}
-			conn, err := net.DialTimeout("tcp", net.JoinHostPort(host, port), time.Duration(timeoutInSec)*time.Second)
+			if host == "" || port == "" {
+				return false, errkit.New("isPortOpen: host or port is empty")
+			}
+			conn, err := protocolstate.Dialer.Dial(ctx, "tcp", net.JoinHostPort(host, port))
+			if err != nil {
+				return false, err
+			}
+			_ = conn.Close()
+			return true, nil
+		},
+	})
+
+	_ = gojs.RegisterFuncWithSignature(runtime, gojs.FuncOpts{
+		Name: "isUDPPortOpen",
+		Signatures: []string{
+			"isUDPPortOpen(host string, port string, [timeout int]) bool",
+		},
+		Description: "isUDPPortOpen checks if the given UDP port is open on the host. Timeout is optional and defaults to 5 seconds.",
+		FuncDecl: func(host string, port string, timeout ...int) (bool, error) {
+			ctx := context.Background()
+			if len(timeout) > 0 {
+				var cancel context.CancelFunc
+				ctx, cancel = context.WithTimeout(ctx, time.Duration(timeout[0])*time.Second)
+				defer cancel()
+			}
+			if host == "" || port == "" {
+				return false, errkit.New("isPortOpen: host or port is empty")
+			}
+			conn, err := protocolstate.Dialer.Dial(ctx, "udp", net.JoinHostPort(host, port))
 			if err != nil {
 				return false, err
 			}

pkg/js/libs/ldap/adenum.go

@@ -74,25 +74,6 @@ func NegativeFilter(filter string) string {
 	return fmt.Sprintf("(!%s)", filter)
 }
 
-type (
-	// ADObject represents an Active Directory object
-	// @example
-	// ```javascript
-	// const ldap = require('nuclei/ldap');
-	// const client = new ldap.Client('ldap://ldap.example.com', 'acme.com');
-	// const users = client.GetADUsers();
-	// log(to_json(users));
-	// ```
-	ADObject struct {
-		DistinguishedName    string
-		SAMAccountName       string
-		PWDLastSet           string
-		LastLogon            string
-		MemberOf             []string
-		ServicePrincipalName []string
-	}
-)
-
 // FindADObjects finds AD objects based on a filter
 // and returns them as a list of ADObject
 // @example
@@ -102,7 +83,7 @@ type (
 // const users = client.FindADObjects(ldap.FilterIsPerson);
 // log(to_json(users));
 // ```
-func (c *Client) FindADObjects(filter string) []ADObject {
+func (c *Client) FindADObjects(filter string) SearchResult {
 	c.nj.Require(c.conn != nil, "no existing connection")
 	sr := ldap.NewSearchRequest(
 		c.BaseDN, ldap.ScopeWholeSubtree,
@@ -121,19 +102,7 @@ func (c *Client) FindADObjects(filter string) []ADObject {
 
 	res, err := c.conn.Search(sr)
 	c.nj.HandleError(err, "ldap search request failed")
-
-	var objects []ADObject
-	for _, obj := range res.Entries {
-		objects = append(objects, ADObject{
-			DistinguishedName:    obj.GetAttributeValue("distinguishedName"),
-			SAMAccountName:       obj.GetAttributeValue("sAMAccountName"),
-			PWDLastSet:           DecodeADTimestamp(obj.GetAttributeValue("pwdLastSet")),
-			LastLogon:            DecodeADTimestamp(obj.GetAttributeValue("lastLogon")),
-			MemberOf:             obj.GetAttributeValues("memberOf"),
-			ServicePrincipalName: obj.GetAttributeValues("servicePrincipalName"),
-		})
-	}
-	return objects
+	return *getSearchResult(res)
 }
 
 // GetADUsers returns all AD users
@@ -145,7 +114,7 @@ func (c *Client) FindADObjects(filter string) []ADObject {
 // const users = client.GetADUsers();
 // log(to_json(users));
 // ```
-func (c *Client) GetADUsers() []ADObject {
+func (c *Client) GetADUsers() SearchResult {
 	return c.FindADObjects(FilterIsPerson)
 }
 
@@ -158,7 +127,7 @@ func (c *Client) GetADUsers() []ADObject {
 // const users = client.GetADActiveUsers();
 // log(to_json(users));
 // ```
-func (c *Client) GetADActiveUsers() []ADObject {
+func (c *Client) GetADActiveUsers() SearchResult {
 	return c.FindADObjects(JoinFilters(FilterIsPerson, FilterAccountEnabled))
 }
 
@@ -171,7 +140,7 @@ func (c *Client) GetADActiveUsers() []ADObject {
 // const users = client.GetADUserWithNeverExpiringPasswords();
 // log(to_json(users));
 // ```
-func (c *Client) GetADUserWithNeverExpiringPasswords() []ADObject {
+func (c *Client) GetADUserWithNeverExpiringPasswords() SearchResult {
 	return c.FindADObjects(JoinFilters(FilterIsPerson, FilterDontExpirePassword))
 }
 
@@ -184,7 +153,7 @@ func (c *Client) GetADUserWithNeverExpiringPasswords() []ADObject {
 // const users = client.GetADUserTrustedForDelegation();
 // log(to_json(users));
 // ```
-func (c *Client) GetADUserTrustedForDelegation() []ADObject {
+func (c *Client) GetADUserTrustedForDelegation() SearchResult {
 	return c.FindADObjects(JoinFilters(FilterIsPerson, FilterTrustedForDelegation))
 }
 
@@ -197,7 +166,7 @@ func (c *Client) GetADUserTrustedForDelegation() []ADObject {
 // const users = client.GetADUserWithPasswordNotRequired();
 // log(to_json(users));
 // ```
-func (c *Client) GetADUserWithPasswordNotRequired() []ADObject {
+func (c *Client) GetADUserWithPasswordNotRequired() SearchResult {
 	return c.FindADObjects(JoinFilters(FilterIsPerson, FilterPasswordNotRequired))
 }
 
@@ -210,7 +179,7 @@ func (c *Client) GetADUserWithPasswordNotRequired() []ADObject {
 // const groups = client.GetADGroups();
 // log(to_json(groups));
 // ```
-func (c *Client) GetADGroups() []ADObject {
+func (c *Client) GetADGroups() SearchResult {
 	return c.FindADObjects(FilterIsGroup)
 }
 
@@ -223,7 +192,7 @@ func (c *Client) GetADGroups() []ADObject {
 // const dcs = client.GetADDCList();
 // log(to_json(dcs));
 // ```
-func (c *Client) GetADDCList() []ADObject {
+func (c *Client) GetADDCList() SearchResult {
 	return c.FindADObjects(JoinFilters(FilterIsComputer, FilterAccountEnabled, FilterServerTrustAccount))
 }
 
@@ -236,7 +205,7 @@ func (c *Client) GetADDCList() []ADObject {
 // const admins = client.GetADAdmins();
 // log(to_json(admins));
 // ```
-func (c *Client) GetADAdmins() []ADObject {
+func (c *Client) GetADAdmins() SearchResult {
 	return c.FindADObjects(JoinFilters(FilterIsPerson, FilterAccountEnabled, FilterIsAdmin))
 }
 
@@ -249,7 +218,7 @@ func (c *Client) GetADAdmins() []ADObject {
 // const kerberoastable = client.GetADUserKerberoastable();
 // log(to_json(kerberoastable));
 // ```
-func (c *Client) GetADUserKerberoastable() []ADObject {
+func (c *Client) GetADUserKerberoastable() SearchResult {
 	return c.FindADObjects(JoinFilters(FilterIsPerson, FilterAccountEnabled, FilterHasServicePrincipalName))
 }
 
@@ -262,7 +231,7 @@ func (c *Client) GetADUserKerberoastable() []ADObject {
 // const AsRepRoastable = client.GetADUserAsRepRoastable();
 // log(to_json(AsRepRoastable));
 // ```
-func (c *Client) GetADUserAsRepRoastable() []ADObject {
+func (c *Client) GetADUserAsRepRoastable() SearchResult {
 	return c.FindADObjects(JoinFilters(FilterIsPerson, FilterDontRequirePreauth))
 }
 
@@ -276,7 +245,16 @@ func (c *Client) GetADUserAsRepRoastable() []ADObject {
 // ```
 func (c *Client) GetADDomainSID() string {
 	r := c.Search(FilterServerTrustAccount, "objectSid")
-	c.nj.Require(len(r) > 0, "no result from GetADDomainSID query")
-	c.nj.Require(len(r[0]["objectSid"]) > 0, "could not grab DomainSID")
-	return DecodeSID(r[0]["objectSid"][0])
+	c.nj.Require(len(r.Entries) > 0, "no result from GetADDomainSID query")
+	for _, entry := range r.Entries {
+		if sid, ok := entry.Attributes.Extra["objectSid"]; ok {
+			if sid, ok := sid.([]string); ok {
+				return DecodeSID(sid[0])
+			} else {
+				c.nj.HandleError(fmt.Errorf("invalid objectSid type: %T", entry.Attributes.Extra["objectSid"]), "invalid objectSid type")
+			}
+		}
+	}
+	c.nj.HandleError(fmt.Errorf("no objectSid found"), "no objectSid found")
+	return ""
 }

pkg/js/libs/ldap/ldap.go

@@ -203,38 +203,24 @@ func (c *Client) AuthenticateWithNTLMHash(username, hash string) {
 // const client = new ldap.Client('ldap://ldap.example.com', 'acme.com');
 // const results = client.Search('(objectClass=*)', 'cn', 'mail');
 // ```
-func (c *Client) Search(filter string, attributes ...string) []map[string][]string {
+func (c *Client) Search(filter string, attributes ...string) SearchResult {
 	c.nj.Require(c.conn != nil, "no existing connection")
+	c.nj.Require(c.BaseDN != "", "base dn cannot be empty")
+	c.nj.Require(len(attributes) > 0, "attributes cannot be empty")
 
 	res, err := c.conn.Search(
 		ldap.NewSearchRequest(
-			c.BaseDN, ldap.ScopeWholeSubtree, ldap.NeverDerefAliases,
-			0, 0, false, filter, attributes, nil,
+			"",
+			ldap.ScopeWholeSubtree,
+			ldap.NeverDerefAliases,
+			0, 0, false,
+			filter,
+			attributes,
+			nil,
 		),
 	)
 	c.nj.HandleError(err, "ldap search request failed")
-	if len(res.Entries) == 0 {
-		// return empty list
-		return nil
-	}
-
-	// convert ldap.Entry to []map[string][]string
-	var out []map[string][]string
-	for _, r := range res.Entries {
-		app := make(map[string][]string)
-		empty := true
-		for _, a := range attributes {
-			v := r.GetAttributeValues(a)
-			if len(v) > 0 {
-				app[a] = v
-				empty = false
-			}
-		}
-		if !empty {
-			out = append(out, app)
-		}
-	}
-	return out
+	return *getSearchResult(res)
 }
 
 // AdvancedSearch accepts all values of search request type and return Ldap Entry
@@ -250,7 +236,7 @@ func (c *Client) AdvancedSearch(
 	TypesOnly bool,
 	Filter string,
 	Attributes []string,
-	Controls []ldap.Control) ldap.SearchResult {
+	Controls []ldap.Control) SearchResult {
 	c.nj.Require(c.conn != nil, "no existing connection")
 	if c.BaseDN == "" {
 		c.BaseDN = fmt.Sprintf("dc=%s", strings.Join(strings.Split(c.Realm, "."), ",dc="))
@@ -259,7 +245,7 @@ func (c *Client) AdvancedSearch(
 	res, err := c.conn.Search(req)
 	c.nj.HandleError(err, "ldap search request failed")
 	c.nj.Require(res != nil, "ldap search request failed got nil response")
-	return *res
+	return *getSearchResult(res)
 }
 
 type (
@@ -295,7 +281,7 @@ func (c *Client) CollectMetadata() Metadata {
 
 	srMetadata := ldap.NewSearchRequest(
 		"",
-		ldap.ScopeBaseObject,
+		ldap.ScopeWholeSubtree,
 		ldap.NeverDerefAliases,
 		0, 0, false,
 		"(objectClass=*)",

pkg/js/libs/ldap/utils.go

@@ -5,8 +5,189 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/go-ldap/ldap/v3"
 )
 
+type (
+	// SearchResult contains search result of any / all ldap search request
+	// @example
+	// ```javascript
+	// const ldap = require('nuclei/ldap');
+	// const client = new ldap.Client('ldap://ldap.example.com', 'acme.com');
+	// const results = client.Search('(objectClass=*)', 'cn', 'mail');
+	// ```
+	SearchResult struct {
+		// Referrals contains list of referrals
+		Referrals []string `json:"referrals"`
+		// Controls contains list of controls
+		Controls []string `json:"controls"`
+		// Entries contains list of entries
+		Entries []LdapEntry `json:"entries"`
+	}
+
+	// LdapEntry represents a single LDAP entry
+	LdapEntry struct {
+		// DN contains distinguished name
+		DN string `json:"dn"`
+		// Attributes contains list of attributes
+		Attributes LdapAttributes `json:"attributes"`
+	}
+
+	// LdapAttributes represents all LDAP attributes of a particular
+	// ldap entry
+	LdapAttributes struct {
+		// CurrentTime contains current time
+		CurrentTime []string `json:"currentTime,omitempty"`
+		// SubschemaSubentry contains subschema subentry
+		SubschemaSubentry []string `json:"subschemaSubentry,omitempty"`
+		// DsServiceName contains ds service name
+		DsServiceName []string `json:"dsServiceName,omitempty"`
+		// NamingContexts contains naming contexts
+		NamingContexts []string `json:"namingContexts,omitempty"`
+		// DefaultNamingContext contains default naming context
+		DefaultNamingContext []string `json:"defaultNamingContext,omitempty"`
+		// SchemaNamingContext contains schema naming context
+		SchemaNamingContext []string `json:"schemaNamingContext,omitempty"`
+		// ConfigurationNamingContext contains configuration naming context
+		ConfigurationNamingContext []string `json:"configurationNamingContext,omitempty"`
+		// RootDomainNamingContext contains root domain naming context
+		RootDomainNamingContext []string `json:"rootDomainNamingContext,omitempty"`
+		// SupportedLDAPVersion contains supported LDAP version
+		SupportedLDAPVersion []string `json:"supportedLDAPVersion,omitempty"`
+		// HighestCommittedUSN contains highest committed USN
+		HighestCommittedUSN []string `json:"highestCommittedUSN,omitempty"`
+		// SupportedSASLMechanisms contains supported SASL mechanisms
+		SupportedSASLMechanisms []string `json:"supportedSASLMechanisms,omitempty"`
+		// DnsHostName contains DNS host name
+		DnsHostName []string `json:"dnsHostName,omitempty"`
+		// LdapServiceName contains LDAP service name
+		LdapServiceName []string `json:"ldapServiceName,omitempty"`
+		// ServerName contains server name
+		ServerName []string `json:"serverName,omitempty"`
+		// IsSynchronized contains is synchronized
+		IsSynchronized []string `json:"isSynchronized,omitempty"`
+		// IsGlobalCatalogReady contains is global catalog ready
+		IsGlobalCatalogReady []string `json:"isGlobalCatalogReady,omitempty"`
+		// DomainFunctionality contains domain functionality
+		DomainFunctionality []string `json:"domainFunctionality,omitempty"`
+		// ForestFunctionality contains forest functionality
+		ForestFunctionality []string `json:"forestFunctionality,omitempty"`
+		// DomainControllerFunctionality contains domain controller functionality
+		DomainControllerFunctionality []string `json:"domainControllerFunctionality,omitempty"`
+		// DistinguishedName contains the distinguished name
+		DistinguishedName []string `json:"distinguishedName,omitempty"`
+		// SAMAccountName contains the SAM account name
+		SAMAccountName []string `json:"sAMAccountName,omitempty"`
+		// PWDLastSet contains the password last set time
+		PWDLastSet []string `json:"pwdLastSet,omitempty"`
+		// LastLogon contains the last logon time
+		LastLogon []string `json:"lastLogon,omitempty"`
+		// MemberOf contains the groups the entry is a member of
+		MemberOf []string `json:"memberOf,omitempty"`
+		// ServicePrincipalName contains the service principal names
+		ServicePrincipalName []string `json:"servicePrincipalName,omitempty"`
+		// Extra contains other extra fields which might be present
+		Extra map[string]any `json:"extra,omitempty"`
+	}
+)
+
+// getSearchResult converts a ldap.SearchResult to a SearchResult
+func getSearchResult(sr *ldap.SearchResult) *SearchResult {
+	t := &SearchResult{
+		Referrals: []string{},
+		Controls:  []string{},
+		Entries:   []LdapEntry{},
+	}
+	// add referrals
+	t.Referrals = append(t.Referrals, sr.Referrals...)
+	// add controls
+	for _, ctrl := range sr.Controls {
+		t.Controls = append(t.Controls, ctrl.String())
+	}
+	// add entries
+	for _, entry := range sr.Entries {
+		t.Entries = append(t.Entries, parseLdapEntry(entry))
+	}
+	return t
+}
+
+func parseLdapEntry(entry *ldap.Entry) LdapEntry {
+	e := LdapEntry{
+		DN: entry.DN,
+	}
+	attrs := LdapAttributes{
+		Extra: make(map[string]any),
+	}
+	for _, attr := range entry.Attributes {
+		switch attr.Name {
+		case "currentTime":
+			attrs.CurrentTime = decodeTimestamps(attr.Values)
+		case "subschemaSubentry":
+			attrs.SubschemaSubentry = attr.Values
+		case "dsServiceName":
+			attrs.DsServiceName = attr.Values
+		case "namingContexts":
+			attrs.NamingContexts = attr.Values
+		case "defaultNamingContext":
+			attrs.DefaultNamingContext = attr.Values
+		case "schemaNamingContext":
+			attrs.SchemaNamingContext = attr.Values
+		case "configurationNamingContext":
+			attrs.ConfigurationNamingContext = attr.Values
+		case "rootDomainNamingContext":
+			attrs.RootDomainNamingContext = attr.Values
+		case "supportedLDAPVersion":
+			attrs.SupportedLDAPVersion = attr.Values
+		case "highestCommittedUSN":
+			attrs.HighestCommittedUSN = attr.Values
+		case "supportedSASLMechanisms":
+			attrs.SupportedSASLMechanisms = attr.Values
+		case "dnsHostName":
+			attrs.DnsHostName = attr.Values
+		case "ldapServiceName":
+			attrs.LdapServiceName = attr.Values
+		case "serverName":
+			attrs.ServerName = attr.Values
+		case "isSynchronized":
+			attrs.IsSynchronized = attr.Values
+		case "isGlobalCatalogReady":
+			attrs.IsGlobalCatalogReady = attr.Values
+		case "domainFunctionality":
+			attrs.DomainFunctionality = attr.Values
+		case "forestFunctionality":
+			attrs.ForestFunctionality = attr.Values
+		case "domainControllerFunctionality":
+			attrs.DomainControllerFunctionality = attr.Values
+		case "distinguishedName":
+			attrs.DistinguishedName = attr.Values
+		case "sAMAccountName":
+			attrs.SAMAccountName = attr.Values
+		case "pwdLastSet":
+			attrs.PWDLastSet = decodeTimestamps(attr.Values)
+		case "lastLogon":
+			attrs.LastLogon = decodeTimestamps(attr.Values)
+		case "memberOf":
+			attrs.MemberOf = attr.Values
+		case "servicePrincipalName":
+			attrs.ServicePrincipalName = attr.Values
+		default:
+			attrs.Extra[attr.Name] = attr.Values
+		}
+	}
+	e.Attributes = attrs
+	return e
+}
+
+// decodeTimestamps  decodes multiple timestamps
+func decodeTimestamps(timestamps []string) []string {
+	res := []string{}
+	for _, timestamp := range timestamps {
+		res = append(res, DecodeADTimestamp(timestamp))
+	}
+	return res
+}
+
 // DecodeSID decodes a SID string
 // @example
 // ```javascript

pkg/js/libs/mssql/memo.mssql.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	_ "github.com/denisenkom/go-mssqldb"
+	_ "github.com/microsoft/go-mssqldb"
 
 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
 )

pkg/js/libs/mssql/mssql.go

@@ -9,14 +9,14 @@ import (
 	"strings"
 	"time"
 
-	_ "github.com/denisenkom/go-mssqldb"
+	_ "github.com/microsoft/go-mssqldb"
 	"github.com/praetorian-inc/fingerprintx/pkg/plugins/services/mssql"
 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
 )
 
 type (
 	// Client is a client for MS SQL database.
-	// Internally client uses denisenkom/go-mssqldb driver.
+	// Internally client uses microsoft/go-mssqldb driver.
 	// @example
 	// ```javascript
 	// const mssql = require('nuclei/mssql');

pkg/js/libs/mysql/mysql.go

@@ -36,6 +36,7 @@ type (
 // const isMySQL = mysql.IsMySQL('acme.com', 3306);
 // ```
 func (c *MySQLClient) IsMySQL(host string, port int) (bool, error) {
+	// todo: why this is exposed? Service fingerprint should be automatic
 	return memoizedisMySQL(host, port)
 }
 
@@ -77,6 +78,16 @@ func (c *MySQLClient) Connect(host string, port int, username, password string)
 		// host is not valid according to network policy
 		return false, protocolstate.ErrHostDenied.Msgf(host)
 	}
+
+	// executing queries implies the remote mysql service
+	ok, err := c.IsMySQL(host, port)
+	if err != nil {
+		return false, err
+	}
+	if !ok {
+		return false, fmt.Errorf("not a mysql service")
+	}
+
 	dsn, err := BuildDSN(MySQLOptions{
 		Host:     host,
 		Port:     port,
@@ -182,6 +193,16 @@ func (c *MySQLClient) ExecuteQueryWithOpts(opts MySQLOptions, query string) (*ut
 		// host is not valid according to network policy
 		return nil, protocolstate.ErrHostDenied.Msgf(opts.Host)
 	}
+
+	// executing queries implies the remote mysql service
+	ok, err := c.IsMySQL(opts.Host, opts.Port)
+	if err != nil {
+		return nil, err
+	}
+	if !ok {
+		return nil, fmt.Errorf("not a mysql service")
+	}
+
 	dsn, err := BuildDSN(opts)
 	if err != nil {
 		return nil, err
@@ -220,6 +241,15 @@ func (c *MySQLClient) ExecuteQueryWithOpts(opts MySQLOptions, query string) (*ut
 // log(to_json(result));
 // ```
 func (c *MySQLClient) ExecuteQuery(host string, port int, username, password, query string) (*utils.SQLResult, error) {
+	// executing queries implies the remote mysql service
+	ok, err := c.IsMySQL(host, port)
+	if err != nil {
+		return nil, err
+	}
+	if !ok {
+		return nil, fmt.Errorf("not a mysql service")
+	}
+
 	return c.ExecuteQueryWithOpts(MySQLOptions{
 		Host:     host,
 		Port:     port,

pkg/js/libs/postgres/postgres.go

@@ -37,6 +37,7 @@ type (
 // const isPostgres = postgres.IsPostgres('acme.com', 5432);
 // ```
 func (c *PGClient) IsPostgres(host string, port int) (bool, error) {
+	// todo: why this is exposed? Service fingerprint should be automatic
 	return memoizedisPostgres(host, port)
 }
 
@@ -74,6 +75,13 @@ func isPostgres(host string, port int) (bool, error) {
 // const connected = client.Connect('acme.com', 5432, 'username', 'password');
 // ```
 func (c *PGClient) Connect(host string, port int, username, password string) (bool, error) {
+	ok, err := c.IsPostgres(host, port)
+	if err != nil {
+		return false, err
+	}
+	if !ok {
+		return false, fmt.Errorf("not a postgres service")
+	}
 	return memoizedconnect(host, port, username, password, "postgres")
 }
 
@@ -88,6 +96,14 @@ func (c *PGClient) Connect(host string, port int, username, password string) (bo
 // log(to_json(result));
 // ```
 func (c *PGClient) ExecuteQuery(host string, port int, username, password, dbName, query string) (*utils.SQLResult, error) {
+	ok, err := c.IsPostgres(host, port)
+	if err != nil {
+		return nil, err
+	}
+	if !ok {
+		return nil, fmt.Errorf("not a postgres service")
+	}
+
 	return memoizedexecuteQuery(host, port, username, password, dbName, query)
 }
 
@@ -129,6 +145,14 @@ func executeQuery(host string, port int, username string, password string, dbNam
 // const connected = client.ConnectWithDB('acme.com', 5432, 'username', 'password', 'dbname');
 // ```
 func (c *PGClient) ConnectWithDB(host string, port int, username, password, dbName string) (bool, error) {
+	ok, err := c.IsPostgres(host, port)
+	if err != nil {
+		return false, err
+	}
+	if !ok {
+		return false, fmt.Errorf("not a postgres service")
+	}
+
 	return memoizedconnect(host, port, username, password, dbName)
 }
 
@@ -149,10 +173,10 @@ func connect(host string, port int, username string, password string, dbName str
 	defer cancel()
 
 	db := pg.Connect(&pg.Options{
-		Addr:               target,
-		User:               username,
-		Password:           password,
-		Database:           dbName,
+		Addr:     target,
+		User:     username,
+		Password: password,
+		Database: dbName,
 		Dialer: func(network, addr string) (net.Conn, error) {
 			return protocolstate.Dialer.Dial(context.Background(), network, addr)
 		},

pkg/js/utils/nucleijs.go

@@ -60,12 +60,16 @@ func (j *NucleiJS) HandleError(err error, msg ...string) {
 	if len(msg) == 0 {
 		j.ThrowError(err)
 	}
-	j.Throw(fmt.Sprintf("%s: %s", strings.Join(msg, ":"), err.Error()))
+	j.Throw("%s: %s", strings.Join(msg, ":"), err.Error())
 }
 
 // Throw throws an error in goja runtime
 func (j *NucleiJS) Throw(format string, args ...interface{}) {
-	panic(j.runtime().ToValue(fmt.Sprintf(format, args...)))
+	if len(args) > 0 {
+		panic(j.runtime().ToValue(fmt.Sprintf(format, args...)))
+	}
+
+	panic(j.runtime().ToValue(format))
 }
 
 // GetArg returns argument at index from goja runtime if not found throws error
@@ -95,7 +99,7 @@ func (j *NucleiJS) GetArgSafe(args []goja.Value, index int, defaultValue any) an
 // Require throws an error if expression is false
 func (j *NucleiJS) Require(expr bool, msg string) {
 	if !expr {
-		j.Throw(msg)
+		j.Throw("%s", msg)
 	}
 }
 

pkg/output/output.go

@@ -71,6 +71,7 @@ type StandardWriter struct {
 	omitTemplate          bool
 	DisableStdout         bool
 	AddNewLinesOutputFile bool // by default this is only done for stdout
+	KeysToRedact          []string
 }
 
 var decolorizerRegex = regexp.MustCompile(`\x1B\[[0-9;]*[a-zA-Z]`)
@@ -253,6 +254,7 @@ func NewStandardWriter(options *types.Options) (*StandardWriter, error) {
 		storeResponse:    options.StoreResponse,
 		storeResponseDir: options.StoreResponseDir,
 		omitTemplate:     options.OmitTemplate,
+		KeysToRedact:     options.Redact,
 	}
 	return writer, nil
 }
@@ -264,6 +266,13 @@ func (w *StandardWriter) Write(event *ResultEvent) error {
 		event.Template, event.TemplateURL = utils.TemplatePathURL(types.ToString(event.TemplatePath), types.ToString(event.TemplateID))
 	}
 
+	if len(w.KeysToRedact) > 0 {
+		event.Request = redactKeys(event.Request, w.KeysToRedact)
+		event.Response = redactKeys(event.Response, w.KeysToRedact)
+		event.CURLCommand = redactKeys(event.CURLCommand, w.KeysToRedact)
+		event.Matched = redactKeys(event.Matched, w.KeysToRedact)
+	}
+
 	event.Timestamp = time.Now()
 
 	var data []byte
@@ -302,6 +311,14 @@ func (w *StandardWriter) Write(event *ResultEvent) error {
 	return nil
 }
 
+func redactKeys(data string, keysToRedact []string) string {
+	for _, key := range keysToRedact {
+		keyPattern := regexp.MustCompile(fmt.Sprintf(`(?i)(%s\s*[:=]\s*["']?)[^"'\r\n&]+(["'\r\n]?)`, regexp.QuoteMeta(key)))
+		data = keyPattern.ReplaceAllString(data, `$1***$2`)
+	}
+	return data
+}
+
 // JSONLogRequest is a trace/error log request written to file
 type JSONLogRequest struct {
 	Template  string      `json:"template"`
@@ -508,12 +525,12 @@ func tryParseCause(err error) error {
 	if strings.HasPrefix(msg, "ReadStatusLine:") {
 		// last index is actual error (from rawhttp)
 		parts := strings.Split(msg, ":")
-		return errkit.New(strings.TrimSpace(parts[len(parts)-1]))
+		return errkit.New("%s", strings.TrimSpace(parts[len(parts)-1]))
 	}
 	if strings.Contains(msg, "read ") {
 		// same here
 		parts := strings.Split(msg, ":")
-		return errkit.New(strings.TrimSpace(parts[len(parts)-1]))
+		return errkit.New("%s", strings.TrimSpace(parts[len(parts)-1]))
 	}
 	return err
 }

pkg/projectfile/httputil.go

@@ -17,7 +17,7 @@ func hash(v interface{}) (string, error) {
 
 	sh := sha256.New()
 
-	if _, err = io.WriteString(sh, string(data)); err != nil {
+	if _, err = sh.Write(data); err != nil {
 		return "", err
 	}
 	return hex.EncodeToString(sh.Sum(nil)), nil

pkg/protocols/code/code.go

@@ -37,8 +37,7 @@ import (
 )
 
 const (
-	pythonEnvRegex    = `os\.getenv\(['"]([^'"]+)['"]\)`
-	TimeoutMultiplier = 6 // timeout multiplier for code protocol
+	pythonEnvRegex = `os\.getenv\(['"]([^'"]+)['"]\)`
 )
 
 var (
@@ -179,9 +178,6 @@ func (request *Request) ExecuteWithResults(input *contextargs.Context, dynamicVa
 		metaSrc.AddVariable(gozerotypes.Variable{Name: name, Value: v})
 	}
 
-	// set timeout using multiplier
-	timeout := TimeoutMultiplier * request.options.Options.Timeout
-
 	if request.PreCondition != "" {
 		if request.options.Options.Debug || request.options.Options.DebugRequests {
 			gologger.Debug().Msgf("[%s] Executing Precondition for Code request\n", request.TemplateID)
@@ -199,11 +195,11 @@ func (request *Request) ExecuteWithResults(input *contextargs.Context, dynamicVa
 
 		result, err := request.options.JsCompiler.ExecuteWithOptions(request.preConditionCompiled, args,
 			&compiler.ExecuteOptions{
-				Timeout:  timeout,
-				Source:   &request.PreCondition,
-				Callback: registerPreConditionFunctions,
-				Cleanup:  cleanUpPreConditionFunctions,
-				Context:  input.Context(),
+				TimeoutVariants: request.options.Options.GetTimeouts(),
+				Source:          &request.PreCondition,
+				Callback:        registerPreConditionFunctions,
+				Cleanup:         cleanUpPreConditionFunctions,
+				Context:         input.Context(),
 			})
 		if err != nil {
 			return errorutil.NewWithTag(request.TemplateID, "could not execute pre-condition: %s", err)
@@ -218,7 +214,7 @@ func (request *Request) ExecuteWithResults(input *contextargs.Context, dynamicVa
 		}
 	}
 
-	ctx, cancel := context.WithTimeoutCause(input.Context(), time.Duration(timeout)*time.Second, ErrCodeExecutionDeadline)
+	ctx, cancel := context.WithTimeoutCause(input.Context(), request.options.Options.GetTimeouts().CodeExecutionTimeout, ErrCodeExecutionDeadline)
 	defer cancel()
 	// Note: we use contextutil despite the fact that gozero accepts context as argument
 	gOutput, err := contextutil.ExecFuncWithTwoReturns(ctx, func() (*gozerotypes.Result, error) {

pkg/protocols/common/contextargs/contextargs.go

@@ -50,9 +50,11 @@ func NewWithInput(ctx context.Context, input string) *Context {
 	if err != nil {
 		gologger.Error().Msgf("contextargs: could not create cookie jar: %s\n", err)
 	}
+	metaInput := NewMetaInput()
+	metaInput.Input = input
 	return &Context{
 		ctx:       ctx,
-		MetaInput: &MetaInput{Input: input},
+		MetaInput: metaInput,
 		CookieJar: jar,
 		args: &mapsutil.SyncLockMap[string, interface{}]{
 			Map:      make(map[string]interface{}),

pkg/protocols/common/contextargs/metainput.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"net"
 	"strings"
+	"sync"
 
 	jsoniter "github.com/json-iterator/go"
 	"github.com/projectdiscovery/nuclei/v3/pkg/input/types"
@@ -24,6 +25,12 @@ type MetaInput struct {
 
 	// ReqResp is the raw request for the input
 	ReqResp *types.RequestResponse `json:"raw-request,omitempty"`
+
+	mu *sync.Mutex
+}
+
+func NewMetaInput() *MetaInput {
+	return &MetaInput{mu: &sync.Mutex{}}
 }
 
 func (metaInput *MetaInput) marshalToBuffer() (bytes.Buffer, error) {
@@ -135,10 +142,10 @@ func (metaInput *MetaInput) Unmarshal(data string) error {
 }
 
 func (metaInput *MetaInput) Clone() *MetaInput {
-	input := &MetaInput{
-		Input:    metaInput.Input,
-		CustomIP: metaInput.CustomIP,
-	}
+	input := NewMetaInput()
+	input.Input = metaInput.Input
+	input.CustomIP = metaInput.CustomIP
+	input.hash = metaInput.hash
 	if metaInput.ReqResp != nil {
 		input.ReqResp = metaInput.ReqResp.Clone()
 	}
@@ -160,6 +167,9 @@ func (metaInput *MetaInput) GetScanHash(templateId string) string {
 	// there may be some cases where metainput is changed ex: while executing self-contained template etc
 	// but that totally changes the scanID/hash so to avoid that we compute hash only once
 	// and reuse it for all subsequent calls
+	metaInput.mu.Lock()
+	defer metaInput.mu.Unlock()
+
 	if metaInput.hash == "" {
 		var rawRequest string
 		if metaInput.ReqResp != nil {

pkg/protocols/common/helpers/responsehighlighter/hexdump.go

@@ -44,7 +44,8 @@ func toHighLightedHexDump(hexDump, snippetToHighlight string) (HighlightableHexD
 	hexDumpRowValues := hexDumpParsePattern.FindAllStringSubmatch(hexDump, -1)
 	if hexDumpRowValues == nil || len(hexDumpRowValues) != strings.Count(hexDump, "\n") {
 		message := "could not parse hexdump"
-		gologger.Warning().Msgf(message)
+		gologger.Warning().Msg(message)
+
 		return HighlightableHexDump{}, errors.New(message)
 	}
 

pkg/protocols/common/hosterrorscache/hosterrorscache.go

@@ -14,6 +14,7 @@ import (
 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
 	"github.com/projectdiscovery/nuclei/v3/pkg/types/nucleierr"
 	"github.com/projectdiscovery/utils/errkit"
+	stringsutil "github.com/projectdiscovery/utils/strings"
 )
 
 // CacheInterface defines the signature of the hosterrorscache so that
@@ -200,7 +201,7 @@ func (c *Cache) checkError(err error) bool {
 		errX := errkit.FromError(err)
 		tmp := errX.Cause()
 		cause := tmp.Error()
-		if strings.Contains(cause, "ReadStatusLine:") && strings.Contains(cause, "read: connection reset by peer") {
+		if stringsutil.ContainsAll(cause, "ReadStatusLine:", "read: connection reset by peer") {
 			// this is a FP and should not be counted as a host error
 			// because server closes connection when it reads corrupted bytes which we send via rawhttp
 			return false

pkg/protocols/common/interactsh/const.go

@@ -8,7 +8,7 @@ import (
 
 var (
 	defaultInteractionDuration = 60 * time.Second
-	interactshURLMarkerRegex   = regexp.MustCompile(`{{interactsh-url(?:_[0-9]+){0,3}}}`)
+	interactshURLMarkerRegex = regexp.MustCompile(`(%7[B|b]|\{){2}(interactsh-url(?:_[0-9]+){0,3})(%7[D|d]|\}){2}`)
 
 	ErrInteractshClientNotInitialized = errors.New("interactsh client not initialized")
 )

pkg/protocols/common/protocolstate/state.go

@@ -34,9 +34,7 @@ func Init(options *types.Options) error {
 
 	lfaAllowed = options.AllowLocalFileAccess
 	opts := fastdialer.DefaultOptions
-	if options.DialerTimeout > 0 {
-		opts.DialerTimeout = options.DialerTimeout
-	}
+	opts.DialerTimeout = options.GetTimeouts().DialTimeout
 	if options.DialerKeepAlive > 0 {
 		opts.DialerKeepAlive = options.DialerKeepAlive
 	}

pkg/protocols/dns/dns.go

@@ -141,12 +141,6 @@ func (request *Request) Compile(options *protocols.ExecutorOptions) error {
 		recursion := true
 		request.Recursion = &recursion
 	}
-	dnsClientOptions := &dnsclientpool.Configuration{
-		Retries: request.Retries,
-	}
-	if len(request.Resolvers) > 0 {
-		dnsClientOptions.Resolvers = request.Resolvers
-	}
 	// Create a dns client for the class
 	client, err := request.getDnsClient(options, nil)
 	if err != nil {

pkg/protocols/dns/request.go

@@ -3,7 +3,6 @@ package dns
 import (
 	"encoding/hex"
 	"fmt"
-	"net/url"
 	"strings"
 	"sync"
 
@@ -23,7 +22,6 @@ import (
 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/utils/vardump"
 	protocolutils "github.com/projectdiscovery/nuclei/v3/pkg/protocols/utils"
 	templateTypes "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
-	"github.com/projectdiscovery/nuclei/v3/pkg/utils"
 	"github.com/projectdiscovery/retryabledns"
 	iputil "github.com/projectdiscovery/utils/ip"
 	syncutil "github.com/projectdiscovery/utils/sync"
@@ -38,16 +36,8 @@ func (request *Request) Type() templateTypes.ProtocolType {
 
 // ExecuteWithResults executes the protocol requests and returns results instead of writing them.
 func (request *Request) ExecuteWithResults(input *contextargs.Context, metadata, previous output.InternalEvent, callback protocols.OutputEventCallback) error {
-	// Parse the URL and return domain if URL.
-	var domain string
-	if utils.IsURL(input.MetaInput.Input) {
-		domain = extractDomain(input.MetaInput.Input)
-	} else {
-		domain = input.MetaInput.Input
-	}
-
 	var err error
-	domain, err = request.parseDNSInput(domain)
+	domain, err := request.parseDNSInput(input.MetaInput.Input)
 	if err != nil {
 		return errors.Wrap(err, "could not build request")
 	}
@@ -152,7 +142,7 @@ func (request *Request) execute(input *contextargs.Context, domain string, metad
 	if request.options.Options.Debug || request.options.Options.DebugRequests || request.options.Options.StoreResponse {
 		msg := fmt.Sprintf("[%s] Dumped DNS request for %s", request.options.TemplateID, question)
 		if request.options.Options.Debug || request.options.Options.DebugRequests {
-			gologger.Info().Str("domain", domain).Msgf(msg)
+			gologger.Info().Str("domain", domain).Msg(msg)
 			gologger.Print().Msgf("%s", requestString)
 		}
 		if request.options.Options.StoreResponse {
@@ -230,7 +220,7 @@ func (request *Request) parseDNSInput(host string) (string, error) {
 	return host, nil
 }
 
-func dumpResponse(event *output.InternalWrappedEvent, request *Request, requestOptions *protocols.ExecutorOptions, response, domain string) {
+func dumpResponse(event *output.InternalWrappedEvent, request *Request, _ *protocols.ExecutorOptions, response, domain string) {
 	cliOptions := request.options.Options
 	if cliOptions.Debug || cliOptions.DebugResponse || cliOptions.StoreResponse {
 		hexDump := false
@@ -261,12 +251,3 @@ func dumpTraceData(event *output.InternalWrappedEvent, requestOptions *protocols
 		gologger.Debug().Msgf("[%s] Dumped DNS Trace data for %s\n\n%s", requestOptions.TemplateID, domain, highlightedResponse)
 	}
 }
-
-// extractDomain extracts the domain name of a URL
-func extractDomain(theURL string) string {
-	u, err := url.Parse(theURL)
-	if err != nil {
-		return ""
-	}
-	return u.Hostname()
-}

pkg/protocols/dns/request_test.go

@@ -67,19 +67,5 @@ func TestDNSExecuteWithResults(t *testing.T) {
 	require.Equal(t, 1, len(finalEvent.Results[0].ExtractedResults), "could not get correct number of extracted results")
 	require.Equal(t, "93.184.215.14", finalEvent.Results[0].ExtractedResults[0], "could not get correct extracted results")
 	finalEvent = nil
-
-	t.Run("url-to-domain", func(t *testing.T) {
-		metadata := make(output.InternalEvent)
-		previous := make(output.InternalEvent)
-		err := request.ExecuteWithResults(contextargs.NewWithInput(context.Background(), "https://example.com"), metadata, previous, func(event *output.InternalWrappedEvent) {
-			finalEvent = event
-		})
-		require.Nil(t, err, "could not execute dns request")
-	})
-	require.NotNil(t, finalEvent, "could not get event output from request")
-	require.Equal(t, 1, len(finalEvent.Results), "could not get correct number of results")
-	require.Equal(t, "test", finalEvent.Results[0].MatcherName, "could not get correct matcher name of results")
-	require.Equal(t, 1, len(finalEvent.Results[0].ExtractedResults), "could not get correct number of extracted results")
-	require.Equal(t, "93.184.215.14", finalEvent.Results[0].ExtractedResults[0], "could not get correct extracted results")
-	finalEvent = nil
+	// Note: changing url to domain is responsible at tmplexec package and is implemented there
 }

pkg/protocols/file/request.go

@@ -51,6 +51,9 @@ func (request *Request) ExecuteWithResults(input *contextargs.Context, metadata,
 	if err != nil {
 		return err
 	}
+	if input.MetaInput.Input == "" {
+		return errors.New("input cannot be empty file or folder expected")
+	}
 	err = request.getInputPaths(input.MetaInput.Input, func(filePath string) {
 		wg.Add()
 		func(filePath string) {
@@ -250,6 +253,8 @@ func (request *Request) findMatchesWithReader(reader io.Reader, input *contextar
 		for k, v := range previous {
 			dslMap[k] = v
 		}
+		// add vars to template context
+		request.options.AddTemplateVars(input.MetaInput, request.Type(), request.ID, dslMap)
 		// add template context variables to DSL map
 		if request.options.HasTemplateCtx(input.MetaInput) {
 			dslMap = generators.MergeMaps(dslMap, request.options.GetTemplateCtx(input.MetaInput).GetAll())
@@ -323,7 +328,6 @@ func (request *Request) buildEvent(input, filePath string, fileMatches []FileMat
 		exprLines[fileMatch.Expr] = append(exprLines[fileMatch.Expr], fileMatch.Line)
 		exprBytes[fileMatch.Expr] = append(exprBytes[fileMatch.Expr], fileMatch.ByteIndex)
 	}
-
 	event := eventcreator.CreateEventWithOperatorResults(request, internalEvent, operatorResult)
 	// Annotate with line numbers if asked by the user
 	if request.options.Options.ShowMatchLine {

pkg/protocols/headless/request.go

@@ -174,7 +174,7 @@ func (request *Request) executeRequestWithPayloads(input *contextargs.Context, p
 				reqBuilder.WriteString("\t" + actStepStr + "\n")
 			}
 		}
-		gologger.Debug().Msgf(reqBuilder.String())
+		gologger.Debug().Msg(reqBuilder.String())
 	}
 
 	var responseBody string
@@ -215,6 +215,10 @@ func (request *Request) executeRequestWithPayloads(input *contextargs.Context, p
 	}
 
 	dumpResponse(event, request.options, responseBody, input.MetaInput.Input)
+	shouldStopAtFirstMatch := request.StopAtFirstMatch || request.options.StopAtFirstMatch || request.options.Options.StopAtFirstMatch
+	if shouldStopAtFirstMatch && event.HasOperatorResult() {
+		return types.ErrNoMoreRequests
+	}
 	return nil
 }
 

pkg/protocols/http/build_request.go

@@ -90,9 +90,9 @@ func (g *generatedRequest) ApplyAuth(provider authprovider.AuthProvider) {
 		return
 	}
 	if g.request != nil {
-		auth := provider.LookupURLX(g.request.URL)
-		if auth != nil {
-			auth.ApplyOnRR(g.request)
+		authStrategies := provider.LookupURLX(g.request.URL)
+		for _, strategy := range authStrategies {
+			strategy.ApplyOnRR(g.request)
 		}
 	}
 	if g.rawRequest != nil {
@@ -101,11 +101,11 @@ func (g *generatedRequest) ApplyAuth(provider authprovider.AuthProvider) {
 			gologger.Warning().Msgf("[authprovider] Could not parse URL %s: %s\n", g.rawRequest.FullURL, err)
 			return
 		}
-		auth := provider.LookupURLX(parsed)
-		if auth != nil {
-			// here we need to apply it custom because we don't have a standard/official
-			// rawhttp request format ( which we probably should have )
-			g.rawRequest.ApplyAuthStrategy(auth)
+		authStrategies := provider.LookupURLX(parsed)
+		// here we need to apply it custom because we don't have a standard/official
+		// rawhttp request format ( which we probably should have )
+		for _, strategy := range authStrategies {
+			g.rawRequest.ApplyAuthStrategy(strategy)
 		}
 	}
 }

pkg/protocols/http/http.go

@@ -147,6 +147,10 @@ type Request struct {
 	//   - "AWS"
 	Signature SignatureTypeHolder `yaml:"signature,omitempty" json:"signature,omitempty" jsonschema:"title=signature is the http request signature method,description=Signature is the HTTP Request signature Method,enum=AWS"`
 
+	// description: |
+	//   SkipSecretFile skips the authentication or authorization configured in the secret file.
+	SkipSecretFile bool `yaml:"skip-secret-file,omitempty" json:"skip-secret-file,omitempty" jsonschema:"title=bypass secret file,description=Skips the authentication or authorization configured in the secret file"`
+
 	// description: |
 	//   CookieReuse is an optional setting that enables cookie reuse for
 	//   all requests defined in raw section.
@@ -336,7 +340,7 @@ func (request *Request) Compile(options *protocols.ExecutorOptions) error {
 				request.Raw[i] = strings.ReplaceAll(raw, "\n", "\r\n")
 			}
 		}
-		request.rawhttpClient = httpclientpool.GetRawHTTP(options.Options)
+		request.rawhttpClient = httpclientpool.GetRawHTTP(options)
 	}
 	if len(request.Matchers) > 0 || len(request.Extractors) > 0 {
 		compiled := &request.Operators

pkg/protocols/http/httpclientpool/clientpool.go

@@ -17,6 +17,7 @@ import (
 	"golang.org/x/net/publicsuffix"
 
 	"github.com/projectdiscovery/fastdialer/fastdialer/ja3/impersonate"
+	"github.com/projectdiscovery/nuclei/v3/pkg/protocols"
 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/utils"
 	"github.com/projectdiscovery/nuclei/v3/pkg/types"
@@ -31,28 +32,14 @@ var (
 	forceMaxRedirects int
 	normalClient      *retryablehttp.Client
 	clientPool        *mapsutil.SyncLockMap[string, *retryablehttp.Client]
-	// MaxResponseHeaderTimeout is the timeout for response headers
-	// to be read from the server (this prevents infinite hang started by server if any)
-	// Note: this will be overridden temporarily when using @timeout request annotation
-	MaxResponseHeaderTimeout = time.Duration(10) * time.Second
-	// HttpTimeoutMultiplier is the multiplier for the http timeout
-	HttpTimeoutMultiplier = 3
 )
 
-// GetHttpTimeout returns the http timeout for the client
-func GetHttpTimeout(opts *types.Options) time.Duration {
-	return time.Duration(opts.Timeout*HttpTimeoutMultiplier) * time.Second
-}
-
 // Init initializes the clientpool implementation
 func Init(options *types.Options) error {
 	// Don't create clients if already created in the past.
 	if normalClient != nil {
 		return nil
 	}
-	if options.Timeout > 10 {
-		MaxResponseHeaderTimeout = time.Duration(options.Timeout) * time.Second
-	}
 	if options.ShouldFollowHTTPRedirects() {
 		forceMaxRedirects = options.MaxRedirects
 	}
@@ -143,7 +130,7 @@ func (c *Configuration) HasStandardOptions() bool {
 }
 
 // GetRawHTTP returns the rawhttp request client
-func GetRawHTTP(options *types.Options) *rawhttp.Client {
+func GetRawHTTP(options *protocols.ExecutorOptions) *rawhttp.Client {
 	if rawHttpClient == nil {
 		rawHttpOptions := rawhttp.DefaultOptions
 		if types.ProxyURL != "" {
@@ -153,7 +140,7 @@ func GetRawHTTP(options *types.Options) *rawhttp.Client {
 		} else if protocolstate.Dialer != nil {
 			rawHttpOptions.FastDialer = protocolstate.Dialer
 		}
-		rawHttpOptions.Timeout = GetHttpTimeout(options)
+		rawHttpOptions.Timeout = options.Options.GetTimeouts().HttpTimeout
 		rawHttpClient = rawhttp.NewClient(rawHttpOptions)
 	}
 	return rawHttpClient
@@ -239,7 +226,7 @@ func wrappedGet(options *types.Options, configuration *Configuration) (*retryabl
 	}
 
 	// responseHeaderTimeout is max timeout for response headers to be read
-	responseHeaderTimeout := MaxResponseHeaderTimeout
+	responseHeaderTimeout := options.GetTimeouts().HttpResponseHeaderTimeout
 	if configuration.ResponseHeaderTimeout != 0 {
 		responseHeaderTimeout = configuration.ResponseHeaderTimeout
 	}
@@ -308,7 +295,7 @@ func wrappedGet(options *types.Options, configuration *Configuration) (*retryabl
 		CheckRedirect: makeCheckRedirectFunc(redirectFlow, maxRedirects),
 	}
 	if !configuration.NoTimeout {
-		httpclient.Timeout = GetHttpTimeout(options)
+		httpclient.Timeout = options.GetTimeouts().HttpTimeout
 	}
 	client := retryablehttp.NewWithHTTPClient(httpclient, retryableHttpOptions)
 	if jar != nil {

pkg/protocols/http/httpclientpool/options.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/projectdiscovery/rawhttp"
+	stringsutil "github.com/projectdiscovery/utils/strings"
 	urlutil "github.com/projectdiscovery/utils/url"
 )
 
@@ -36,7 +37,7 @@ func SendRawRequest(client *rawhttp.Client, opts *RawHttpRequestOpts) (*http.Res
 	resp, err := client.DoRawWithOptions(opts.Method, opts.URL, opts.Path, opts.Headers, opts.Body, opts.Options)
 	if err != nil {
 		cause := err.Error()
-		if strings.Contains(cause, "ReadStatusLine: ") && strings.Contains(cause, "read: connection reset by peer") {
+		if stringsutil.ContainsAll(cause, "ReadStatusLine: ", "read: connection reset by peer") {
 			// this error is caused when rawhttp client sends a corrupted or malformed request packet to server
 			// some servers may attempt gracefully shutdown but most will just abruptly close the connection which results
 			// in a connection reset by peer error and this can be safely assumed as 400 Bad Request in terms of normal http flow

pkg/protocols/http/request.go

@@ -483,7 +483,7 @@ func (request *Request) ExecuteWithResults(input *contextargs.Context, dynamicVa
 			request.options.RateLimitTake()
 
 			ctx := request.newContext(input)
-			ctxWithTimeout, cancel := context.WithTimeoutCause(ctx, httpclientpool.GetHttpTimeout(request.options.Options), ErrHttpEngineRequestDeadline)
+			ctxWithTimeout, cancel := context.WithTimeoutCause(ctx, request.options.Options.GetTimeouts().HttpTimeout, ErrHttpEngineRequestDeadline)
 			defer cancel()
 
 			generatedHttpRequest, err := generator.Make(ctxWithTimeout, input, data, payloads, dynamicValue)
@@ -689,7 +689,7 @@ func (request *Request) executeRequest(input *contextargs.Context, generatedRequ
 	}
 
 	// === apply auth strategies ===
-	if generatedRequest.request != nil {
+	if generatedRequest.request != nil && !request.SkipSecretFile {
 		generatedRequest.ApplyAuth(request.options.AuthProvider)
 	}
 
@@ -844,6 +844,8 @@ func (request *Request) executeRequest(input *contextargs.Context, generatedRequ
 			outputEvent["ip"] = input.MetaInput.CustomIP
 		} else {
 			outputEvent["ip"] = protocolstate.Dialer.GetDialedIP(hostname)
+			// try getting cname
+			request.addCNameIfAvailable(hostname, outputEvent)
 		}
 
 		if len(generatedRequest.interactshURLs) > 0 {
@@ -940,6 +942,8 @@ func (request *Request) executeRequest(input *contextargs.Context, generatedRequ
 			outputEvent["ip"] = input.MetaInput.CustomIP
 		} else {
 			outputEvent["ip"] = protocolstate.Dialer.GetDialedIP(hostname)
+			// try getting cname
+			request.addCNameIfAvailable(hostname, outputEvent)
 		}
 		if request.options.Interactsh != nil {
 			request.options.Interactsh.MakePlaceholders(generatedRequest.interactshURLs, outputEvent)
@@ -1031,6 +1035,23 @@ func (request *Request) validateNFixEvent(input *contextargs.Context, gr *genera
 	}
 }
 
+// addCNameIfAvailable adds the cname to the event if available
+func (request *Request) addCNameIfAvailable(hostname string, outputEvent map[string]interface{}) {
+	data, err := protocolstate.Dialer.GetDNSData(hostname)
+	if err == nil {
+		switch len(data.CNAME) {
+		case 0:
+			return
+		case 1:
+			outputEvent["cname"] = data.CNAME[0]
+		default:
+			// add 1st and put others in cname_all
+			outputEvent["cname"] = data.CNAME[0]
+			outputEvent["cname_all"] = data.CNAME
+		}
+	}
+}
+
 // handleSignature of the http request
 func (request *Request) handleSignature(generatedRequest *generatedRequest) error {
 	switch request.Signature.Value {
@@ -1062,10 +1083,15 @@ func (request *Request) setCustomHeaders(req *generatedRequest) {
 			req.rawRequest.Headers[k] = v
 		} else {
 			kk, vv := strings.TrimSpace(k), strings.TrimSpace(v)
-			req.request.Header.Set(kk, vv)
+			// NOTE(dwisiswant0): Do we really not need to convert it first into
+			// lowercase?
 			if kk == "Host" {
 				req.request.Host = vv
+
+				continue
 			}
+
+			req.request.Header[kk] = []string{vv}
 		}
 	}
 }

pkg/protocols/http/request_annotations.go

@@ -130,6 +130,10 @@ func (r *Request) parseAnnotations(rawRequest string, request *retryablehttp.Req
 		if duration := reTimeoutAnnotation.FindStringSubmatch(rawRequest); len(duration) > 0 {
 			value := strings.TrimSpace(duration[1])
 			if parsed, err := time.ParseDuration(value); err == nil {
+				// to avoid dos via timeout request annotation in http template we set it to maximum of 2 minutes
+				if parsed > 2*time.Minute {
+					parsed = 2 * time.Minute
+				}
 				//nolint:govet // cancelled automatically by withTimeout
 				// global timeout is overridden by annotation by replacing context
 				ctx, overrides.cancelFunc = context.WithTimeoutCause(context.TODO(), parsed, ErrTimeoutAnnotationDeadline)
@@ -140,7 +144,7 @@ func (r *Request) parseAnnotations(rawRequest string, request *retryablehttp.Req
 		} else {
 			//nolint:govet // cancelled automatically by withTimeout
 			// global timeout is overridden by annotation by replacing context
-			ctx, overrides.cancelFunc = context.WithTimeoutCause(context.TODO(), httpclientpool.GetHttpTimeout(r.options.Options), ErrRequestTimeoutDeadline)
+			ctx, overrides.cancelFunc = context.WithTimeoutCause(context.TODO(), r.options.Options.GetTimeouts().HttpTimeout, ErrRequestTimeoutDeadline)
 			request = request.Clone(ctx)
 		}
 	}

pkg/protocols/http/request_fuzz.go

@@ -18,6 +18,7 @@ import (
 	"github.com/projectdiscovery/nuclei/v3/pkg/output"
 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols"
 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/interactsh"
 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/utils/vardump"
 	protocolutils "github.com/projectdiscovery/nuclei/v3/pkg/protocols/utils"
@@ -112,6 +113,7 @@ func (request *Request) executeFuzzingRule(input *contextargs.Context, previous
 // executeAllFuzzingRules executes all fuzzing rules defined in template for a given base request
 func (request *Request) executeAllFuzzingRules(input *contextargs.Context, values map[string]interface{}, baseRequest *retryablehttp.Request, callback protocols.OutputEventCallback) error {
 	applicable := false
+	values = generators.MergeMaps(request.filterDataMap(input), values)
 	for _, rule := range request.Fuzzing {
 		select {
 		case <-input.Context().Done():
@@ -234,7 +236,12 @@ func (request *Request) ShouldFuzzTarget(input *contextargs.Context) bool {
 	}
 	status := []bool{}
 	for index, filter := range request.FuzzPreCondition {
-		isMatch, _ := request.Match(request.filterDataMap(input), filter)
+		dataMap := request.filterDataMap(input)
+		// dump if svd is enabled
+		if request.options.Options.ShowVarDump {
+			gologger.Debug().Msgf("Fuzz Filter Variables: \n%s\n", vardump.DumpVariables(dataMap))
+		}
+		isMatch, _ := request.Match(dataMap, filter)
 		status = append(status, isMatch)
 		if request.options.Options.MatcherStatus {
 			gologger.Debug().Msgf("[%s] [%s] Filter => %s : %v", input.MetaInput.Target(), request.options.TemplateID, operators.GetMatcherName(filter, index), isMatch)
@@ -295,10 +302,5 @@ func (request *Request) filterDataMap(input *contextargs.Context) map[string]int
 		// add default method value
 		m["method"] = http.MethodGet
 	}
-
-	// dump if svd is enabled
-	if request.options.Options.ShowVarDump {
-		gologger.Debug().Msgf("Fuzz Filter Variables: \n%s\n", vardump.DumpVariables(m))
-	}
 	return m
 }

pkg/protocols/javascript/js.go

@@ -35,6 +35,7 @@ import (
 	"github.com/projectdiscovery/utils/errkit"
 	errorutil "github.com/projectdiscovery/utils/errors"
 	iputil "github.com/projectdiscovery/utils/ip"
+	mapsutil "github.com/projectdiscovery/utils/maps"
 	syncutil "github.com/projectdiscovery/utils/sync"
 	urlutil "github.com/projectdiscovery/utils/url"
 )
@@ -65,9 +66,6 @@ type Request struct {
 	//   Code contains code to execute for the javascript request.
 	Code string `yaml:"code,omitempty" json:"code,omitempty" jsonschema:"title=code to execute in javascript,description=Executes inline javascript code for the request"`
 	// description: |
-	//   Timeout in seconds is optional timeout for each  javascript script execution (i.e init, pre-condition, code)
-	Timeout int `yaml:"timeout,omitempty" json:"timeout,omitempty" jsonschema:"title=timeout for javascript execution,description=Timeout in seconds is optional timeout for entire javascript script execution"`
-	// description: |
 	//   StopAtFirstMatch stops processing the request at first match.
 	StopAtFirstMatch bool `yaml:"stop-at-first-match,omitempty" json:"stop-at-first-match,omitempty" jsonschema:"title=stop at first match,description=Stop the execution after a match is found"`
 	// description: |
@@ -153,9 +151,9 @@ func (request *Request) Compile(options *protocols.ExecutorOptions) error {
 		}
 
 		opts := &compiler.ExecuteOptions{
-			Timeout: request.Timeout,
-			Source:  &request.Init,
-			Context: context.Background(),
+			TimeoutVariants: request.options.Options.GetTimeouts(),
+			Source:          &request.Init,
+			Context:         context.Background(),
 		}
 		// register 'export' function to export variables from init code
 		// these are saved in args and are available in pre-condition and request code
@@ -345,18 +343,37 @@ func (request *Request) ExecuteWithResults(target *contextargs.Context, dynamicV
 		argsCopy.TemplateCtx = templateCtx.GetAll()
 
 		result, err := request.options.JsCompiler.ExecuteWithOptions(request.preConditionCompiled, argsCopy,
-			&compiler.ExecuteOptions{Timeout: request.Timeout, Source: &request.PreCondition, Context: target.Context()})
-		if err != nil {
-			return errorutil.NewWithTag(request.TemplateID, "could not execute pre-condition: %s", err)
-		}
-		if !result.GetSuccess() || types.ToString(result["error"]) != "" {
-			gologger.Warning().Msgf("[%s] Precondition for request %s was not satisfied\n", request.TemplateID, request.PreCondition)
-			request.options.Progress.IncrementFailedRequestsBy(1)
-			return nil
-		}
-		if request.options.Options.Debug || request.options.Options.DebugRequests {
-			request.options.Progress.IncrementRequests()
-			gologger.Debug().Msgf("[%s] Precondition for request was satisfied\n", request.TemplateID)
+			&compiler.ExecuteOptions{
+				TimeoutVariants: requestOptions.Options.GetTimeouts(),
+				Source:          &request.PreCondition, Context: target.Context(),
+			})
+		// if precondition was successful
+		if err == nil && result.GetSuccess() {
+			if request.options.Options.Debug || request.options.Options.DebugRequests {
+				request.options.Progress.IncrementRequests()
+				gologger.Debug().Msgf("[%s] Precondition for request was satisfied\n", request.TemplateID)
+			}
+		} else {
+			var outError error
+			// if js code failed to execute
+			if err != nil {
+				outError = errkit.Append(errkit.New("pre-condition not satisfied skipping template execution"), err)
+			} else {
+				// execution successful but pre-condition returned false
+				outError = errkit.New("pre-condition not satisfied skipping template execution")
+			}
+			results := map[string]interface{}(result)
+			results["error"] = outError.Error()
+			// generate and return failed event
+			data := request.generateEventData(input, results, hostPort)
+			data = generators.MergeMaps(data, payloadValues)
+			event := eventcreator.CreateEventWithAdditionalOptions(request, data, request.options.Options.Debug || request.options.Options.DebugResponse, func(wrappedEvent *output.InternalWrappedEvent) {
+				allVars := argsCopy.Map()
+				allVars = generators.MergeMaps(allVars, data)
+				wrappedEvent.OperatorsResult.PayloadValues = allVars
+			})
+			callback(event)
+			return err
 		}
 	}
 
@@ -500,7 +517,11 @@ func (request *Request) executeRequestWithPayloads(hostPort string, input *conte
 	}
 
 	results, err := request.options.JsCompiler.ExecuteWithOptions(request.scriptCompiled, argsCopy,
-		&compiler.ExecuteOptions{Timeout: request.Timeout, Source: &request.Code, Context: input.Context()})
+		&compiler.ExecuteOptions{
+			TimeoutVariants: requestOptions.Options.GetTimeouts(),
+			Source:          &request.Code,
+			Context:         input.Context(),
+		})
 	if err != nil {
 		// shouldn't fail even if it returned error instead create a failure event
 		results = compiler.ExecuteResult{"success": false, "error": err.Error()}
@@ -527,63 +548,9 @@ func (request *Request) executeRequestWithPayloads(hostPort string, input *conte
 		}
 	}
 
-	data := make(map[string]interface{})
-	for k, v := range payloadValues {
-		data[k] = v
-	}
-	data["type"] = request.Type().String()
-	for k, v := range results {
-		data[k] = v
-	}
-	data["request"] = beautifyJavascript(request.Code)
-	data["host"] = input.MetaInput.Input
-	data["matched"] = hostPort
-	data["template-path"] = requestOptions.TemplatePath
-	data["template-id"] = requestOptions.TemplateID
-	data["template-info"] = requestOptions.TemplateInfo
-	if request.StopAtFirstMatch || request.options.StopAtFirstMatch {
-		data["stop-at-first-match"] = true
-	}
-
-	// add ip address to data
-	if input.MetaInput.CustomIP != "" {
-		data["ip"] = input.MetaInput.CustomIP
-	} else {
-		// context: https://github.com/projectdiscovery/nuclei/issues/5021
-		hostname := input.MetaInput.Input
-		if strings.Contains(hostname, ":") {
-			host, _, err := net.SplitHostPort(hostname)
-			if err == nil {
-				hostname = host
-			} else {
-				// naive way
-				if !strings.Contains(hostname, "]") {
-					hostname = hostname[:strings.LastIndex(hostname, ":")]
-				}
-			}
-		}
-		data["ip"] = protocolstate.Dialer.GetDialedIP(hostname)
-		// if input itself was an ip, use it
-		if iputil.IsIP(hostname) {
-			data["ip"] = hostname
-		}
-
-		// if ip is not found,this is because ssh and other protocols do not use fastdialer
-		// although its not perfect due to its use case dial and get ip
-		dnsData, err := protocolstate.Dialer.GetDNSData(hostname)
-		if err == nil {
-			for _, v := range dnsData.A {
-				data["ip"] = v
-				break
-			}
-			if data["ip"] == "" {
-				for _, v := range dnsData.AAAA {
-					data["ip"] = v
-					break
-				}
-			}
-		}
-	}
+	values := mapsutil.Merge(payloadValues, results)
+	// generate event data
+	data := request.generateEventData(input, values, hostPort)
 
 	// add and get values from templatectx
 	request.options.AddTemplateVars(input.MetaInput, request.Type(), request.GetID(), data)
@@ -630,6 +597,65 @@ func (request *Request) executeRequestWithPayloads(hostPort string, input *conte
 	return nil
 }
 
+// generateEventData generates event data for the request
+func (request *Request) generateEventData(input *contextargs.Context, values map[string]interface{}, matched string) map[string]interface{} {
+	data := make(map[string]interface{})
+	for k, v := range values {
+		data[k] = v
+	}
+	data["type"] = request.Type().String()
+	data["request-pre-condition"] = beautifyJavascript(request.PreCondition)
+	data["request"] = beautifyJavascript(request.Code)
+	data["host"] = input.MetaInput.Input
+	data["matched"] = matched
+	data["template-path"] = request.options.TemplatePath
+	data["template-id"] = request.options.TemplateID
+	data["template-info"] = request.options.TemplateInfo
+	if request.StopAtFirstMatch || request.options.StopAtFirstMatch {
+		data["stop-at-first-match"] = true
+	}
+	// add ip address to data
+	if input.MetaInput.CustomIP != "" {
+		data["ip"] = input.MetaInput.CustomIP
+	} else {
+		// context: https://github.com/projectdiscovery/nuclei/issues/5021
+		hostname := input.MetaInput.Input
+		if strings.Contains(hostname, ":") {
+			host, _, err := net.SplitHostPort(hostname)
+			if err == nil {
+				hostname = host
+			} else {
+				// naive way
+				if !strings.Contains(hostname, "]") {
+					hostname = hostname[:strings.LastIndex(hostname, ":")]
+				}
+			}
+		}
+		data["ip"] = protocolstate.Dialer.GetDialedIP(hostname)
+		// if input itself was an ip, use it
+		if iputil.IsIP(hostname) {
+			data["ip"] = hostname
+		}
+
+		// if ip is not found,this is because ssh and other protocols do not use fastdialer
+		// although its not perfect due to its use case dial and get ip
+		dnsData, err := protocolstate.Dialer.GetDNSData(hostname)
+		if err == nil {
+			for _, v := range dnsData.A {
+				data["ip"] = v
+				break
+			}
+			if data["ip"] == "" {
+				for _, v := range dnsData.AAAA {
+					data["ip"] = v
+					break
+				}
+			}
+		}
+	}
+	return data
+}
+
 func (request *Request) getArgsCopy(input *contextargs.Context, payloadValues map[string]interface{}, requestOptions *protocols.ExecutorOptions, ignoreErrors bool) (*compiler.ExecuteArgs, error) {
 	// Template args from payloads
 	argsCopy, err := request.evaluateArgs(payloadValues, requestOptions, ignoreErrors)

pkg/protocols/network/request.go

@@ -327,7 +327,7 @@ func (request *Request) executeRequestWithPayloads(variables map[string]interfac
 		}
 
 		if input.Read > 0 {
-			buffer, err := ConnReadNWithTimeout(conn, int64(input.Read), request.options.Options.ResponseReadTimeout)
+			buffer, err := ConnReadNWithTimeout(conn, int64(input.Read), request.options.Options.GetTimeouts().TcpReadTimeout)
 			if err != nil {
 				return errorutil.NewWithErr(err).Msgf("could not read response from connection")
 			}
@@ -377,7 +377,7 @@ func (request *Request) executeRequestWithPayloads(variables map[string]interfac
 		bufferSize = -1
 	}
 
-	final, err := ConnReadNWithTimeout(conn, int64(bufferSize), request.options.Options.ResponseReadTimeout)
+	final, err := ConnReadNWithTimeout(conn, int64(bufferSize), request.options.Options.GetTimeouts().TcpReadTimeout)
 	if err != nil {
 		request.options.Output.Request(request.options.TemplatePath, address, request.Type().String(), err)
 		gologger.Verbose().Msgf("could not read more data from %s: %s", actualAddress, err)

pkg/protocols/protocols.go

@@ -197,6 +197,11 @@ func (e *ExecutorOptions) AddTemplateVars(input *contextargs.MetaInput, reqType
 	}
 	templateCtx := e.GetTemplateCtx(input)
 	for k, v := range vars {
+		if stringsutil.HasPrefixAny(k, templateTypes.SupportedProtocolsStrings()...) {
+			// this was inherited from previous protocols no need to modify it we can directly set it or omit
+			templateCtx.Set(k, v)
+			continue
+		}
 		if !stringsutil.EqualFoldAny(k, "template-id", "template-info", "template-path") {
 			if reqID != "" {
 				k = reqID + "_" + k
@@ -216,6 +221,11 @@ func (e *ExecutorOptions) AddTemplateVar(input *contextargs.MetaInput, templateT
 		return
 	}
 	templateCtx := e.GetTemplateCtx(input)
+	if stringsutil.HasPrefixAny(key, templateTypes.SupportedProtocolsStrings()...) {
+		// this was inherited from previous protocols no need to modify it we can directly set it or omit
+		templateCtx.Set(key, value)
+		return
+	}
 	if reqID != "" {
 		key = reqID + "_" + key
 	} else if templateType < templateTypes.InvalidProtocol {