init proxy after pool init

2026-11-08 02:08:33 -10:00 · 2024-06-27 18:09:30 +02:00
145 changed files with 1209 additions and 3275 deletions
@@ -1,72 +0,0 @@
-name: Bug Report
-description: Create a report to help us to improve the Nuclei.
-title: "[BUG] ..."
-labels: ["Type: Bug"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this bug report!
-
-        For support requests, FAQs or "How to" questions, please use the [GitHub Discussions](https://github.com/projectdiscovery/nuclei/discussions) section instead or join our [Discord server](https://discord.gg/projectdiscovery) to discuss the idea on the **#nuclei** channel.
-
-        :warning: **Issues missing important information may be closed without further investigation.**
-  - type: checkboxes
-    attributes:
-      label: Is there an existing issue for this?
-      description: Please search to see if an issue already exists for the bug you encountered.
-      options:
-      - label: I have searched the existing issues.
-        required: true
-  - type: textarea
-    attributes:
-      label: Current Behavior
-      description: A concise description of what you're experiencing.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Expected Behavior
-      description: A concise description of what you expected to happen.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Steps To Reproduce
-      description: |
-        Steps to reproduce the behavior, for example, commands to run Nuclei.
-
-        :warning: **Please redact any literal target hosts/URLs or other sensitive information.**
-      placeholder: |
-        1. Run `nuclei -t ...`
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Relevant log output
-      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
-      render: shell
-  - type: textarea
-    attributes:
-      label: Environment
-      description: |
-        Examples:
-          - **OS**: Ubuntu 20.04
-          - **Nuclei** (`nuclei -version`): v3.3.1
-          - **Go** (`go version`): go1.22.0 _(only if you've installed it via the `go install` command)_
-      value: |
-          - OS: 
-          - Nuclei: 
-          - Go: 
-      render: markdown
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Anything else?
-      description: |
-        Links? References? Templates? Anything that will give us more context about the issue you are encountering!
-
-        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
-    validations:
-      required: false
@@ -1,37 +0,0 @@
-name: Feature Request
-description: Request feature to implement in the Nuclei.
-title: "[FEATURE] ..."
-labels: ["Type: Enhancement"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this feature request!
-
-        Please make sure to provide a detailed description with all the relevant information that might be required to start working on this feature. In case you are not sure about your request or whether the particular feature is already supported or not, please [start a discussion](https://github.com/projectdiscovery/nuclei/discussions/categories/ideas) instead.
-
-        Join our [Discord server](https://discord.gg/projectdiscovery) to discuss the idea on the **#nuclei** channel.
-  - type: textarea
-    attributes:
-      label: Describe your feature request
-      description: A clear and concise description of feature to implement.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Describe the use case of the feature
-      description: A clear and concise description of the feature request's motivation and the use-cases in which it could be useful.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Describe alternatives you've considered
-      description: A clear and concise description of any alternative solutions or features you've considered.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: Add any other context about the feature request here.
-    validations:
-      required: false
@@ -0,0 +1,21 @@
+---
+name: Feature request
+about: Request feature to implement in this project
+title: ""
+labels: 'Type: Enhancement'
+assignees: ''
+
+---
+
+<!--
+1. Please make sure to provide a detailed description with all the relevant information that might be required to start working on this feature.
+2. In case you are not sure about your request or whether the particular feature is already supported or not, please start a discussion instead.
+3. GitHub Discussion: https://github.com/projectdiscovery/nuclei/discussions/categories/ideas
+4. Join our discord server at https://discord.gg/projectdiscovery to discuss the idea on the #nuclei channel.
+-->
+
+### Please describe your feature request:
+<!-- A clear and concise description of feature to implement -->
+
+### Describe the use case of this feature:
+<!-- A clear and concise description of the feature request's motivation and the use-cases in which it could be useful. -->
@@ -0,0 +1,36 @@
+---
+name: Issue report
+about: Create a report to help us to improve the project
+labels: 'Type: Bug'
+
+---
+
+<!-- 
+1. Please search to see if an issue already exists for the bug you encountered.
+2. For support requests, FAQs or "How to" questions, please use the GitHub Discussions section instead - https://github.com/projectdiscovery/nuclei/discussions or
+3. Join our discord server at https://discord.gg/projectdiscovery and post the question on the #nuclei channel.
+-->
+
+<!-- ISSUES MISSING IMPORTANT INFORMATION MAY BE CLOSED WITHOUT INVESTIGATION. -->
+
+### Nuclei version:
+<!-- You can find current version of nuclei with "nuclei -version" -->
+<!-- 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/ -->
+
+### Current Behavior:
+<!-- A concise description of what you're experiencing. -->
+
+### Expected Behavior:
+<!-- A concise description of what you expected to happen. -->
+
+### Steps To Reproduce:
+<!--
+Example: steps to reproduce the behavior:
+1. Run 'nuclei -t ... -u ..'
+2. See error...
+-->
+
+
+### Anything else:
+<!-- Links? References? Screenshots? Anything that will give us more context about the issue that you are encountering! -->
@@ -1,7 +0,0 @@
-addReviewers: true
-reviewers:
-  - dogancanbakir
-
-numberOfReviewers: 1
-skipKeywords:
-  - '@dependabot'
@@ -12,23 +12,28 @@ jobs:
    name: Test Builds
    strategy:
      matrix:
+        go-version: [1.21.x]
        os: [ubuntu-latest, windows-latest, macOS-latest]
+
    runs-on: ${{ matrix.os }}
    steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-
      - name: Set up Go
-        uses: projectdiscovery/actions/setup/go@v1
+        uses: actions/setup-go@v4
+        with:
+          go-version: ${{ matrix.go-version }}

-      # required for running python code in py-snippet.yaml integration test
-      - name: Set up Python
+      - name: Set up Python   # required for running python code in py-snippet.yaml integration test
        uses: actions/setup-python@v4
        with:
          python-version: '3.10'

-      - name: Verify Go modules
-        run: make verify
+      - name: Check out code
+        uses: actions/checkout@v3
+
+      - name: Go Mod hygiene
+        run: |
+          go clean -modcache
+          go mod tidy

      - name: Build
        run: go build .
@@ -60,10 +65,9 @@ jobs:
        run: go run .
        working-directory: examples/simple/

-      # Temporarily disabled very flaky in github actions
-      # - name: Example SDK Advanced
-      #   run: go run .
-      #   working-directory: examples/advanced/
+      - name: Example SDK Advanced
+        run: go run .
+        working-directory: examples/advanced/

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

      - name: Functional Tests
        env:
@@ -12,11 +12,16 @@ jobs:
    name: Lint Test
    runs-on: ubuntu-latest
    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
      - name: Set up Go
-        uses: projectdiscovery/actions/setup/go@v1
+        uses: actions/setup-go@v4
+        with:
+          go-version: 1.21.x
+
+      - name: Checkout code
+        uses: actions/checkout@v3

      - name: Run golangci-lint
-        uses: projectdiscovery/actions/golangci-lint@v1
+        uses: golangci/[email protected]
+        with:
+          version: latest
+          args: --timeout 5m
@@ -11,19 +11,24 @@ 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: Check out code
-        uses: actions/checkout@v4
-
      - name: Set up Go
-        uses: projectdiscovery/actions/setup/go@v1
+        uses: actions/setup-go@v4
+        with:
+          go-version: ${{ matrix.go-version }}

-      - name: Verify Go modules
-        run: make verify
+      - name: Check out code
+        uses: actions/checkout@v3
+
+      - name: Go Mod hygine
+        run: |
+          go clean -modcache
+          go mod tidy

      # Max GH exection time 6H => timeout after that
      - name: Running performance with big list
@@ -11,15 +11,14 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with: 
          fetch-depth: 0

      - name: "Set up Go"
-        uses: projectdiscovery/actions/setup/go@v1
-
-      - name: "Set up Git"
-        uses: projectdiscovery/actions/setup/git@v1
+        uses: actions/setup-go@v4
+        with: 
+          go-version: 1.21.x

      - name: Generate YAML Syntax Documentation
        id: generate-docs
@@ -36,6 +35,8 @@ 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

@@ -9,17 +9,20 @@ on:
 jobs: 
  release: 
    runs-on: ubuntu-latest-16-cores
+
    steps: 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
        with: 
          fetch-depth: 0

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

      - name: Set up Go
-        uses: projectdiscovery/actions/setup/go@v1
+        uses: actions/setup-go@v4
+        with:
+          go-version: 1.21.x
      
-      - name: Release snapshot
-        uses: projectdiscovery/actions/goreleaser@v1
+      - name: release test
+        uses: goreleaser/goreleaser-action@v4
+        with:
+          args: "release --clean --snapshot"
+          version: latest
@@ -10,9 +10,10 @@ jobs:
  build:
    runs-on: ubuntu-latest-16-cores
    steps:
-      - uses: actions/checkout@v4
-
-      - uses: projectdiscovery/actions/setup/go@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with: 
+          go-version: 1.21.x

      - name: Template Validation
        run: |
@@ -1,42 +1,43 @@
-# Misc
-**/*-cache
-**/*-config
-**/.cache
-*.DS_Store
-*.exe
-.devcontainer
-.gitignore
 .idea
 .vscode
-
-# Binaries
-**/bindgen
-**/debug-*
-**/docgen
-**/functional-test
-**/fuzzplayground
-**/integration-test
-**/jsdocgen
-**/main
-**/memogen
-**/nuclei
-**/nuclei-stats*
-**/nuclei_dev
-**/nuclei_main
-**/scan-charts
-**/scrapefunc
-**/scrapefuncs
-**/tsgen
-
-# Templates
-/*.yaml
-
-# Generated docs
-/dsl.md
-
-# Junk
+.devcontainer
+vendor
 dist
+integration_tests/nuclei
+integration_tests/.cache
+integration_tests/integration-test
+cmd/nuclei/main
+cmd/nuclei/nuclei
+cmd/integration-test/nuclei
+cmd/functional-test/nuclei_dev
+cmd/functional-test/nuclei_main
+cmd/functional-test/functional-test
+cmd/docgen/docgen
 pkg/protocols/common/helpers/deserialization/testdata/Deserialize.class
 pkg/protocols/common/helpers/deserialization/testdata/ValueObject.class
 pkg/protocols/common/helpers/deserialization/testdata/ValueObject2.ser
-vendor
+*.exe
+.gitignore
+pkg/js/devtools/bindgen/cmd/bindgen/bindgen
+pkg/js/devtools/jsdocgen/jsdocgen
+pkg/js/devtools/tsgen/tsgen
+pkg/js/devtools/tsgen/cmd/tsgen/tsgen
+*.DS_Store
+pkg/protocols/headless/engine/.cache
+/nuclei
+/bindgen
+/jsdocgen
+/tsgen
+/scrapefuncs
+/integration_tests/.cache/
+/*.yaml
+**/*-config
+**/*-cache
+/fuzzplayground
+integration_tests/fuzzplayground
+/dsl.md
+/nuclei-stats
+/nuclei-stats-*
+/scan-charts
+/**/debug-*
+
@@ -9,7 +9,7 @@ RUN go build ./cmd/nuclei

 # Release
 FROM alpine:3.18.6
-RUN apk upgrade --no-cache \
+RUN apk -U upgrade --no-cache \
    && apk add --no-cache bind-tools chromium ca-certificates
 COPY --from=build-env /app/nuclei /usr/local/bin/

@@ -1,128 +1,62 @@
 # Go parameters
-GOCMD := go
-GOBUILD := $(GOCMD) build
-GOBUILD_OUTPUT := 
-GOBUILD_PACKAGES := 
-GOBUILD_ADDITIONAL_ARGS := 
-GOMOD := $(GOCMD) mod
-GOTEST := $(GOCMD) test
+GOCMD=go
+GOBUILD=$(GOCMD) build
+GOMOD=$(GOCMD) mod
+GOTEST=$(GOCMD) test
 GOFLAGS := -v
 # This should be disabled if the binary uses pprof
 LDFLAGS := -s -w

 ifneq ($(shell go env GOOS),darwin)
-	LDFLAGS = -extldflags "-static"
+LDFLAGS := -extldflags "-static"
 endif
    
-.PHONY: all build build-stats clean devtools-all devtools-bindgen devtools-scrapefuncs
-.PHONY: devtools-tsgen docs dsl-docs functional fuzzplayground go-build integration
-.PHONY: jsupdate-all jsupdate-bindgen jsupdate-tsgen memogen scan-charts test tidy ts verify
+.PHONY: all build build-stats scan-charts docs test integration functional tidy devtools jsupdate ts fuzzplayground memogen dsl-docs

 all: build
-
-clean:
-	rm -f '${GOBUILD_OUTPUT}' 2>/dev/null
-
-go-build: clean
-go-build:
-	$(GOBUILD) $(GOFLAGS) -ldflags '${LDFLAGS}' $(GOBUILD_ADDITIONAL_ARGS) \
-		 -o '${GOBUILD_OUTPUT}' $(GOBUILD_PACKAGES)
-
-build: GOBUILD_OUTPUT = nuclei
-build: GOBUILD_PACKAGES = cmd/nuclei/main.go
-build: go-build
-
-build-stats: GOBUILD_OUTPUT = nuclei-stats
-build-stats: GOBUILD_PACKAGES = cmd/nuclei/main.go
-build-stats: GOBUILD_ADDITIONAL_ARGS = -tags=stats
-build-stats: go-build
-
-scan-charts: GOBUILD_OUTPUT = scan-charts
-scan-charts: GOBUILD_PACKAGES = cmd/scan-charts/main.go
-scan-charts: go-build
-
-docs: GOBUILD_OUTPUT = cmd/docgen/docgen
-docs: GOBUILD_PACKAGES = cmd/docgen/docgen.go
-docs: bin = dstdocgen
+build:
+	rm -f nuclei 2>/dev/null
+	$(GOBUILD) $(GOFLAGS) -ldflags '$(LDFLAGS)' -o "nuclei" cmd/nuclei/main.go
+build-stats:
+	rm -f nuclei-stats 2>/dev/null
+	$(GOBUILD) $(GOFLAGS) -ldflags '$(LDFLAGS)' -tags=stats -o "nuclei-stats" cmd/nuclei/main.go
+scan-charts:
+	rm -f scan-charts 2>/dev/null
+	$(GOBUILD) $(GOFLAGS) -ldflags '$(LDFLAGS)' -o "scan-charts" cmd/scan-charts/main.go
 docs:
-	@if ! which $(bin) >/dev/null; then \
-		read -p "${bin} not found. Do you want to install it? (y/n) " answer; \
-		if [ "$$answer" = "y" ]; then \
-			echo "Installing ${bin}..."; \
-			go get -v github.com/projectdiscovery/yamldoc-go/cmd/docgen/$(bin); \
-			go install -v github.com/projectdiscovery/yamldoc-go/cmd/docgen/$(bin); \
-		else \
-			echo "Please install ${bin} manually."; \
-			exit 1; \
-		fi \
+	if ! which dstdocgen > /dev/null; then
+		echo -e "Command not found! Install? (y/n) \c"
+		go get -v github.com/projectdiscovery/yamldoc-go/cmd/docgen/dstdocgen
 	fi
-
-	# TODO: Handle the panic, so that we just need to run `go install $(bin)@latest` (line 51-52)
 	$(GOCMD) generate pkg/templates/templates.go
-
-	$(GOBUILD) -o "${GOBUILD_OUTPUT}" $(GOBUILD_PACKAGES)
-	./$(GOBUILD_OUTPUT) docs.md nuclei-jsonschema.json
-
-	git reset --hard # line 59
-
-test: GOFLAGS = -race -v
+	$(GOBUILD) -o "cmd/docgen/docgen" cmd/docgen/docgen.go
+	./cmd/docgen/docgen docs.md nuclei-jsonschema.json
 test:
 	$(GOTEST) $(GOFLAGS) ./...
-
 integration:
 	cd integration_tests; bash run.sh
-
 functional:
 	cd cmd/functional-test; bash run.sh
-
 tidy:
 	$(GOMOD) tidy
-
-verify: tidy
-	$(GOMOD) verify
-
-devtools-bindgen: GOBUILD_OUTPUT = bindgen
-devtools-bindgen: GOBUILD_PACKAGES = pkg/js/devtools/bindgen/cmd/bindgen/main.go
-devtools-bindgen: go-build
-
-devtools-tsgen: GOBUILD_OUTPUT = tsgen
-devtools-tsgen: GOBUILD_PACKAGES = pkg/js/devtools/tsgen/cmd/tsgen/main.go
-devtools-tsgen: go-build
-
-devtools-scrapefuncs: GOBUILD_OUTPUT = scrapefuncs
-devtools-scrapefuncs: GOBUILD_PACKAGES = pkg/js/devtools/scrapefuncs/main.go
-devtools-scrapefuncs: go-build
-
-devtools-all: devtools-bindgen devtools-tsgen devtools-scrapefuncs
-
-jsupdate-bindgen: GOBUILD_OUTPUT = bindgen
-jsupdate-bindgen: GOBUILD_PACKAGES = pkg/js/devtools/bindgen/cmd/bindgen/main.go
-jsupdate-bindgen: go-build
-jsupdate-bindgen:
-	./$(GOBUILD_OUTPUT) -dir pkg/js/libs -out pkg/js/generated
-
-jsupdate-tsgen: GOBUILD_OUTPUT = tsgen
-jsupdate-tsgen: GOBUILD_PACKAGES = pkg/js/devtools/tsgen/cmd/tsgen/main.go
-jsupdate-tsgen: go-build
-jsupdate-tsgen:
-	./$(GOBUILD_OUTPUT) -dir pkg/js/libs -out pkg/js/generated/ts
-
-jsupdate-all: jsupdate-bindgen jsupdate-tsgen
-
-ts: jsupdate-tsgen
-
-fuzzplayground: GOBUILD_OUTPUT = fuzzplayground
-fuzzplayground: GOBUILD_PACKAGES = cmd/tools/fuzzplayground/main.go
-fuzzplayground: LDFLAGS = -s -w
-fuzzplayground: go-build
-
-memogen: GOBUILD_OUTPUT = memogen
-memogen: GOBUILD_PACKAGES = cmd/memogen/memogen.go
-memogen: go-build
+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
+	$(GOBUILD) $(GOFLAGS) -ldflags '$(LDFLAGS)' -o "scrapefuncs" pkg/js/devtools/scrapefuncs/main.go
+jsupdate:
+	$(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
+	./bindgen -dir pkg/js/libs -out pkg/js/generated
+	./tsgen -dir pkg/js/libs -out pkg/js/generated/ts
+ts:
+	$(GOBUILD) $(GOFLAGS) -ldflags '$(LDFLAGS)' -o "tsgen" pkg/js/devtools/tsgen/cmd/tsgen/main.go
+	./tsgen -dir pkg/js/libs -out pkg/js/generated/ts
+fuzzplayground:
+	$(GOBUILD) $(GOFLAGS) -ldflags '$(LDFLAGS)' -o "fuzzplayground" cmd/tools/fuzzplayground/main.go
 memogen:
-	./$(GOBUILD_OUTPUT) -src pkg/js/libs -tpl cmd/memogen/function.tpl
-
-dsl-docs: GOBUILD_OUTPUT = scrapefuncs
-dsl-docs: GOBUILD_PACKAGES = pkg/js/devtools/scrapefuncs/main.go
+	$(GOBUILD) $(GOFLAGS) -ldflags '$(LDFLAGS)' -o "memogen" cmd/memogen/memogen.go
+	./memogen -src pkg/js/libs -tpl cmd/memogen/function.tpl
 dsl-docs:
-	./$(GOBUILD_OUTPUT) -out dsl.md
+	rm -f dsl.md scrapefuncs 2>/dev/null
+	$(GOBUILD) $(GOFLAGS) -ldflags '$(LDFLAGS)' -o "scrapefuncs" pkg/js/devtools/scrapefuncs/main.go
+	./scrapefuncs -out dsl.md
@@ -179,7 +179,6 @@ 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
@@ -204,6 +203,7 @@ 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,6 +212,7 @@ 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
@@ -237,7 +238,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,google) (default shodan)
+   -ue, -uncover-engine string[]  uncover search engine (shodan,censys,fofa,shodan-idb,quake,hunter,zoomeye,netlas,criminalip,publicwww,hunterhow) (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)
@@ -310,11 +311,9 @@ STATISTICS:
   -mp, -metrics-port int    port to expose nuclei metrics on (default 9092)

 CLOUD:
-   -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)
+   -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

 AUTHENTICATION:
   -sf, -secret-file string[]  path to config file containing secrets for nuclei authenticated scan
@@ -1404,19 +1404,6 @@ 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>
@@ -3682,8 +3669,6 @@ Enum Values:

  - <code>waitevent</code>

-  - <code>dialog</code>
-
  - <code>keyboard</code>

  - <code>debug</code>
@@ -4354,6 +4339,19 @@ 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>
@@ -55,7 +55,6 @@ var (
 		"dsl":             dslTestcases,
 		"flow":            flowTestcases,
 		"javascript":      jsTestcases,
-		"matcher-status":  matcherStatusTestcases,
 	}
 	// flakyTests are run with a retry count of 3
 	flakyTests = map[string]bool{
@@ -172,14 +172,7 @@ func (h *nonExistentTemplateList) Execute(nonExistingTemplateList string) error
 	ts := httptest.NewServer(router)
 	defer ts.Close()

-	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")
+	_, err := testutils.RunNucleiBareArgsAndGetResults(debug, nil, "-target", ts.URL, "-template-url", ts.URL+"/404")
 	if err == nil {
 		return fmt.Errorf("expected error for nonexisting workflow url")
 	}
@@ -195,14 +188,7 @@ func (h *nonExistentWorkflowList) Execute(nonExistingWorkflowList string) error
 	ts := httptest.NewServer(router)
 	defer ts.Close()

-	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")
+	_, err := testutils.RunNucleiBareArgsAndGetResults(debug, nil, "-target", ts.URL, "-workflow-url", ts.URL+"/404")
 	if err == nil {
 		return fmt.Errorf("expected error for nonexisting workflow url")
 	}
@@ -1,119 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-
-	"github.com/projectdiscovery/nuclei/v3/pkg/output"
-	"github.com/projectdiscovery/nuclei/v3/pkg/testutils"
-)
-
-var matcherStatusTestcases = []TestCaseInfo{
-	{Path: "protocols/http/get.yaml", TestCase: &httpNoAccess{}},
-	{Path: "protocols/network/net-https.yaml", TestCase: &networkNoAccess{}},
-	{Path: "protocols/headless/headless-basic.yaml", TestCase: &headlessNoAccess{}},
-	{Path: "protocols/javascript/net-https.yaml", TestCase: &javascriptNoAccess{}},
-	{Path: "protocols/websocket/basic.yaml", TestCase: &websocketNoAccess{}},
-	{Path: "protocols/dns/a.yaml", TestCase: &dnsNoAccess{}},
-}
-
-type httpNoAccess struct{}
-
-func (h *httpNoAccess) Execute(filePath string) error {
-	results, err := testutils.RunNucleiTemplateAndGetResults(filePath, "trust_me_bro.real", debug, "-ms", "-j")
-	if err != nil {
-		return err
-	}
-	event := &output.ResultEvent{}
-	_ = json.Unmarshal([]byte(results[0]), event)
-
-	if event.Error != "no address found for host" {
-		return fmt.Errorf("unexpected result: expecting \"no address found for host\" error but got none")
-	}
-	return nil
-}
-
-type networkNoAccess struct{}
-
-// Execute executes a test case and returns an error if occurred
-func (h *networkNoAccess) Execute(filePath string) error {
-	results, err := testutils.RunNucleiTemplateAndGetResults(filePath, "trust_me_bro.real", debug, "-ms", "-j")
-	if err != nil {
-		return err
-	}
-	event := &output.ResultEvent{}
-	_ = json.Unmarshal([]byte(results[0]), event)
-
-	if event.Error != "no address found for host" {
-		return fmt.Errorf("unexpected result: expecting \"no address found for host\" error but got \"%s\"", event.Error)
-	}
-	return nil
-}
-
-type headlessNoAccess struct{}
-
-// Execute executes a test case and returns an error if occurred
-func (h *headlessNoAccess) Execute(filePath string) error {
-	results, err := testutils.RunNucleiTemplateAndGetResults(filePath, "trust_me_bro.real", debug, "-headless", "-ms", "-j")
-	if err != nil {
-		return err
-	}
-	event := &output.ResultEvent{}
-	_ = json.Unmarshal([]byte(results[0]), event)
-
-	if event.Error == "" {
-		return fmt.Errorf("unexpected result: expecting an error but got \"%s\"", event.Error)
-	}
-	return nil
-}
-
-type javascriptNoAccess struct{}
-
-// Execute executes a test case and returns an error if occurred
-func (h *javascriptNoAccess) Execute(filePath string) error {
-	results, err := testutils.RunNucleiTemplateAndGetResults(filePath, "trust_me_bro.real", debug, "-ms", "-j")
-	if err != nil {
-		return err
-	}
-	event := &output.ResultEvent{}
-	_ = json.Unmarshal([]byte(results[0]), event)
-
-	if event.Error == "" {
-		return fmt.Errorf("unexpected result: expecting an error but got \"%s\"", event.Error)
-	}
-	return nil
-}
-
-type websocketNoAccess struct{}
-
-// Execute executes a test case and returns an error if occurred
-func (h *websocketNoAccess) Execute(filePath string) error {
-	results, err := testutils.RunNucleiTemplateAndGetResults(filePath, "ws://trust_me_bro.real", debug, "-ms", "-j")
-	if err != nil {
-		return err
-	}
-	event := &output.ResultEvent{}
-	_ = json.Unmarshal([]byte(results[0]), event)
-
-	if event.Error == "" {
-		return fmt.Errorf("unexpected result: expecting an error but got \"%s\"", event.Error)
-	}
-	return nil
-}
-
-type dnsNoAccess struct{}
-
-// Execute executes a test case and returns an error if occurred
-func (h *dnsNoAccess) Execute(filePath string) error {
-	results, err := testutils.RunNucleiTemplateAndGetResults(filePath, "trust_me_bro.real", debug, "-ms", "-j")
-	if err != nil {
-		return err
-	}
-	event := &output.ResultEvent{}
-	_ = json.Unmarshal([]byte(results[0]), event)
-
-	if event.Error == "" {
-		return fmt.Errorf("unexpected result: expecting an error but got \"%s\"", event.Error)
-	}
-	return nil
-}
@@ -12,7 +12,6 @@ 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"
@@ -273,7 +272,6 @@ 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",
@@ -299,6 +297,7 @@ 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"),
@@ -307,6 +306,7 @@ 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,7 +419,6 @@ 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)"),
@@ -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").Msg(logErrMsg(path, err, opts.debug, errFile))
+				gologger.Info().Label("max-request").Msgf(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("%s", templateResp.Error.Name)
+		return data, false, errorutil.New(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("%s", templateResp.Error.Name)
+		return data, false, errorutil.New(templateResp.Error.Name)
 	}
 	if strings.TrimSpace(templateResp.Updated) == "" && !templateResp.Lint {
 		if templateResp.LintError.Reason != "" {
@@ -300,7 +300,7 @@ func formatTemplate(data string) (string, bool, error) {
 	return data, false, errorutil.New("template format failed")
 }

-// lintTemplate lints template data using templateman lint api
+// lintTemplateData lints template data using templateman lint api
 func lintTemplate(data string) (bool, error) {
 	resp, err := retryablehttp.DefaultClient().Post(fmt.Sprintf("%s/lint", tmBaseUrl), "application/x-yaml", strings.NewReader(data))
 	if err != nil {
@@ -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("%s", validateResp.Error.Name)
+		return false, errorutil.New(validateResp.Error.Name)
 	}
 	return false, errorutil.New("template validation failed")
 }
@@ -1,24 +1,13 @@
 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.NewThreadSafeNucleiEngineCtx(ctx)
+	ne, err := nuclei.NewThreadSafeNucleiEngine()
 	if err != nil {
 		panic(err)
 	}
@@ -1,13 +1,9 @@
 package main

-import (
-	"context"
-
-	nuclei "github.com/projectdiscovery/nuclei/v3/lib"
-)
+import nuclei "github.com/projectdiscovery/nuclei/v3/lib"

 func main() {
-	ne, err := nuclei.NewNucleiEngineCtx(context.Background(),
+	ne, err := nuclei.NewNucleiEngine(
 		nuclei.WithTemplateFilters(nuclei.TemplateFilters{Tags: []string{"oast"}}),
 		nuclei.EnableStatsWithOpts(nuclei.StatsOptions{MetricServerPort: 6064}), // optionally enable metrics server for better observability
 	)
@@ -19,13 +19,13 @@ require (
 	github.com/miekg/dns v1.1.59
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/pkg/errors v0.9.1
-	github.com/projectdiscovery/clistats v0.1.0
-	github.com/projectdiscovery/fastdialer v0.2.7
-	github.com/projectdiscovery/hmap v0.0.56
+	github.com/projectdiscovery/clistats v0.0.20
+	github.com/projectdiscovery/fastdialer v0.1.5
+	github.com/projectdiscovery/hmap v0.0.47
 	github.com/projectdiscovery/interactsh v1.2.0
-	github.com/projectdiscovery/rawhttp v0.1.61
-	github.com/projectdiscovery/retryabledns v1.0.73
-	github.com/projectdiscovery/retryablehttp-go v1.0.76
+	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/yamldoc-go v1.0.4
 	github.com/remeh/sizedwaitgroup v1.0.0
 	github.com/rs/xid v1.5.0
@@ -36,10 +36,10 @@ require (
 	github.com/syndtr/goleveldb v1.0.0
 	github.com/valyala/fasttemplate v1.2.2
 	github.com/weppos/publicsuffix-go v0.30.2
-	github.com/xanzy/go-gitlab v0.107.0
+	github.com/xanzy/go-gitlab v0.84.0
 	go.uber.org/multierr v1.11.0
 	golang.org/x/net v0.26.0
-	golang.org/x/oauth2 v0.22.0
+	golang.org/x/oauth2 v0.18.0
 	golang.org/x/text v0.16.0
 	gopkg.in/yaml.v2 v2.4.0
 )
@@ -58,50 +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.126.0
+	github.com/getkin/kin-openapi v0.123.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/kitabisa/go-ci v1.0.2
 	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.2.1
+	github.com/projectdiscovery/dsl v0.1.3
 	github.com/projectdiscovery/fasttemplate v0.0.2
 	github.com/projectdiscovery/go-smb2 v0.0.0-20240129202741-052cc450c6cb
-	github.com/projectdiscovery/goflags v0.1.64
-	github.com/projectdiscovery/gologger v1.1.21
+	github.com/projectdiscovery/goflags v0.1.56
+	github.com/projectdiscovery/gologger v1.1.12
 	github.com/projectdiscovery/gostruct v0.0.2
 	github.com/projectdiscovery/gozero v0.0.2
-	github.com/projectdiscovery/httpx v1.6.8
+	github.com/projectdiscovery/httpx v1.6.3
 	github.com/projectdiscovery/mapcidr v1.1.34
 	github.com/projectdiscovery/n3iwf v0.0.0-20230523120440-b8cd232ff1f5
-	github.com/projectdiscovery/ratelimit v0.0.53
+	github.com/projectdiscovery/ratelimit v0.0.45
 	github.com/projectdiscovery/rdap v0.9.1-0.20221108103045-9865884d1917
 	github.com/projectdiscovery/sarif v0.0.1
-	github.com/projectdiscovery/tlsx v1.1.7
-	github.com/projectdiscovery/uncover v1.0.9
-	github.com/projectdiscovery/useragent v0.0.65
-	github.com/projectdiscovery/utils v0.2.7
-	github.com/projectdiscovery/wappalyzergo v0.1.14
+	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/redis/go-redis/v9 v9.1.0
 	github.com/seh-msft/burpxml v1.0.1
-	github.com/shurcooL/graphql v0.0.0-20230722043721-ed46e5a46466
 	github.com/stretchr/testify v1.9.0
 	github.com/tarunKoyalwar/goleak v0.0.0-20240429141123-0efa90dbdcf9
 	github.com/zmap/zgrab2 v0.1.8-0.20230806160807-97ba87c0e706
@@ -133,6 +129,7 @@ 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
@@ -155,13 +152,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.21.0 // indirect
-	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/go-openapi/jsonpointer v0.20.2 // indirect
+	github.com/go-openapi/swag v0.22.9 // 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-20220223132316-b832511892a9 // indirect
+	github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // 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
@@ -171,6 +168,7 @@ 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
@@ -202,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.1 // indirect
-	github.com/projectdiscovery/cdncheck v1.1.0 // indirect
+	github.com/projectdiscovery/asnmap v1.1.0 // indirect
+	github.com/projectdiscovery/cdncheck v1.0.9 // 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.7 // indirect
+	github.com/refraction-networking/utls v1.6.6 // 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
@@ -264,6 +262,7 @@ require (
 	github.com/gobwas/pool v0.2.1 // indirect
 	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
@@ -294,6 +293,7 @@ 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
@@ -307,9 +307,10 @@ require (
 	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842
 	golang.org/x/mod v0.17.0 // indirect
 	golang.org/x/sys v0.21.0 // indirect
-	golang.org/x/time v0.6.0 // indirect
+	golang.org/x/time v0.5.0 // indirect
 	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d
-	google.golang.org/protobuf v1.34.2 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
 	gopkg.in/corvus-ch/zbase32.v1 v1.0.0 // indirect
 )
@@ -40,18 +40,17 @@ 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=
@@ -261,6 +260,8 @@ 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=
@@ -273,6 +274,7 @@ 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=
@@ -329,8 +331,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.126.0 h1:c2cSgLnAsS0xYfKsgt5oBV6MYRM/giU8/RtwUY4wyfY=
-github.com/getkin/kin-openapi v0.126.0/go.mod h1:7mONz8IwmSRg6RttPu6v8U/OJ+gr+J99qSFNjPGSQqw=
+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/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=
@@ -369,10 +371,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.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-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-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=
@@ -418,8 +420,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-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA=
-github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
+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/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=
@@ -453,6 +455,8 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
@@ -570,8 +574,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.3.1 h1:f0+ZpmhfBSS4MhG+4HYseMdJhoeeopbSKbq5Rpeelso=
-github.com/invopop/yaml v0.3.1/go.mod h1:PMOp3nn4/12yEZUFfmOuNHJsZToEEOwoWsT+D81KkeA=
+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/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=
@@ -625,8 +629,6 @@ github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/kitabisa/go-ci v1.0.2 h1:rqHf8KEbQOxVb998TbqGRo70Z7ol44io7/jLYJUvKp8=
-github.com/kitabisa/go-ci v1.0.2/go.mod h1:e3wBSzaJbcifXrr/Gw2ZBLn44MmeqP5WySwXyHlCK/U=
 github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU=
@@ -711,8 +713,6 @@ 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,6 +741,7 @@ 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=
@@ -810,6 +811,7 @@ 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=
@@ -824,36 +826,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.1 h1:ImJiKIaACOT7HPx4Pabb5dksolzaFYsD1kID2iwsDqI=
-github.com/projectdiscovery/asnmap v1.1.1/go.mod h1:QT7jt9nQanj+Ucjr9BqGr1Q2veCCKSAVyUzLXfEcQ60=
+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/blackrock v0.0.1 h1:lHQqhaaEFjgf5WkuItbpeCZv2DUIE45k0VbGJyft6LQ=
 github.com/projectdiscovery/blackrock v0.0.1/go.mod h1:ANUtjDfaVrqB453bzToU+YB4cUbvBRpLvEwoWIwlTss=
-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.1.0 h1:b+LF1w0xhNd7cneKWMXb+/yUmF1n5szawxP4XGpmbxs=
-github.com/projectdiscovery/clistats v0.1.0/go.mod h1:GJ2av0KnOvK0AISQnP8hyDclYIji1LVkx2l0pwnzAu4=
-github.com/projectdiscovery/dsl v0.2.1 h1:TK3KD4jsg4YbvY7WJqnz1QyH4AOvAwezeBFOX97Evgk=
-github.com/projectdiscovery/dsl v0.2.1/go.mod h1:IRQXsmi5/g1dDZ79//A9t2vrRtxm4frRSd5t8CZVSbI=
-github.com/projectdiscovery/fastdialer v0.2.7 h1:x7bEf/kDyVOuG9kHfJLMhWO3h7J+6fMDgLWkGYL8EFg=
-github.com/projectdiscovery/fastdialer v0.2.7/go.mod h1:7/BGdaw7sCekuBh6lLZqPuoO5N0Qaizwvex/PjO+V8o=
+github.com/projectdiscovery/cdncheck v1.0.9 h1:BS15gzj9gb5AVSKqTDzPamfSgStu7nJQOocUvrssFlg=
+github.com/projectdiscovery/cdncheck v1.0.9/go.mod h1:18SSl1w7rMj53CGeRIZTbDoa286a6xZIxGbaiEo4Fxs=
+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/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.64 h1:FDfwdt9N97Hi8OuhbkDlKtVttpc/CRMIWQVa08VsHsI=
-github.com/projectdiscovery/goflags v0.1.64/go.mod h1:3FyHIVQtnycNOc1LE3O1jj/XR5XuMdF9QfHd0ujhnX4=
-github.com/projectdiscovery/gologger v1.1.21 h1:FD9MGE9adY/y2IxDpQgPZIvZAkQIx3bvcuY+d1FLQUo=
-github.com/projectdiscovery/gologger v1.1.21/go.mod h1:eyvlcHiSuzJQtwmh+fcfwZVaqVgSGtEP1oL1gJFgP3c=
+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/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.56 h1:QLIuFhCc7jrBH9WYpxNBDooSoH+/S8cCm7VO5rMt3lU=
-github.com/projectdiscovery/hmap v0.0.56/go.mod h1:XyGKMO93nLOzpaTTCDBSKEGx/XWXjSpoyZJxT92Qd/Q=
-github.com/projectdiscovery/httpx v1.6.8 h1:k0Y5g3ue/7QbDP0+LykIxp/VhPDLfau3UEUyuxtP7qE=
-github.com/projectdiscovery/httpx v1.6.8/go.mod h1:7BIsDxyRwkBjthqFmEajXrA5f3yb4tlVfLmpNdf0ZXA=
+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/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=
@@ -866,30 +868,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.53 h1:1ci2zaVCtJ9daDi9IXjNwpDxl2InYq375role/xqUR4=
-github.com/projectdiscovery/ratelimit v0.0.53/go.mod h1:4kNYTL7xKLo1qMYHTREUCBqHyvykFF+XBWutTh9fkwg=
-github.com/projectdiscovery/rawhttp v0.1.61 h1:EbskCj6kkDSG31sO5zEUFTqHp9ltccG1DdcI+MCdahQ=
-github.com/projectdiscovery/rawhttp v0.1.61/go.mod h1:5XmDAKph9pLVnh87zjL+vXDpfG5W8Gz5N2BAtYTkuVU=
+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/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.73 h1:CLqtgoI6+YVcUE2jnZPFVvwj59CHDE4HNImLf62sSuw=
-github.com/projectdiscovery/retryabledns v1.0.73/go.mod h1:Wo5tQHKtx6XcYYhMypRg8dr0GGnqIb4CzoTSEw2lo7I=
-github.com/projectdiscovery/retryablehttp-go v1.0.76 h1:2+4QpWnXUZFBkoeCEBXtUjSeBTdgKtaGwP8LRtKAC3g=
-github.com/projectdiscovery/retryablehttp-go v1.0.76/go.mod h1:0qIv7Ld8WWSKWYXMsNAWRYU5gsxnxpBza3SjDgt6nVc=
+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/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.7 h1:eSsl/SmTDL/z2CMeSrbssk4f/9oOotMP1SgXl3yynSM=
-github.com/projectdiscovery/tlsx v1.1.7/go.mod h1:g66QQ4/y4tLVjoGbzWIv+Q6xwFzxfJbEDx86Y1dYHDM=
-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.7 h1:XWdz7SscL++jqsnQ9ecHzSZE0RK33tyPcnqcXw+vmKs=
-github.com/projectdiscovery/utils v0.2.7/go.mod h1:N0N7tbdNFPegd9NpJ3onCPClaBrERcOIB88yww6UCF8=
-github.com/projectdiscovery/wappalyzergo v0.1.14 h1:nt1IM4RUmqeymsXk4h6BsZbKDoS2hjFvPkT2GaI1rz4=
-github.com/projectdiscovery/wappalyzergo v0.1.14/go.mod h1:/hzgxkBFTMe2wDbA93nFfoMjULw7/vIZ9QPSAnCgUa8=
+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/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=
@@ -927,8 +929,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.7 h1:zVJ7sP1dJx/WtVuITug3qYUq034cDq9B2MR1K67ULZM=
-github.com/refraction-networking/utls v1.6.7/go.mod h1:BC3O4vQzye5hqpmDTWUqi4P5DDhzJfkV1tdqtawQIH0=
+github.com/refraction-networking/utls v1.6.6 h1:igFsYBUJPYM8Rno9xUuDoM5GQrVEqY4llzEXOkL43Ig=
+github.com/refraction-networking/utls v1.6.6/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=
@@ -964,8 +966,6 @@ github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFt
 github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
 github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
 github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
-github.com/shurcooL/graphql v0.0.0-20230722043721-ed46e5a46466 h1:17JxqqJY66GmZVHkmAsGEkcIu0oCe3AM420QDgGwZx0=
-github.com/shurcooL/graphql v0.0.0-20230722043721-ed46e5a46466/go.mod h1:9dIRpgIY7hVhoqfe0/FcYp0bpInZaT7dc3BYOprrIUE=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
@@ -1070,8 +1070,8 @@ github.com/weppos/publicsuffix-go v0.30.2/go.mod h1:/hGscit36Yt+wammfBBwdMdxBT8b
 github.com/weppos/publicsuffix-go/publicsuffix/generator v0.0.0-20220927085643-dc0d00c92642/go.mod h1:GHfoeIdZLdZmLjMlzBftbTDntahTttUMWjxZwQJhULE=
 github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
 github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw=
-github.com/xanzy/go-gitlab v0.107.0 h1:P2CT9Uy9yN9lJo3FLxpMZ4xj6uWcpnigXsjvqJ6nd2Y=
-github.com/xanzy/go-gitlab v0.107.0/go.mod h1:wKNKh3GkYDMOsGmnfuX+ITCmDuSDWFO0G+C4AygL9RY=
+github.com/xanzy/go-gitlab v0.84.0 h1:PdpCaskQSgcVDsx21c6ikf8Rfyo7SNtFAJwP9PrbCFE=
+github.com/xanzy/go-gitlab v0.84.0/go.mod h1:5ryv+MnpZStBH8I/77HuQBsMbBGANtVpLWC15qOjWAw=
 github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
 github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
@@ -1174,6 +1174,7 @@ 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=
@@ -1267,6 +1268,7 @@ 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=
@@ -1293,8 +1295,8 @@ golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
 golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I=
 golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw=
-golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA=
-golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI=
+golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -1423,8 +1425,8 @@ golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
-golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
+golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -1507,6 +1509,8 @@ google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
+google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@@ -1569,9 +1573,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
 google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
-google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
-google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -1605,6 +1608,7 @@ 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=
@@ -23,4 +23,4 @@ code:
      - type: dsl
        dsl:
          - true
-# digest: 4a0a0047304502200307590191cb7c766b6c21e5777d345bdddf7adf9d6da8f7d336d585d9ac4a8b022100fd30fb0c7722778eb3d861d60e721d805925b8d8df2b979ef2104c35ec57d5cb:4a3eb6b4988d95847d4203be25ed1d46
+# digest: 490a004630440220192fb8f704b078c2885047b85ac1a0491be86485c033a976d201599683a35aab0220604b1c3781e9d97079d0e5c23c18e6a2d87493c8e2b930536e692ee7d06e9247:4a3eb6b4988d95847d4203be25ed1d46
@@ -20,4 +20,4 @@ code:
      - type: word
        words:
          - "hello from input baz"
-# digest: 4a0a0047304502203fe1d7d52bc2a41886d576a90c82c3be42078baaa4b46e1f3d8519665d6f88b202210081feb82c41150c5b218e226fc4f299ded19f42ba01ef34ba60b0634b4ea6ee12:4a3eb6b4988d95847d4203be25ed1d46
+# digest: 4a0a00473045022033f72f1b9d5143f58a2dc79c2597000f34080251ac3702c36c3fad00917dfeeb0221009ba05c715c9e2e36dba471be6c0106a09ae3822d8a3e9e4bcf377e9f4a395a01:4a3eb6b4988d95847d4203be25ed1d46
@@ -18,4 +18,4 @@ code:
      - type: word
        words:
          - "hello from input"
-# digest: 4b0a00483046022100afb5ebff14a40e7f9b679ffc4d93ce7849e33eb398ebb47f2e757cd24831f9dd02210089ffa21b2763e99ebce95dfc5b91e1e62da4ccdc9d2ad5c48584fa350ba335af:4a3eb6b4988d95847d4203be25ed1d46
+# digest: 4a0a004730450220377128cb11d9f6f0fee1f4dbd841e46783de26e90a216fa55a7609ee2bc823c60221009166ee0f85e3a1811588ab19e73ea96ab3d582dc8180dbcbbad0ea9ab7e9025d:4a3eb6b4988d95847d4203be25ed1d46
@@ -26,4 +26,4 @@ code:
        part: interactsh_protocol
        words:
          - "http"
-# digest: 4b0a00483046022100939f83e74d43932a5bd792b1fd2c100eec2df60f2b2a8dd56b5c8ef5faa92b17022100f93031b0de373af7d78e623968ea5a2d67c4561ef70e3e6da15aef7e5c853115:4a3eb6b4988d95847d4203be25ed1d46
+# digest: 4b0a00483046022100d472d50bd83117d334f5217c7a40dcdf34138e90029eaace51697d902296bf37022100a393b49420a96f60d6d89b79b5135ee2233b2468d374851890eea114b08195d1:4a3eb6b4988d95847d4203be25ed1d46
@@ -21,4 +21,4 @@ code:
      - type: word
        words:
          - "hello from input"
-# digest: 4a0a00473045022100b8e676ce0c57b60c233a0203539dec20457bbb5f1790d351a5d45405b6668b2602204b1f2fa18e7db099f05329009597ceb2d9b7337562c1a676e8d50ea2f1c6fcbe:4a3eb6b4988d95847d4203be25ed1d46
+# digest: 4b0a004830460221008886054bb5dd6345e434e30f31c8fddce3c484a4f33aa6321b5185675866029d022100d188a83d0fde029f8b586061c65ab72b43755c3fb10fdd59501bb9bbadbb1ff7:4a3eb6b4988d95847d4203be25ed1d46
@@ -19,4 +19,4 @@ code:
        regex:
          - 'hello from (.*)'
        group: 1
-# digest: 490a00463044022050da011362cf08c2cb81e812c7f86d7282afe0562d4bf00d390f1300d19bc910022029e9d305da69e941ac18797645aecb217abde6557f891e141301b48e89a3c0cd:4a3eb6b4988d95847d4203be25ed1d46
+# digest: 490a0046304402202c63d47bb0acdd40b3b852d95490d492ff5741b84071b2a8a40371be7797c13602202b6b977e157edf2ef70a402a2e57d4eb5a67c5ca91f0a2f9a10a966e8485ebaf:4a3eb6b4988d95847d4203be25ed1d46
@@ -18,4 +18,4 @@ code:
      - type: word
        words:
          - "hello from first"
-# digest: 4b0a00483046022100b3b8759c0df028455eb59b1433ac240e5d4604b011bb0c63680bd3cc159ac6f0022100f44aa11b640d11ad0e2902897f4eb51666ab3cd83c31dfd2590f6e43391e39b0:4a3eb6b4988d95847d4203be25ed1d46
+# digest: 490a00463044022025661eab353b7f359c0d428a86b6287545d7f759375e8025cc8c9c77b616ca6502200bc2c019059622df3c88e7caa6dd7d1fb9b956010aa0de2ee2b9f7dd0a3c4954:4a3eb6b4988d95847d4203be25ed1d46
@@ -5,17 +5,9 @@ import (
 	urlutil "github.com/projectdiscovery/utils/url"
 )

-func getScanDashBoardURL(id string, teamID string) string {
+func getScanDashBoardURL(id 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()
 }
@@ -32,14 +32,13 @@ 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
-	TeamIDEnv = env.GetEnvOrDefault("PDCP_TEAM_ID", NoneTeamID)
+	teamID = env.GetEnvOrDefault("PDCP_TEAM_ID", "")
 )

 // UploadWriter is a writer that uploads its output to pdcp
@@ -54,7 +53,6 @@ type UploadWriter struct {
 	scanID    string
 	scanName  string
 	counter   atomic.Int32
-	TeamID    string
 }

 // NewUploadWriter creates a new upload writer
@@ -63,9 +61,8 @@ 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),
-		TeamID: NoneTeamID,
+		creds: creds,
+		done:  make(chan struct{}, 1),
 	}
 	var err error
 	reader, writer := io.Pipe()
@@ -113,14 +110,6 @@ 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)
@@ -147,13 +136,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, u.TeamID))
+			gologger.Info().Msgf("%v Scan results uploaded to cloud, you can view scan results at %v", u.counter.Load(), getScanDashBoardURL(u.scanID))
 		}
 	}()
 	// temporary buffer to store the results
 	buff := &bytes.Buffer{}
 	ticker := time.NewTicker(flushTimer)
-	defer ticker.Stop()
+
 	for {
 		select {
 		case <-ctx.Done():
@@ -200,7 +189,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, u.TeamID))
+	gologger.Warning().Msgf("Uploaded results chunk, you can view scan results at %v", getScanDashBoardURL(u.scanID))
 	return nil
 }

@@ -259,8 +248,8 @@ func (u *UploadWriter) getRequest(bin []byte) (*retryablehttp.Request, error) {
 	req.URL.Update()

 	req.Header.Set(pdcpauth.ApiKeyHeaderName, u.creds.APIKey)
-	if u.TeamID != NoneTeamID && u.TeamID != "" {
-		req.Header.Set(teamIDHeader, u.TeamID)
+	if teamID != "" {
+		req.Header.Set(teamIDHeader, teamID)
 	}
 	req.Header.Set("Content-Type", "application/octet-stream")
 	req.Header.Set("Accept", "application/json")
@@ -19,6 +19,7 @@ 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"
@@ -114,7 +115,12 @@ func ParseOptions(options *types.Options) {
 	// Load the resolvers if user asked for them
 	loadResolvers(options)

-	err := protocolinit.Init(options)
+	err := protocolstate.Init(options)
+	if err != nil {
+		gologger.Fatal().Msgf("Could not initialize protocol state: %s\n", err)
+	}
+
+	err = protocolinit.Init(options)
 	if err != nil {
 		gologger.Fatal().Msgf("Could not initialize protocols: %s\n", err)
 	}
@@ -426,9 +426,6 @@ 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)
 }

@@ -396,7 +396,6 @@ func WithHeaders(headers []string) NucleiSDKOptions {
 func EnablePassiveMode() NucleiSDKOptions {
 	return func(e *NucleiEngine) error {
 		e.opts.OfflineHTTP = true
-		e.opts.DisableHTTPProbe = true
 		return nil
 	}
 }
@@ -441,11 +440,3 @@ 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
-	}
-}
@@ -82,5 +82,5 @@ func TestMain(m *testing.M) {
 		// no need to run this test on github actions
 		return
 	}
-	os.Exit(m.Run())
+	m.Run()
 }
@@ -178,8 +178,7 @@ func (e *NucleiEngine) SignTemplate(tmplSigner *signer.TemplateSigner, data []by
 	if err != nil {
 		return data, err
 	}
-	_, content := signer.ExtractSignatureAndContent(data)
-	buff := bytes.NewBuffer(content)
+	buff := bytes.NewBuffer(signer.RemoveSignatureFromData(data))
 	buff.WriteString("\n" + signatureData)
 	return buff.Bytes(), err
 }
@@ -244,12 +243,7 @@ func (e *NucleiEngine) ExecuteCallbackWithCtx(ctx context.Context, callback ...f
 	}
 	e.resultCallbacks = append(e.resultCallbacks, filtered...)

-	templatesAndWorkflows := append(e.store.Templates(), e.store.Workflows()...)
-	if len(templatesAndWorkflows) == 0 {
-		return ErrNoTemplatesAvailable
-	}
-
-	_ = e.engine.ExecuteScanWithOpts(ctx, templatesAndWorkflows, e.inputProvider, false)
+	_ = e.engine.ExecuteScanWithOpts(ctx, e.store.Templates(), e.inputProvider, false)
 	defer e.engine.WorkPool().Wait()
 	return nil
 }
@@ -108,14 +108,6 @@ 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() {
@@ -129,6 +121,14 @@ 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)
@@ -256,7 +256,6 @@
        "deleteheader",
        "setbody",
        "waitevent",
-        "waitdialog",
        "keyboard",
        "debug",
        "sleep",
@@ -788,11 +787,6 @@
          "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",
@@ -947,6 +941,11 @@
          "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",
@@ -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,36 +51,29 @@ func NewFileAuthProvider(path string, callback authx.LazyFetchSecret) (AuthProvi

 // init initializes the file auth provider
 func (f *FileAuthProvider) init() {
-	for _, _secret := range f.store.Secrets {
-		secret := _secret // allocate copy of pointer
+	for _, secret := range f.store.Secrets {
 		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
 				}
-
-				if ss, ok := f.compiled[compiled]; ok {
-					f.compiled[compiled] = append(ss, secret.GetStrategy())
-				} else {
-					f.compiled[compiled] = []authx.AuthStrategy{secret.GetStrategy()}
-				}
+				f.compiled[compiled] = 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)
 			}
-			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()}
+			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()
 			}
 		}
 	}
@@ -88,38 +81,32 @@ 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
 				}
-				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})
-				}
+				f.compiled[compiled] = &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)
 			}
-			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})
+			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}
 			}
 		}
 	}
 }

 // 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)
@@ -141,12 +128,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)
 }

@@ -163,21 +150,17 @@ func (f *FileAuthProvider) GetTemplatePaths() []string {

 // PreFetchSecrets pre-fetches the secrets from the auth provider
 func (f *FileAuthProvider) PreFetchSecrets() error {
-	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.domains {
+		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
-				}
+	for _, s := range f.compiled {
+		if val, ok := s.(*authx.DynamicAuthStrategy); ok {
+			if err := val.Dynamic.Fetch(false); err != nil {
+				return err
 			}
 		}
 	}
@@ -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
@@ -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 {
@@ -31,7 +31,7 @@ const (
 	CLIConfigFileName               = "config.yaml"
 	ReportingConfigFilename         = "reporting-config.yaml"
 	// Version is the current version of nuclei
-	Version = `v3.3.2`
+	Version = `v3.2.9`
 	// Directory Names of custom templates
 	CustomS3TemplatesDirName     = "s3"
 	CustomGitHubTemplatesDirName = "github"
@@ -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)
 						}
@@ -83,8 +83,8 @@ func (bk *customTemplateGitLabRepo) Download(_ context.Context) {

 		// Get the directory listing for the files in the project
 		tree, _, err := bk.gitLabClient.Repositories.ListTree(projectID, &gitlab.ListTreeOptions{
-			Ref:       gitlab.Ptr(project.DefaultBranch),
-			Recursive: gitlab.Ptr(true),
+			Ref:       gitlab.String(project.DefaultBranch),
+			Recursive: gitlab.Bool(true),
 		})
 		if err != nil {
 			gologger.Error().Msgf("error retrieving files from GitLab project: %s (%d) %s", project.Name, projectID, err)
@@ -95,7 +95,7 @@ func (bk *customTemplateGitLabRepo) Download(_ context.Context) {
 			// If the object is not a file or file extension is not .yaml, skip it
 			if file.Type == "blob" && filepath.Ext(file.Path) == ".yaml" {
 				gf := &gitlab.GetFileOptions{
-					Ref: gitlab.Ptr(project.DefaultBranch),
+					Ref: gitlab.String(project.DefaultBranch),
 				}
 				f, _, err := bk.gitLabClient.RepositoryFiles.GetFile(projectID, file.Path, gf)
 				if err != nil {
@@ -7,7 +7,6 @@ import (

 	"github.com/projectdiscovery/nuclei/v3/pkg/fuzz/dataformat"
 	"github.com/projectdiscovery/retryablehttp-go"
-	"github.com/projectdiscovery/utils/maps"
 	urlutil "github.com/projectdiscovery/utils/url"
 )

@@ -82,7 +81,7 @@ func (q *Path) Delete(key string) error {
 // Rebuild returns a new request with the
 // component rebuilt
 func (q *Path) Rebuild() (*retryablehttp.Request, error) {
-	originalValues := mapsutil.Map[string, any]{}
+	originalValues := make(map[string]interface{})
 	splitted := strings.Split(q.req.URL.Path, "/")
 	for i := range splitted {
 		pathTillNow := strings.Join(splitted[:i+1], "/")
@@ -96,22 +95,8 @@ func (q *Path) Rebuild() (*retryablehttp.Request, error) {
 	lengthSplitted := len(q.value.parsed.Map)
 	for i := lengthSplitted; i > 0; i-- {
 		key := strconv.Itoa(i)
-
-		original, ok := originalValues.GetOrDefault(key, "").(string)
-		if !ok {
-			continue
-		}
-
-		new, ok := q.value.parsed.Map.GetOrDefault(key, "").(string)
-		if !ok {
-			continue
-		}
-
-		if new == original {
-			// no need to replace
-			continue
-		}
-
+		original := originalValues[key].(string)
+		new := q.value.parsed.Map[key].(string)
 		originalPath = strings.Replace(originalPath, original, new, 1)
 	}

@@ -73,22 +73,12 @@ func (v *Value) SetParsed(data dataformat.KV, dataFormat string) {

 // SetParsedValue sets the parsed value for a key
 // in the parsed map
-func (v *Value) SetParsedValue(key, value string) bool {
-	if key == "" {
-		return false
-	}
-
+func (v *Value) SetParsedValue(key string, value string) bool {
 	origValue := v.parsed.Get(key)
 	if origValue == nil {
 		v.parsed.Set(key, value)
 		return true
 	}
-
-	// TODO(dwisiswant0): I'm sure that this can be simplified because
-	// `dataformat.KV.*` is a type of `mapsutil.*` where the value is `any`. So,
-	// it looks like we won't type conversion here or even have its own methods
-	// inside `dataformat.KV`.
-
 	// If the value is a list, append to it
 	// otherwise replace it
 	switch v := origValue.(type) {
@@ -13,7 +13,7 @@ import (
 // if it's not important/significant (ex: json,xml) we use map
 // this also allows us to iteratively implement ordered map
 type KV struct {
-	Map        mapsutil.Map[string, any]
+	Map        map[string]interface{}
 	OrderedMap *mapsutil.OrderedMap[string, any]
 }

@@ -16,7 +16,6 @@ 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"
 )
@@ -166,27 +165,14 @@ 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(value, interactshUrls)
-			if got != value {
-				data[k] = got
-			}
+			got, oastUrls := rule.options.Interactsh.Replace(fmt.Sprint(v), interactshUrls)
+
 			// Append new OAST URLs if any
 			if len(oastUrls) > 0 {
-				for _, url := range oastUrls {
-					if _, ok := interactshUrlsMap[url]; !ok {
-						interactshUrlsMap[url] = struct{}{}
-						interactshUrls = append(interactshUrls, url)
-					}
-				}
+				interactshUrls = append(interactshUrls, oastUrls...)
 			}
 			// Evaluate the replaced data
 			evaluatedData, err := expressions.Evaluate(got, data)
@@ -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(rule.options.Variables.GetAll(), map[string]interface{}{
+	values := generators.MergeMaps(input.Values, map[string]interface{}{
 		"value": value,
-	}, rule.options.Options.Vars.AsMap(), input.Values)
+	}, rule.options.Options.Vars.AsMap(), rule.options.Variables.GetAll())
 	firstpass, _ := expressions.Evaluate(payload, values)
 	interactData, interactshURLs := rule.options.Interactsh.Replace(firstpass, interactshURLs)
 	evaluated, _ := expressions.Evaluate(interactData, values)
@@ -18,7 +18,7 @@ func getSchemaExample(schema *openapi3.Schema) (interface{}, bool) {
 		return schema.Default, true
 	}

-	if len(schema.Enum) > 0 {
+	if schema.Enum != nil && 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.Is("boolean"):
+	case schema.Type == "boolean":
 		return true, nil
-	case schema.Type.Is("number"), schema.Type.Is("integer"):
+	case schema.Type == "number", schema.Type == "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.Is("integer") {
+		if schema.Type == "integer" {
 			return int(value), nil
 		}
 		return value, nil
-	case schema.Type.Is("string"):
+	case schema.Type == "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.Is("array"), schema.Items != nil:
+	case schema.Type == "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.Is("object"), len(schema.Properties) > 0:
+	case schema.Type == "object", len(schema.Properties) > 0:
 		example := map[string]interface{}{}

 		for k, v := range schema.Properties {
@@ -75,26 +75,16 @@ 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:                   baseURL,
+					pathURL:                   pathURL,
 					requestPath:               requestPath,
 					op:                        ov,
 					schema:                    schema,
@@ -203,7 +193,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 len(value.Schema.Value.Enum) > 0 {
+		} else if value.Schema.Value.Enum != nil && len(value.Schema.Value.Enum) > 0 {
 			paramValue = value.Schema.Value.Enum[0]
 		} else {
 			if !opts.opts.SkipFormatValidation {
@@ -416,7 +406,7 @@ schemaLabel:
 	return globalParams, nil
 }

-// GenerateParameterFromSecurityScheme generates an example from a schema object
+// generateExampleFromSchema generates an example from a schema object
 func GenerateParameterFromSecurityScheme(scheme *openapi3.SecuritySchemeRef) (*openapi3.Parameter, error) {
 	if !generic.EqualsAny(scheme.Value.Type, "http", "apiKey") {
 		return nil, errorutil.NewWithTag("openapi", "unsupported security scheme type (%s) found in openapi file", scheme.Value.Type)
@@ -2,7 +2,6 @@ package swagger

 import (
 	"encoding/json"
-	"io"
 	"os"
 	"path"

@@ -11,7 +10,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/projectdiscovery/nuclei/v3/pkg/input/formats"
 	"github.com/projectdiscovery/nuclei/v3/pkg/input/formats/openapi"
-	"github.com/invopop/yaml"
+	"gopkg.in/yaml.v2"

 	"github.com/getkin/kin-openapi/openapi2conv"
 )
@@ -50,11 +49,7 @@ func (j *SwaggerFormat) Parse(input string, resultsCb formats.ParseReqRespCallba
 	ext := path.Ext(input)

 	if ext == ".yaml" || ext == ".yml" {
-		data, err_data := io.ReadAll(file)
-		if err_data != nil {
-			return errors.Wrap(err, "could not read data file")
-		}
-		err = yaml.Unmarshal(data, schemav2)
+		err = yaml.NewDecoder(file).Decode(schemav2)
 	} else {
 		err = json.NewDecoder(file).Decode(schemav2)
 	}
@@ -27,8 +27,8 @@ func TestSwaggerAPIParser(t *testing.T) {
 	}

 	expectedURLs := []string{
-		"https://localhost/v1/users",
-		"https://localhost/v1/users/1?test=asc",
+		"https://localhost/users",
+		"https://localhost/users/1?test=asc",
 	}
 	require.ElementsMatch(t, gotMethodsToURLs, expectedURLs, "could not get swagger urls")
 }
@@ -66,10 +66,9 @@ 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 {
-		metaInput := contextargs.NewMetaInput()
-		metaInput.ReqResp = request
-		metaInput.Input = request.URL.String()
-		return callback(metaInput)
+		return callback(&contextargs.MetaInput{
+			ReqResp: request,
+		})
 	})
 	if err != nil {
 		gologger.Warning().Msgf("Could not parse input file while iterating: %s\n", err)
@@ -14,7 +14,6 @@ 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 (
@@ -33,7 +32,7 @@ func IsErrNotImplemented(err error) bool {
 	if err == nil {
 		return false
 	}
-	if stringsutil.ContainsAll(err.Error(), "provider", "does not implement") {
+	if strings.Contains(err.Error(), "provider") && strings.Contains(err.Error(), "does not implement") {
 		return true
 	}
 	return false
@@ -121,7 +120,7 @@ func NewInputProvider(opts InputOptions) (InputProvider, error) {
 	}
 }

-// SupportedInputFormats returns all supported input formats of nuclei
+// SupportedFormats returns all supported input formats of nuclei
 func SupportedInputFormats() string {
 	return "list, " + http.SupportedFormats()
 }
@@ -122,7 +122,7 @@ func (i *ListInputProvider) Iterate(callback func(value *contextargs.MetaInput)
 		})
 	}
 	callbackFunc := func(k, _ []byte) error {
-		metaInput := contextargs.NewMetaInput()
+		metaInput := &contextargs.MetaInput{}
 		if err := metaInput.Unmarshal(string(k)); err != nil {
 			return err
 		}
@@ -153,16 +153,14 @@ func (i *ListInputProvider) Set(value string) {
 			}
 			return fmt.Sprintf("got empty hostname for %v skipping ip selection", URL)
 		})
-		metaInput := contextargs.NewMetaInput()
-		metaInput.Input = URL
+		metaInput := &contextargs.MetaInput{Input: URL}
 		i.setItem(metaInput)
 		return
 	}

 	// Check if input is ip or hostname
 	if iputil.IsIP(urlx.Hostname()) {
-		metaInput := contextargs.NewMetaInput()
-		metaInput.Input = URL
+		metaInput := &contextargs.MetaInput{Input: URL}
 		i.setItem(metaInput)
 		return
 	}
@@ -183,9 +181,7 @@ func (i *ListInputProvider) Set(value string) {
 					if ip == "" {
 						continue
 					}
-					metaInput := contextargs.NewMetaInput()
-					metaInput.Input = value
-					metaInput.CustomIP = ip
+					metaInput := &contextargs.MetaInput{Input: value, CustomIP: ip}
 					i.setItem(metaInput)
 				}
 				return
@@ -215,13 +211,11 @@ func (i *ListInputProvider) Set(value string) {
 	}

 	for _, ip := range ips {
-		metaInput := contextargs.NewMetaInput()
 		if ip != "" {
-			metaInput.Input = URL
-			metaInput.CustomIP = ip
+			metaInput := &contextargs.MetaInput{Input: URL, CustomIP: ip}
 			i.setItem(metaInput)
 		} else {
-			metaInput.Input = URL
+			metaInput := &contextargs.MetaInput{Input: URL}
 			i.setItem(metaInput)
 		}
 	}
@@ -359,8 +353,7 @@ 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.NewMetaInput()
-	metaInput.Input = URL
+	metaInput := &contextargs.MetaInput{Input: URL}
 	key, err := metaInput.MarshalString()
 	if err != nil {
 		gologger.Warning().Msgf("%s\n", err)
@@ -385,16 +378,14 @@ func (i *ListInputProvider) Del(value string) {
 			}
 			return fmt.Sprintf("got empty hostname for %v skipping ip selection", URL)
 		})
-		metaInput := contextargs.NewMetaInput()
-		metaInput.Input = URL
+		metaInput := &contextargs.MetaInput{Input: URL}
 		i.delItem(metaInput)
 		return
 	}

 	// Check if input is ip or hostname
 	if iputil.IsIP(urlx.Hostname()) {
-		metaInput := contextargs.NewMetaInput()
-		metaInput.Input = URL
+		metaInput := &contextargs.MetaInput{Input: URL}
 		i.delItem(metaInput)
 		return
 	}
@@ -415,9 +406,7 @@ func (i *ListInputProvider) Del(value string) {
 					if ip == "" {
 						continue
 					}
-					metaInput := contextargs.NewMetaInput()
-					metaInput.Input = value
-					metaInput.CustomIP = ip
+					metaInput := &contextargs.MetaInput{Input: value, CustomIP: ip}
 					i.delItem(metaInput)
 				}
 				return
@@ -447,13 +436,11 @@ func (i *ListInputProvider) Del(value string) {
 	}

 	for _, ip := range ips {
-		metaInput := contextargs.NewMetaInput()
 		if ip != "" {
-			metaInput.Input = URL
-			metaInput.CustomIP = ip
+			metaInput := &contextargs.MetaInput{Input: URL, CustomIP: ip}
 			i.delItem(metaInput)
 		} else {
-			metaInput.Input = URL
+			metaInput := &contextargs.MetaInput{Input: URL}
 			i.delItem(metaInput)
 		}
 	}
@@ -527,8 +514,7 @@ func (i *ListInputProvider) addTargets(targets []string) {

 func (i *ListInputProvider) removeTargets(targets []string) {
 	for _, target := range targets {
-		metaInput := contextargs.NewMetaInput()
-		metaInput.Input = target
+		metaInput := &contextargs.MetaInput{Input: target}
 		i.delItem(metaInput)
 	}
 }
@@ -40,7 +40,7 @@ func Test_expandCIDR(t *testing.T) {
 		// scan
 		got := []string{}
 		input.hostMap.Scan(func(k, _ []byte) error {
-			metainput := contextargs.NewMetaInput()
+			var metainput contextargs.MetaInput
 			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 {
-			metainput := contextargs.NewMetaInput()
+			var metainput contextargs.MetaInput
 			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 {
-			metainput := contextargs.NewMetaInput()
+			var metainput contextargs.MetaInput
 			if err := metainput.Unmarshal(string(k)); err != nil {
 				return err
 			}
@@ -43,9 +43,7 @@ func (s *SimpleInputProvider) Iterate(callback func(value *contextargs.MetaInput

 // Set adds an item to the input provider
 func (s *SimpleInputProvider) Set(value string) {
-	metaInput := contextargs.NewMetaInput()
-	metaInput.Input = value
-	s.Inputs = append(s.Inputs, metaInput)
+	s.Inputs = append(s.Inputs, &contextargs.MetaInput{Input: value})
 }

 // SetWithProbe adds an item to the input provider with HTTP probing
@@ -54,17 +52,13 @@ func (s *SimpleInputProvider) SetWithProbe(value string, probe types.InputLivene
 	if err != nil {
 		return err
 	}
-	metaInput := contextargs.NewMetaInput()
-	metaInput.Input = probedValue
-	s.Inputs = append(s.Inputs, metaInput)
+	s.Inputs = append(s.Inputs, &contextargs.MetaInput{Input: probedValue})
 	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 {
-	metaInput := contextargs.NewMetaInput()
-	metaInput.Input = value
-	s.Inputs = append(s.Inputs, metaInput)
+	s.Inputs = append(s.Inputs, &contextargs.MetaInput{Input: value})
 	return nil
 }

@@ -47,8 +47,6 @@ 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
 }
@@ -96,8 +94,6 @@ 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
@@ -115,10 +111,6 @@ 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)
@@ -136,9 +128,6 @@ 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 ""
 	}
-	// do not return empty
-	return input
+	return ""
 }
@@ -30,7 +30,7 @@ func TestConvertInputToType(t *testing.T) {
 		{"https://google.com:443", typeHostOnly, "google.com", ""},

 		// url
-		{"test.com", typeURL, "test.com", ""},
+		{"test.com", typeURL, "", ""},
 		{"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", ""},
+		{"google.com", typeHostWithPort, "", ""},
 		{"google.com:443", typeHostWithPort, "google.com:443", ""},
 		{"https://google.com", typeHostWithPort, "google.com:443", ""},
 		{"https://google.com:443", typeHostWithPort, "google.com:443", ""},
@@ -4,12 +4,11 @@ package compiler
 import (
 	"context"
 	"fmt"
+	"time"

 	"github.com/dop251/goja"
-	"github.com/kitabisa/go-ci"

 	"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"
@@ -39,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{}
 }
@@ -56,11 +55,6 @@ 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{
@@ -72,24 +66,12 @@ 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
@@ -97,6 +79,15 @@ 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 {
@@ -115,34 +106,29 @@ func (c *Compiler) ExecuteWithOptions(program *goja.Program, args *ExecuteArgs,
 	// merge all args into templatectx
 	args.TemplateCtx = generators.MergeMaps(args.TemplateCtx, args.Args)

-	// execute with context and timeout
+	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
+	}

-	ctx, cancel := context.WithTimeoutCause(opts.Context, opts.TimeoutVariants.JsCompilerExecutionTimeout, ErrJSExecDeadline)
+	// execute with context and timeout
+	ctx, cancel := context.WithTimeoutCause(opts.Context, time.Duration(opts.Timeout)*time.Second, ErrJSExecDeadline)
 	defer cancel()
 	// execute the script
 	results, err := contextutil.ExecFuncWithTwoReturns(ctx, func() (val goja.Value, err error) {
-		// TODO(dwisiswant0): remove this once we get the RCA.
 		defer func() {
-			if ci.IsCI() {
-				return
-			}
-
 			if r := recover(); r != nil {
 				err = fmt.Errorf("panic: %v", r)
 			}
 		}()
-
 		return ExecuteProgram(program, args, opts)
 	})
 	if err != nil {
 		if val, ok := err.(*goja.Exception); ok {
-			if x := val.Unwrap(); x != nil {
-				err = x
-			}
+			err = val.Unwrap()
 		}
-		e := NewExecuteResult()
-		e["error"] = err.Error()
-		return e, err
+		return nil, err
 	}
 	var res ExecuteResult
 	if opts.exports != nil {
@@ -1,14 +1,11 @@
 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) {
@@ -21,14 +18,7 @@ func TestNewCompilerConsoleDebug(t *testing.T) {
 	})

 	compiler := New()
-	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}},
-	)
+	_, err := compiler.Execute("console.log('hello world');", NewExecuteArgs())
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -37,6 +27,17 @@ 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)
 }
@@ -7,17 +7,26 @@ 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
@@ -11,7 +11,6 @@ import (
 	"github.com/dop251/goja"
 	"github.com/dop251/goja_nodejs/console"
 	"github.com/dop251/goja_nodejs/require"
-	"github.com/kitabisa/go-ci"
 	"github.com/projectdiscovery/gologger"
 	_ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/libbytes"
 	_ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/libfs"
@@ -85,18 +84,11 @@ func executeWithRuntime(runtime *goja.Runtime, p *goja.Program, args *ExecuteArg
 			opts.Cleanup(runtime)
 		}
 	}()
-
-	// TODO(dwisiswant0): remove this once we get the RCA.
 	defer func() {
-		if ci.IsCI() {
-			return
-		}
-
 		if r := recover(); r != nil {
 			err = fmt.Errorf("panic: %s", r)
 		}
 	}()
-
 	// set template ctx
 	_ = runtime.Set("template", args.TemplateCtx)
 	// set args
@@ -249,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)
 }
@@ -249,7 +249,7 @@ func identifyGenDecl(pkg *ast.Package, decl *ast.GenDecl, data *TemplateData) {
 			if !spec.Names[0].IsExported() {
 				continue
 			}
-			if len(spec.Values) == 0 {
+			if spec.Values == nil || len(spec.Values) == 0 {
 				continue
 			}
 			data.PackageVars[spec.Names[0].Name] = spec.Names[0].Name
@@ -42,11 +42,7 @@ 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 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.
+Description: isPortOpen checks if given port is open on host. timeout is optional and defaults to 5 seconds

 Name: ToBytes
 Signatures: "ToBytes(...interface{}) []byte"
@@ -489,7 +489,7 @@ func (p *EntityParser) extractVarsNConstants() {
 					if !spec.Names[0].IsExported() {
 						continue
 					}
-					if len(spec.Values) == 0 {
+					if spec.Values == nil || len(spec.Values) == 0 {
 						continue
 					}
 					// get comments or description
@@ -53,12 +53,10 @@ func init() {
 			"FilterWorkstationTrustAccount":    lib_ldap.FilterWorkstationTrustAccount,

 			// Objects / Classes
-			"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{}),
+			"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{}),
 		},
 	).Register()
 }
@@ -188,9 +188,9 @@ export class Config {
 */
 export interface AuthorizationDataEntry {
    
-    ADData?: Uint8Array,
-    
    ADType?: number,
+    
+    ADData?: Uint8Array,
 }


@@ -200,9 +200,9 @@ export interface AuthorizationDataEntry {
 */
 export interface BitString {
    
-    Bytes?: Uint8Array,
-    
    BitLength?: number,
+    
+    Bytes?: Uint8Array,
 }


@@ -212,9 +212,9 @@ export interface BitString {
 */
 export interface BitString {
    
-    Bytes?: Uint8Array,
-    
    BitLength?: number,
+    
+    Bytes?: Uint8Array,
 }


@@ -236,15 +236,19 @@ export interface Config {
 */
 export interface EncTicketPart {
    
+    AuthTime?: Date,
+    
+    StartTime?: Date,
+    
    EndTime?: Date,
    
    RenewTill?: Date,
    
    CRealm?: string,
    
-    AuthTime?: Date,
+    CAddr?: HostAddress,
    
-    StartTime?: Date,
+    AuthorizationData?: AuthorizationDataEntry,
    
    Flags?: BitString,
    
@@ -253,10 +257,6 @@ 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,33 +318,41 @@ export interface HostAddress {
 */
 export interface LibDefaults {
    
-    CCacheType?: number,
+    NoAddresses?: boolean,
    
-    K5LoginAuthoritative?: boolean,
+    RealmTryDomains?: number,
    
-    Proxiable?: boolean,
+    DNSLookupKDC?: boolean,
    
-    RDNS?: boolean,
+    DefaultRealm?: string,
    
-    K5LoginDirectory?: string,
-    
-    KDCTimeSync?: number,
+    SafeChecksumType?: number,
    
    VerifyAPReqNofail?: boolean,
    
+    AllowWeakCrypto?: boolean,
+    
    DefaultTGSEnctypes?: string[],
    
-    DefaultTGSEnctypeIDs?: number[],
+    DefaultTktEnctypeIDs?: number[],
    
-    DNSCanonicalizeHostname?: boolean,
+    IgnoreAcceptorHostname?: boolean,
    
-    Forwardable?: boolean,
+    K5LoginAuthoritative?: boolean,
+    
+    PermittedEnctypes?: string[],
    
    /**
    * time in nanoseconds
    */
    
-    RenewLifetime?: number,
+    Clockskew?: number,
+    
+    DNSCanonicalizeHostname?: boolean,
+    
+    Proxiable?: boolean,
+    
+    RDNS?: boolean,
    
    /**
    * time in nanoseconds
@@ -354,45 +362,37 @@ export interface LibDefaults {
    
    DefaultClientKeytabName?: string,
    
-    DefaultTktEnctypeIDs?: number[],
+    PermittedEnctypeIDs?: number[],
+    
+    UDPPreferenceLimit?: number,
+    
+    DefaultTGSEnctypeIDs?: number[],
+    
+    DefaultTktEnctypes?: string[],
+    
+    CCacheType?: 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,
    
-    SafeChecksumType?: number,
+    Forwardable?: boolean,
    
-    UDPPreferenceLimit?: number,
+    K5LoginDirectory?: string,
+    
+    KDCTimeSync?: number,
    
    /**
    * time in nanoseconds
    */
    
-    Clockskew?: number,
+    RenewLifetime?: number,
    
-    PermittedEnctypes?: string[],
+    DefaultKeytabName?: string,
    
    KDCDefaultOptions?: BitString,
 }
@@ -416,8 +416,6 @@ export interface PrincipalName {
 */
 export interface Realm {
    
-    Realm?: string,
-    
    AdminServer?: string[],
    
    DefaultDomain?: string,
@@ -427,6 +425,8 @@ export interface Realm {
    KPasswdServer?: string[],
    
    MasterKDC?: string[],
+    
+    Realm?: string,
 }


@@ -209,8 +209,8 @@ export class Client {
    * log(to_json(users));
    * ```
    */
-    public FindADObjects(filter: string): SearchResult | null {
-        return null;
+    public FindADObjects(filter: string): ADObject[] {
+        return [];
    }
    

@@ -225,8 +225,8 @@ export class Client {
    * log(to_json(users));
    * ```
    */
-    public GetADUsers(): SearchResult | null {
-        return null;
+    public GetADUsers(): ADObject[] {
+        return [];
    }
    

@@ -241,8 +241,8 @@ export class Client {
    * log(to_json(users));
    * ```
    */
-    public GetADActiveUsers(): SearchResult | null {
-        return null;
+    public GetADActiveUsers(): ADObject[] {
+        return [];
    }
    

@@ -257,8 +257,8 @@ export class Client {
    * log(to_json(users));
    * ```
    */
-    public GetADUserWithNeverExpiringPasswords(): SearchResult | null {
-        return null;
+    public GetADUserWithNeverExpiringPasswords(): ADObject[] {
+        return [];
    }
    

@@ -273,8 +273,8 @@ export class Client {
    * log(to_json(users));
    * ```
    */
-    public GetADUserTrustedForDelegation(): SearchResult | null {
-        return null;
+    public GetADUserTrustedForDelegation(): ADObject[] {
+        return [];
    }
    

@@ -289,8 +289,8 @@ export class Client {
    * log(to_json(users));
    * ```
    */
-    public GetADUserWithPasswordNotRequired(): SearchResult | null {
-        return null;
+    public GetADUserWithPasswordNotRequired(): ADObject[] {
+        return [];
    }
    

@@ -305,8 +305,8 @@ export class Client {
    * log(to_json(groups));
    * ```
    */
-    public GetADGroups(): SearchResult | null {
-        return null;
+    public GetADGroups(): ADObject[] {
+        return [];
    }
    

@@ -321,8 +321,8 @@ export class Client {
    * log(to_json(dcs));
    * ```
    */
-    public GetADDCList(): SearchResult | null {
-        return null;
+    public GetADDCList(): ADObject[] {
+        return [];
    }
    

@@ -337,8 +337,8 @@ export class Client {
    * log(to_json(admins));
    * ```
    */
-    public GetADAdmins(): SearchResult | null {
-        return null;
+    public GetADAdmins(): ADObject[] {
+        return [];
    }
    

@@ -353,8 +353,8 @@ export class Client {
    * log(to_json(kerberoastable));
    * ```
    */
-    public GetADUserKerberoastable(): SearchResult | null {
-        return null;
+    public GetADUserKerberoastable(): ADObject[] {
+        return [];
    }
    

@@ -369,8 +369,8 @@ export class Client {
    * log(to_json(AsRepRoastable));
    * ```
    */
-    public GetADUserAsRepRoastable(): SearchResult | null {
-        return null;
+    public GetADUserAsRepRoastable(): ADObject[] {
+        return [];
    }
    

@@ -428,8 +428,8 @@ export class Client {
    * const results = client.Search('(objectClass=*)', 'cn', 'mail');
    * ```
    */
-    public Search(filter: string, attributes: any): SearchResult | null {
-        return null;
+    public Search(filter: string, attributes: any): Record<string, string[]>[] {
+        return [];
    }
    

@@ -481,6 +481,33 @@ 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
@@ -508,186 +535,27 @@ export interface Config {


 /**
- * LdapAttributes represents all LDAP attributes of a particular
- * ldap entry
+ * Entry Interface
 */
-export interface LdapAttributes {
+export interface Entry {
    
-    /**
-    * CurrentTime contains current time
-    */
+    DN?: string,
    
-    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>,
+    Attributes?: EntryAttribute,
 }



 /**
- * LdapEntry represents a single LDAP entry
+ * EntryAttribute Interface
 */
-export interface LdapEntry {
+export interface EntryAttribute {
    
-    /**
-    * DN contains distinguished name
-    */
+    Name?: string,
    
-    DN?: string,
+    Values?: string[],
    
-    /**
-    * Attributes contains list of attributes
-    */
-    
-    Attributes?: LdapAttributes,
+    ByteValues?: Uint8Array,
 }


@@ -716,32 +584,12 @@ export interface Metadata {


 /**
- * 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');
- * ```
+ * SearchResult Interface
 */
 export interface SearchResult {
    
-    /**
-    * Referrals contains list of referrals
-    */
-    
    Referrals?: string[],
    
-    /**
-    * Controls contains list of controls
-    */
-    
-    Controls?: string[],
-    
-    /**
-    * Entries contains list of entries
-    */
-    
-    Entries?: LdapEntry[],
+    Entries?: Entry,
 }

@@ -2,7 +2,7 @@

 /**
 * Client is a client for MS SQL database.
- * Internally client uses microsoft/go-mssqldb driver.
+ * Internally client uses denisenkom/go-mssqldb driver.
 * @example
 * ```javascript
 * const mssql = require('nuclei/mssql');
@@ -78,6 +78,8 @@ export interface IsRDPResponse {
 */
 export interface ServiceRDP {
    
+    DNSDomainName?: string,
+    
    ForestName?: string,
    
    OSFingerprint?: string,
@@ -91,7 +93,5 @@ export interface ServiceRDP {
    NetBIOSDomainName?: string,
    
    DNSComputerName?: string,
-    
-    DNSDomainName?: string,
 }

@@ -137,10 +137,6 @@ export interface NegotiationLog {
 */
 export interface SMBCapabilities {
    
-    DFSSupport?: boolean,
-    
-    Leasing?: boolean,
-    
    LargeMTU?: boolean,
    
    MultiChan?: boolean,
@@ -150,6 +146,10 @@ 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,
 }

@@ -133,9 +133,9 @@ export interface Algorithms {
    
    HostKey?: string,
    
-    W?: DirectionAlgorithms,
-    
    R?: DirectionAlgorithms,
+    
+    W?: DirectionAlgorithms,
 }


@@ -159,13 +159,13 @@ export interface DirectionAlgorithms {
 */
 export interface EndpointId {
    
-    SoftwareVersion?: string,
-    
-    Comment?: string,
-    
    Raw?: string,
    
    ProtoVersion?: string,
+    
+    SoftwareVersion?: string,
+    
+    Comment?: 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,
    
-    ServerHostKeyAlgos?: string[],
+    CiphersClientServer?: string[],
+    
+    MACsClientServer?: string[],
+    
+    MACsServerClient?: string[],
+    
+    CompressionServerClient?: string[],
+    
+    LanguagesClientServer?: string[],
+    
+    FirstKexFollows?: boolean,
+    
+    KexAlgos?: string[],
    
    CiphersServerClient?: string[],
    
+    CompressionClientServer?: string[],
+    
    LanguagesServerClient?: string[],
    
-    FirstKexFollows?: boolean,
+    ServerHostKeyAlgos?: string[],
 }

@@ -2,7 +2,6 @@ package global

 import (
 	"bytes"
-	"context"
 	"embed"
 	"math/rand"
 	"net"
@@ -13,10 +12,8 @@ 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"
 )
@@ -112,43 +109,13 @@ func initBuiltInFunc(runtime *goja.Runtime) {
 		Signatures: []string{
 			"isPortOpen(host string, port string, [timeout int]) bool",
 		},
-		Description: "isPortOpen checks if given TCP port is open on host. timeout is optional and defaults to 5 seconds",
+		Description: "isPortOpen checks if given port is open on host. timeout is optional and defaults to 5 seconds",
 		FuncDecl: func(host string, port string, timeout ...int) (bool, error) {
-			ctx := context.Background()
+			timeoutInSec := 5
 			if len(timeout) > 0 {
-				var cancel context.CancelFunc
-				ctx, cancel = context.WithTimeout(ctx, time.Duration(timeout[0])*time.Second)
-				defer cancel()
+				timeoutInSec = timeout[0]
 			}
-			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))
+			conn, err := net.DialTimeout("tcp", net.JoinHostPort(host, port), time.Duration(timeoutInSec)*time.Second)
 			if err != nil {
 				return false, err
 			}
@@ -74,6 +74,25 @@ 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
@@ -83,7 +102,7 @@ func NegativeFilter(filter string) string {
 // const users = client.FindADObjects(ldap.FilterIsPerson);
 // log(to_json(users));
 // ```
-func (c *Client) FindADObjects(filter string) SearchResult {
+func (c *Client) FindADObjects(filter string) []ADObject {
 	c.nj.Require(c.conn != nil, "no existing connection")
 	sr := ldap.NewSearchRequest(
 		c.BaseDN, ldap.ScopeWholeSubtree,
@@ -102,7 +121,19 @@ func (c *Client) FindADObjects(filter string) SearchResult {

 	res, err := c.conn.Search(sr)
 	c.nj.HandleError(err, "ldap search request failed")
-	return *getSearchResult(res)
+
+	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
 }

 // GetADUsers returns all AD users
@@ -114,7 +145,7 @@ func (c *Client) FindADObjects(filter string) SearchResult {
 // const users = client.GetADUsers();
 // log(to_json(users));
 // ```
-func (c *Client) GetADUsers() SearchResult {
+func (c *Client) GetADUsers() []ADObject {
 	return c.FindADObjects(FilterIsPerson)
 }

@@ -127,7 +158,7 @@ func (c *Client) GetADUsers() SearchResult {
 // const users = client.GetADActiveUsers();
 // log(to_json(users));
 // ```
-func (c *Client) GetADActiveUsers() SearchResult {
+func (c *Client) GetADActiveUsers() []ADObject {
 	return c.FindADObjects(JoinFilters(FilterIsPerson, FilterAccountEnabled))
 }

@@ -140,7 +171,7 @@ func (c *Client) GetADActiveUsers() SearchResult {
 // const users = client.GetADUserWithNeverExpiringPasswords();
 // log(to_json(users));
 // ```
-func (c *Client) GetADUserWithNeverExpiringPasswords() SearchResult {
+func (c *Client) GetADUserWithNeverExpiringPasswords() []ADObject {
 	return c.FindADObjects(JoinFilters(FilterIsPerson, FilterDontExpirePassword))
 }

@@ -153,7 +184,7 @@ func (c *Client) GetADUserWithNeverExpiringPasswords() SearchResult {
 // const users = client.GetADUserTrustedForDelegation();
 // log(to_json(users));
 // ```
-func (c *Client) GetADUserTrustedForDelegation() SearchResult {
+func (c *Client) GetADUserTrustedForDelegation() []ADObject {
 	return c.FindADObjects(JoinFilters(FilterIsPerson, FilterTrustedForDelegation))
 }

@@ -166,7 +197,7 @@ func (c *Client) GetADUserTrustedForDelegation() SearchResult {
 // const users = client.GetADUserWithPasswordNotRequired();
 // log(to_json(users));
 // ```
-func (c *Client) GetADUserWithPasswordNotRequired() SearchResult {
+func (c *Client) GetADUserWithPasswordNotRequired() []ADObject {
 	return c.FindADObjects(JoinFilters(FilterIsPerson, FilterPasswordNotRequired))
 }

@@ -179,7 +210,7 @@ func (c *Client) GetADUserWithPasswordNotRequired() SearchResult {
 // const groups = client.GetADGroups();
 // log(to_json(groups));
 // ```
-func (c *Client) GetADGroups() SearchResult {
+func (c *Client) GetADGroups() []ADObject {
 	return c.FindADObjects(FilterIsGroup)
 }

@@ -192,7 +223,7 @@ func (c *Client) GetADGroups() SearchResult {
 // const dcs = client.GetADDCList();
 // log(to_json(dcs));
 // ```
-func (c *Client) GetADDCList() SearchResult {
+func (c *Client) GetADDCList() []ADObject {
 	return c.FindADObjects(JoinFilters(FilterIsComputer, FilterAccountEnabled, FilterServerTrustAccount))
 }

@@ -205,7 +236,7 @@ func (c *Client) GetADDCList() SearchResult {
 // const admins = client.GetADAdmins();
 // log(to_json(admins));
 // ```
-func (c *Client) GetADAdmins() SearchResult {
+func (c *Client) GetADAdmins() []ADObject {
 	return c.FindADObjects(JoinFilters(FilterIsPerson, FilterAccountEnabled, FilterIsAdmin))
 }

@@ -218,7 +249,7 @@ func (c *Client) GetADAdmins() SearchResult {
 // const kerberoastable = client.GetADUserKerberoastable();
 // log(to_json(kerberoastable));
 // ```
-func (c *Client) GetADUserKerberoastable() SearchResult {
+func (c *Client) GetADUserKerberoastable() []ADObject {
 	return c.FindADObjects(JoinFilters(FilterIsPerson, FilterAccountEnabled, FilterHasServicePrincipalName))
 }

@@ -231,7 +262,7 @@ func (c *Client) GetADUserKerberoastable() SearchResult {
 // const AsRepRoastable = client.GetADUserAsRepRoastable();
 // log(to_json(AsRepRoastable));
 // ```
-func (c *Client) GetADUserAsRepRoastable() SearchResult {
+func (c *Client) GetADUserAsRepRoastable() []ADObject {
 	return c.FindADObjects(JoinFilters(FilterIsPerson, FilterDontRequirePreauth))
 }

@@ -245,16 +276,7 @@ func (c *Client) GetADUserAsRepRoastable() SearchResult {
 // ```
 func (c *Client) GetADDomainSID() string {
 	r := c.Search(FilterServerTrustAccount, "objectSid")
-	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 ""
+	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])
 }
@@ -203,24 +203,38 @@ 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) SearchResult {
+func (c *Client) Search(filter string, attributes ...string) []map[string][]string {
 	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(
-			"",
-			ldap.ScopeWholeSubtree,
-			ldap.NeverDerefAliases,
-			0, 0, false,
-			filter,
-			attributes,
-			nil,
+			c.BaseDN, ldap.ScopeWholeSubtree, ldap.NeverDerefAliases,
+			0, 0, false, filter, attributes, nil,
 		),
 	)
 	c.nj.HandleError(err, "ldap search request failed")
-	return *getSearchResult(res)
+	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
 }

 // AdvancedSearch accepts all values of search request type and return Ldap Entry
@@ -236,7 +250,7 @@ func (c *Client) AdvancedSearch(
 	TypesOnly bool,
 	Filter string,
 	Attributes []string,
-	Controls []ldap.Control) SearchResult {
+	Controls []ldap.Control) ldap.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="))
@@ -245,7 +259,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 *getSearchResult(res)
+	return *res
 }

 type (
@@ -281,7 +295,7 @@ func (c *Client) CollectMetadata() Metadata {

 	srMetadata := ldap.NewSearchRequest(
 		"",
-		ldap.ScopeWholeSubtree,
+		ldap.ScopeBaseObject,
 		ldap.NeverDerefAliases,
 		0, 0, false,
 		"(objectClass=*)",
@@ -5,189 +5,8 @@ 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
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"

-	_ "github.com/microsoft/go-mssqldb"
+	_ "github.com/denisenkom/go-mssqldb"

 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
 )
@@ -9,14 +9,14 @@ import (
 	"strings"
 	"time"

-	_ "github.com/microsoft/go-mssqldb"
+	_ "github.com/denisenkom/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 microsoft/go-mssqldb driver.
+	// Internally client uses denisenkom/go-mssqldb driver.
 	// @example
 	// ```javascript
 	// const mssql = require('nuclei/mssql');
@@ -36,7 +36,6 @@ 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)
 }

@@ -78,16 +77,6 @@ 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,
@@ -193,16 +182,6 @@ 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
@@ -241,15 +220,6 @@ 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,
@@ -37,7 +37,6 @@ 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)
 }

@@ -75,13 +74,6 @@ 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")
 }

@@ -96,14 +88,6 @@ 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)
 }

@@ -145,14 +129,6 @@ 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)
 }

@@ -173,10 +149,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)
 		},
@@ -60,16 +60,12 @@ func (j *NucleiJS) HandleError(err error, msg ...string) {
 	if len(msg) == 0 {
 		j.ThrowError(err)
 	}
-	j.Throw("%s: %s", strings.Join(msg, ":"), err.Error())
+	j.Throw(fmt.Sprintf("%s: %s", strings.Join(msg, ":"), err.Error()))
 }

 // Throw throws an error in goja runtime
 func (j *NucleiJS) Throw(format string, args ...interface{}) {
-	if len(args) > 0 {
-		panic(j.runtime().ToValue(fmt.Sprintf(format, args...)))
-	}
-
-	panic(j.runtime().ToValue(format))
+	panic(j.runtime().ToValue(fmt.Sprintf(format, args...)))
 }

 // GetArg returns argument at index from goja runtime if not found throws error
@@ -99,7 +95,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("%s", msg)
+		j.Throw(msg)
 	}
 }

@@ -71,7 +71,6 @@ 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]`)
@@ -254,7 +253,6 @@ func NewStandardWriter(options *types.Options) (*StandardWriter, error) {
 		storeResponse:    options.StoreResponse,
 		storeResponseDir: options.StoreResponseDir,
 		omitTemplate:     options.OmitTemplate,
-		KeysToRedact:     options.Redact,
 	}
 	return writer, nil
 }
@@ -266,13 +264,6 @@ 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
@@ -311,14 +302,6 @@ 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"`
@@ -525,12 +508,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("%s", strings.TrimSpace(parts[len(parts)-1]))
+		return errkit.New(strings.TrimSpace(parts[len(parts)-1]))
 	}
 	if strings.Contains(msg, "read ") {
 		// same here
 		parts := strings.Split(msg, ":")
-		return errkit.New("%s", strings.TrimSpace(parts[len(parts)-1]))
+		return errkit.New(strings.TrimSpace(parts[len(parts)-1]))
 	}
 	return err
 }
@@ -17,7 +17,7 @@ func hash(v interface{}) (string, error) {

 	sh := sha256.New()

-	if _, err = sh.Write(data); err != nil {
+	if _, err = io.WriteString(sh, string(data)); err != nil {
 		return "", err
 	}
 	return hex.EncodeToString(sh.Sum(nil)), nil
@@ -37,7 +37,8 @@ import (
 )

 const (
-	pythonEnvRegex = `os\.getenv\(['"]([^'"]+)['"]\)`
+	pythonEnvRegex    = `os\.getenv\(['"]([^'"]+)['"]\)`
+	TimeoutMultiplier = 6 // timeout multiplier for code protocol
 )

 var (
@@ -178,6 +179,9 @@ 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)
@@ -195,11 +199,11 @@ func (request *Request) ExecuteWithResults(input *contextargs.Context, dynamicVa

 		result, err := request.options.JsCompiler.ExecuteWithOptions(request.preConditionCompiled, args,
 			&compiler.ExecuteOptions{
-				TimeoutVariants: request.options.Options.GetTimeouts(),
-				Source:          &request.PreCondition,
-				Callback:        registerPreConditionFunctions,
-				Cleanup:         cleanUpPreConditionFunctions,
-				Context:         input.Context(),
+				Timeout:  timeout,
+				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)
@@ -214,7 +218,7 @@ func (request *Request) ExecuteWithResults(input *contextargs.Context, dynamicVa
 		}
 	}

-	ctx, cancel := context.WithTimeoutCause(input.Context(), request.options.Options.GetTimeouts().CodeExecutionTimeout, ErrCodeExecutionDeadline)
+	ctx, cancel := context.WithTimeoutCause(input.Context(), time.Duration(timeout)*time.Second, 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) {
@@ -50,11 +50,9 @@ 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,
+		MetaInput: &MetaInput{Input: input},
 		CookieJar: jar,
 		args: &mapsutil.SyncLockMap[string, interface{}]{
 			Map:      make(map[string]interface{}),
@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"net"
 	"strings"
-	"sync"

 	jsoniter "github.com/json-iterator/go"
 	"github.com/projectdiscovery/nuclei/v3/pkg/input/types"
@@ -25,12 +24,6 @@ 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) {
@@ -142,10 +135,10 @@ func (metaInput *MetaInput) Unmarshal(data string) error {
 }

 func (metaInput *MetaInput) Clone() *MetaInput {
-	input := NewMetaInput()
-	input.Input = metaInput.Input
-	input.CustomIP = metaInput.CustomIP
-	input.hash = metaInput.hash
+	input := &MetaInput{
+		Input:    metaInput.Input,
+		CustomIP: metaInput.CustomIP,
+	}
 	if metaInput.ReqResp != nil {
 		input.ReqResp = metaInput.ReqResp.Clone()
 	}
@@ -167,9 +160,6 @@ 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 {
@@ -44,8 +44,7 @@ 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().Msg(message)
-
+		gologger.Warning().Msgf(message)
 		return HighlightableHexDump{}, errors.New(message)
 	}

@@ -14,7 +14,6 @@ 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
@@ -201,7 +200,7 @@ func (c *Cache) checkError(err error) bool {
 		errX := errkit.FromError(err)
 		tmp := errX.Cause()
 		cause := tmp.Error()
-		if stringsutil.ContainsAll(cause, "ReadStatusLine:", "read: connection reset by peer") {
+		if strings.Contains(cause, "ReadStatusLine:") && strings.Contains(cause, "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
@@ -8,7 +8,7 @@ import (

 var (
 	defaultInteractionDuration = 60 * time.Second
-	interactshURLMarkerRegex = regexp.MustCompile(`(%7[B|b]|\{){2}(interactsh-url(?:_[0-9]+){0,3})(%7[D|d]|\}){2}`)
+	interactshURLMarkerRegex   = regexp.MustCompile(`{{interactsh-url(?:_[0-9]+){0,3}}}`)

 	ErrInteractshClientNotInitialized = errors.New("interactsh client not initialized")
 )
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"net"
 	"net/url"
-	"sync"

 	"github.com/go-sql-driver/mysql"
 	"github.com/pkg/errors"
@@ -20,17 +19,9 @@ import (

 // Dialer is a shared fastdialer instance for host DNS resolution
 var (
-	muDialer sync.RWMutex
-	Dialer   *fastdialer.Dialer
+	Dialer *fastdialer.Dialer
 )

-func GetDialer() *fastdialer.Dialer {
-	muDialer.RLock()
-	defer muDialer.RUnlock()
-
-	return Dialer
-}
-
 func ShouldInit() bool {
 	return Dialer == nil
 }
@@ -43,7 +34,9 @@ func Init(options *types.Options) error {

 	lfaAllowed = options.AllowLocalFileAccess
 	opts := fastdialer.DefaultOptions
-	opts.DialerTimeout = options.GetTimeouts().DialTimeout
+	if options.DialerTimeout > 0 {
+		opts.DialerTimeout = options.DialerTimeout
+	}
 	if options.DialerKeepAlive > 0 {
 		opts.DialerKeepAlive = options.DialerKeepAlive
 	}
@@ -219,12 +212,10 @@ func interfaceAddresses(interfaceName string) ([]net.Addr, error) {

 // Close closes the global shared fastdialer
 func Close() {
-	muDialer.Lock()
-	defer muDialer.Unlock()
-
 	if Dialer != nil {
 		Dialer.Close()
 		Dialer = nil
 	}
+	Dialer = nil
 	StopActiveMemGuardian()
 }
@@ -141,6 +141,12 @@ 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 {
@@ -3,6 +3,7 @@ package dns
 import (
 	"encoding/hex"
 	"fmt"
+	"net/url"
 	"strings"
 	"sync"

@@ -22,6 +23,7 @@ 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"
@@ -36,8 +38,16 @@ 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(input.MetaInput.Input)
+	domain, err = request.parseDNSInput(domain)
 	if err != nil {
 		return errors.Wrap(err, "could not build request")
 	}
@@ -106,7 +116,7 @@ func (request *Request) ExecuteWithResults(input *contextargs.Context, metadata,
 }

 func (request *Request) execute(input *contextargs.Context, domain string, metadata, previous output.InternalEvent, vars map[string]interface{}, callback protocols.OutputEventCallback) error {
-	var err error
+
 	if vardump.EnableVarDump {
 		gologger.Debug().Msgf("DNS Protocol request variables: \n%s\n", vardump.DumpVariables(vars))
 	}
@@ -142,7 +152,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).Msg(msg)
+			gologger.Info().Str("domain", domain).Msgf(msg)
 			gologger.Print().Msgf("%s", requestString)
 		}
 		if request.options.Options.StoreResponse {
@@ -199,7 +209,7 @@ func (request *Request) execute(input *contextargs.Context, domain string, metad
 	}

 	callback(event)
-	return err
+	return nil
 }

 func (request *Request) parseDNSInput(host string) (string, error) {
@@ -220,7 +230,7 @@ func (request *Request) parseDNSInput(host string) (string, error) {
 	return host, nil
 }

-func dumpResponse(event *output.InternalWrappedEvent, request *Request, _ *protocols.ExecutorOptions, response, domain string) {
+func dumpResponse(event *output.InternalWrappedEvent, request *Request, requestOptions *protocols.ExecutorOptions, response, domain string) {
 	cliOptions := request.options.Options
 	if cliOptions.Debug || cliOptions.DebugResponse || cliOptions.StoreResponse {
 		hexDump := false
@@ -251,3 +261,12 @@ 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()
+}
@@ -67,5 +67,19 @@ 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
-	// Note: changing url to domain is responsible at tmplexec package and is implemented there
+
+	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
 }