feat: add proxy server + more enhancements additions

.github/DISCUSSION_TEMPLATE.md

@@ -1,76 +0,0 @@
-# Nuclei Discussion Guidelines
-
-## Before Creating a Discussion
-
-1. **Search existing discussions and issues** to avoid duplicates
-2. **Check the documentation** and README first
-3. **Browse the FAQ** and common questions
-
-## Bug Reports in Discussions
-
-When reporting a bug in [Q&A Discussions](https://github.com/projectdiscovery/nuclei/discussions/categories/q-a), please include:
-
-### Required Information:
-- **Clear title** with `[BUG]` prefix (e.g., "[BUG] Nuclei crashes when...")
-- **Current behavior** - What's happening now?
-- **Expected behavior** - What should happen instead?
-- **Steps to reproduce** - Commands or actions that trigger the issue
-- **Environment details**:
-  - OS and version
-  - Nuclei version (`nuclei -version`)
-  - Go version (if installed via `go install`)
-- **Log output** - Run with `-verbose` or `-debug` for detailed logs
-- **Redact sensitive information** - Remove target URLs, credentials, etc.
-
-### After Discussion:
-- Maintainers will review and validate the bug report
-- Valid bugs will be converted to issues with proper labels and tracking
-- Questions and misconfigurations will be resolved in the discussion
-
-## Feature Requests in Discussions
-
-When requesting a feature in [Ideas Discussions](https://github.com/projectdiscovery/nuclei/discussions/categories/ideas), please include:
-
-### Required Information:
-- **Clear title** with `[FEATURE]` prefix (e.g., "[FEATURE] Add support for...")
-- **Feature description** - What do you want to be added?
-- **Use case** - Why is this feature needed? What problem does it solve?
-- **Implementation ideas** - If you have suggestions on how it could work
-- **Alternatives considered** - What other solutions have you thought about?
-
-### After Discussion:
-- Community and maintainers will discuss the feasibility
-- Popular and viable features will be converted to issues
-- Similar features may be grouped together
-- Rejected features will be explained in the discussion
-
-## Getting Help
-
-For general questions, troubleshooting, and "how-to" topics:
-- Use [Q&A Discussions](https://github.com/projectdiscovery/nuclei/discussions/categories/q-a)
-- Join the [Discord server](https://discord.gg/projectdiscovery) #nuclei channel
-- Check existing discussions for similar questions
-
-## Discussion to Issue Conversion Process
-
-Only maintainers can convert discussions to issues. The process:
-
-1. **Validation** - Maintainers review the discussion for completeness and validity
-2. **Classification** - Determine if it's a bug, feature, enhancement, etc.
-3. **Issue creation** - Create a properly formatted issue with appropriate labels
-4. **Linking** - Link the issue back to the original discussion
-5. **Resolution** - Mark the discussion as resolved or close it
-
-This process ensures:
-- High-quality issues that are actionable
-- Proper triage and labeling
-- Reduced noise in the issue tracker
-- Community involvement in the validation process
-
-## Why This Process?
-
-- **Better organization** - Issues contain only validated, actionable items
-- **Community input** - Discussions allow for community feedback before escalation
-- **Quality control** - Maintainers ensure proper formatting and information
-- **Reduced maintenance** - Fewer invalid or duplicate issues to manage
-- **Clear separation** - Questions vs. actual bugs/features are clearly distinguished

.github/ISSUE_TEMPLATE/config.yml

@@ -2,18 +2,14 @@ blank_issues_enabled: false
 
 contact_links:
 
-  - name: 💡 Request a Feature (Start with Discussion)
-    url: https://github.com/orgs/projectdiscovery/discussions/new?category=ideas
-    about: Share your feature idea in discussions first. This helps validate and refine the request before creating an issue.
+  - name: Ask an question / advise on using nuclei
+    url: https://github.com/projectdiscovery/nuclei/discussions/categories/q-a
+    about: Ask a question or request support for using nuclei
 
-  - name: ❓ Ask Questions / Get Help
-    url: https://github.com/orgs/projectdiscovery/discussions
-    about: Get help and ask questions about using Nuclei. Many questions don't require issues.
+  - name: Share idea / feature to discuss for nuclei
+    url: https://github.com/projectdiscovery/nuclei/discussions/categories/ideas
+    about: Share idea / feature to discuss for nuclei
 
-  - name: 🔍 Browse Existing Issues
-    url: https://github.com/projectdiscovery/nuclei/issues
-    about: Check existing issues to see if your problem has already been reported or is being worked on.
-
-  - name: 💬 Connect with PD Team (Discord)
+  - name: Connect with PD Team (Discord)
     url: https://discord.gg/projectdiscovery
-    about: Join our Discord for real-time discussions and community support on the #nuclei channel.
+    about: Connect with PD Team for direct communication

.github/ISSUE_TEMPLATE/reference-templates/README.md

@@ -1,45 +0,0 @@
-# Issue Template References
-
-## Overview
-
-This folder contains the preserved issue templates that are **not** directly accessible to users. These templates serve as references for maintainers when converting discussions to issues.
-
-## New Workflow
-
-### For Users:
-1. **All reports start in Discussions** - Users cannot create issues directly
-2. Bug reports go to [Q&A Discussions](https://github.com/projectdiscovery/nuclei/discussions/categories/q-a)
-3. Feature requests go to [Ideas Discussions](https://github.com/projectdiscovery/nuclei/discussions/categories/ideas)
-4. This helps filter out duplicate questions, invalid reports, and ensures proper triage
-
-### For Maintainers:
-1. **Review discussions** in both Q&A and Ideas categories
-2. **Validate the reports** - ensure they're actual bugs/valid feature requests
-3. **Use reference templates** when converting discussions to issues:
-   - Copy content from `bug-report-reference.yml` or `feature-request-reference.yml`
-   - Create a new issue manually with the appropriate template structure
-   - Link back to the original discussion
-   - Close the discussion or mark it as resolved
-
-## Benefits
-
-- **Better triage**: Avoid cluttering issues with questions and invalid reports
-- **Community involvement**: Discussions allow for community input before creating issues
-- **Quality control**: Maintainers can ensure issues follow proper format and contain necessary information
-- **Reduced noise**: Only validated, actionable items become issues
-
-## Reference Templates
-
-- `bug-report-reference.yml` - Use when converting bug reports from discussions to issues
-- `feature-request-reference.yml` - Use when converting feature requests from discussions to issues
-
-## Converting a Discussion to Issue
-
-1. Identify a valid discussion that needs to become an issue
-2. Go to the main repository's Issues tab
-3. Click "New Issue"
-4. Manually create the issue using the reference template structure
-5. Include all relevant information from the discussion
-6. Add a comment linking back to the original discussion
-7. Apply appropriate labels
-8. Close or mark the discussion as resolved with a link to the created issue

.github/auto_assign.yml

@@ -2,7 +2,6 @@ addReviewers: true
 reviewers:
   - dogancanbakir
   - dwisiswant0
-  - mzack9999
 
 numberOfReviewers: 1
 skipKeywords:

.github/stale.yml

@@ -0,0 +1,27 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 7
+
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+
+# Issues with these labels will never be considered stale
+# exemptLabels:
+#   - pinned
+#   - security
+
+# Only issues or pull requests with all of these labels are check if stale.
+onlyLabels:
+  - "Status: Abandoned"
+  - "Type: Question"
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.github/workflows/auto-merge.yaml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.actor == 'dependabot[bot]'
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           token: ${{ secrets.DEPENDABOT_PAT }}
 

.github/workflows/compat-checks.yaml

@@ -13,7 +13,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - uses: projectdiscovery/actions/setup/go/compat-checks@v1
         with:
           release-test: true

.github/workflows/generate-docs.yaml

@@ -11,7 +11,7 @@ jobs:
     if: "${{ !endsWith(github.actor, '[bot]') }}"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - uses: projectdiscovery/actions/setup/go@v1
       - uses: projectdiscovery/actions/setup/git@v1
       - run: make syntax-docs

.github/workflows/generate-pgo.yaml

@@ -28,7 +28,7 @@ jobs:
       LIST_FILE: "/tmp/targets-${{ matrix.targets }}.txt"
       PROFILE_MEM: "/tmp/nuclei-profile-${{ matrix.targets }}-targets"
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - uses: projectdiscovery/actions/setup/git@v1
       - uses: projectdiscovery/actions/setup/go@v1
       - name: Generate list
@@ -49,7 +49,7 @@ jobs:
           files: "${PGO_FILE}"
           message: "build: update PGO profile :robot:"
       - run: git push origin $GITHUB_REF
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v4
         with:
           name: "pgo"
           path: "${{ env.PGO_FILE }}"

.github/workflows/govulncheck.yaml

@@ -16,11 +16,11 @@ jobs:
     env:
       OUTPUT: "/tmp/results.sarif"
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - uses: projectdiscovery/actions/setup/go@v1
       - run: go install golang.org/x/vuln/cmd/govulncheck@latest
       - run: govulncheck -scan package -format sarif ./... > $OUTPUT
-      - uses: github/codeql-action/upload-sarif@v4
+      - uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: "${{ env.OUTPUT }}"
           category: "govulncheck"

.github/workflows/perf-regression.yaml

@@ -11,7 +11,7 @@ jobs:
     env:
       BENCH_OUT: "/tmp/bench.out"
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - uses: projectdiscovery/actions/setup/go@v1
       - run: make build-test
       - run: ./bin/nuclei.test -test.run - -test.bench=. -test.benchmem ./cmd/nuclei/ | tee $BENCH_OUT

.github/workflows/perf-test.yaml

@@ -16,7 +16,7 @@ jobs:
       LIST_FILE: "/tmp/targets-${{ matrix.count }}.txt"
       PROFILE_MEM: "/tmp/nuclei-perf-test-${{ matrix.count }}"
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - uses: projectdiscovery/actions/setup/go@v1
       - run: make verify
       - name: Generate list

.github/workflows/release.yaml

@@ -10,10 +10,12 @@ jobs:
   release: 
     runs-on: ubuntu-latest-16-cores
     steps: 
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with: 
           fetch-depth: 0
       - uses: projectdiscovery/actions/setup/go@v1
+      - uses: docker/setup-qemu-action@v3
+      - uses: docker/setup-buildx-action@v3
       - uses: docker/login-action@v3 
         with:
           username: ${{ secrets.DOCKER_USERNAME }}

.github/workflows/stale.yaml

@@ -1,41 +0,0 @@
-name: 💤 Stale
-
-on:
-  schedule:
-    - cron: '0 0 * * 0' # Weekly
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    permissions:
-      actions: write
-      contents: write # only for delete-branch option
-      issues: write
-      pull-requests: write
-    steps:
-      - uses: actions/stale@v10
-        with:
-          days-before-stale: 90
-          days-before-close: 7
-          stale-issue-label: "Status: Stale"
-          stale-pr-label: "Status: Stale"
-          stale-issue-message: >
-            This issue has been automatically marked as stale because it has not
-            had recent activity. It will be closed in 7 days if no further
-            activity occurs. Thank you for your contributions!
-          stale-pr-message: >
-            This pull request has been automatically marked as stale due to
-            inactivity. It will be closed in 7 days if no further activity
-            occurs. Please update if you wish to keep it open.
-          close-issue-message: >
-            This issue has been automatically closed due to inactivity. If you
-            think this is a mistake or would like to continue the discussion,
-            please comment or feel free to reopen it.
-          close-pr-message: >
-            This pull request has been automatically closed due to inactivity.
-            If you think this is a mistake or would like to continue working on
-            it, please comment or feel free to reopen it.
-          close-issue-label: "Status: Abandoned"
-          close-pr-label: "Status: Abandoned"
-          exempt-issue-labels: "Status: Abandoned"
-          exempt-pr-labels: "Status: Abandoned"

.github/workflows/tests.yaml

@@ -22,9 +22,9 @@ jobs:
     if: "${{ !endsWith(github.actor, '[bot]') }}"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - uses: projectdiscovery/actions/setup/go@v1
-      - uses: projectdiscovery/actions/golangci-lint/v2@v1
+      - uses: projectdiscovery/actions/golangci-lint@v1
 
   tests:
     name: "Tests"
@@ -35,7 +35,7 @@ jobs:
         os: [ubuntu-latest, windows-latest, macOS-latest]
     runs-on: "${{ matrix.os }}"
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - uses: projectdiscovery/actions/setup/go@v1
       - run: make vet
       - run: make build
@@ -52,18 +52,16 @@ jobs:
     needs: ["tests"]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - uses: projectdiscovery/actions/setup/go@v1
       - name: "Simple"
         run: go run .
         working-directory: examples/simple/
       # - run: go run . # Temporarily disabled very flaky in github actions
       #   working-directory: examples/advanced/
-
-      # TODO: FIX with ExecutionID (ref: https://github.com/projectdiscovery/nuclei/pull/6296)
-      # - name: "with Speed Control"
-      #   run: go run .
-      #   working-directory: examples/with_speed_control/
+      - name: "with Speed Control"
+        run: go run .
+        working-directory: examples/with_speed_control/
 
   integration:
     name: "Integration tests"
@@ -74,9 +72,11 @@ jobs:
         os: [ubuntu-latest, windows-latest, macOS-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - uses: projectdiscovery/actions/setup/go@v1
-      - uses: projectdiscovery/actions/setup/python@v1
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
       - run: bash run.sh "${{ matrix.os }}"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
@@ -93,10 +93,9 @@ jobs:
         os: [ubuntu-latest, windows-latest, macOS-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - uses: projectdiscovery/actions/setup/go@v1
-      - uses: projectdiscovery/actions/setup/python@v1
-      - run: bash run.sh
+      - run: bash run.sh "${{ matrix.os }}"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         working-directory: cmd/functional-test/
@@ -106,7 +105,7 @@ jobs:
     needs: ["tests"]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - uses: projectdiscovery/actions/setup/go@v1
       - run: make template-validate
 
@@ -119,20 +118,22 @@ jobs:
       contents: read
       security-events: write
     steps:
-      - uses: actions/checkout@v5
-      - uses: github/codeql-action/init@v4
+      - uses: actions/checkout@v4
+      - uses: github/codeql-action/init@v3
         with:
           languages: 'go'
-      - uses: github/codeql-action/autobuild@v4
-      - uses: github/codeql-action/analyze@v4
+      - uses: github/codeql-action/autobuild@v3
+      - uses: github/codeql-action/analyze@v3
 
   release:
     name: "Release test"
     needs: ["tests"]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - uses: projectdiscovery/actions/setup/go@v1
+      - uses: docker/setup-qemu-action@v3
+      - uses: docker/setup-buildx-action@v3
       - uses: projectdiscovery/actions/goreleaser@v1
 
   flamegraph:
@@ -143,7 +144,7 @@ jobs:
       TARGET_URL: "http://scanme.sh/a/?b=c"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - run: make build
       - name: "Setup environment (push)"
         if: ${{ github.event_name == 'push' }}

.gitignore

@@ -8,7 +8,7 @@
 .gitignore
 .idea
 .vscode
-.claude/settings.local.json
+
 # Binaries
 /bin/*
 /bindgen
@@ -28,8 +28,6 @@
 /scrapefunc
 /scrapefuncs
 /tsgen
-/integration_tests/integration-test
-/integration_tests/nuclei
 
 # Templates
 /*.yaml

.goreleaser.yml

@@ -38,9 +38,9 @@ builds:
 #  goarch: [amd64]
 
 archives:
-  - formats: [zip]
+  - format: zip
     id: nuclei
-    ids: [nuclei-cli]
+    builds: [nuclei-cli]
     name_template: '{{ .ProjectName }}_{{ .Version }}_{{ if eq .Os "darwin" }}macOS{{ else }}{{ .Os }}{{ end }}_{{ .Arch }}'
 
 checksum:

CLAUDE.md

@@ -1,83 +0,0 @@
-# CLAUDE.md
-
-This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
-
-## Project Overview
-
-Nuclei is a modern, high-performance vulnerability scanner built in Go that leverages YAML-based templates for customizable vulnerability detection. It supports multiple protocols (HTTP, DNS, TCP, SSL, WebSocket, WHOIS, JavaScript, Code) and is designed for zero false positives through real-world condition simulation.
-
-## Development Commands
-
-### Building and Testing
-- `make build` - Build the main nuclei binary to ./bin/nuclei
-- `make test` - Run unit tests with race detection
-- `make integration` - Run integration tests (builds and runs test suite)
-- `make functional` - Run functional tests
-- `make vet` - Run go vet for code analysis
-- `make tidy` - Clean up go modules
-
-### Validation and Linting
-- `make template-validate` - Validate nuclei templates using the built binary
-- `go fmt ./...` - Format Go code
-- `go vet ./...` - Static analysis
-
-### Development Tools
-- `make devtools-all` - Build all development tools (bindgen, tsgen, scrapefuncs)
-- `make jsupdate-all` - Update JavaScript bindings and TypeScript definitions
-- `make docs` - Generate documentation
-- `make memogen` - Generate memoization code for JavaScript libraries
-
-### Testing Specific Components
-- Run single test: `go test -v ./pkg/path/to/package -run TestName`
-- Integration tests are in `integration_tests/` and can be run via `make integration`
-
-## Architecture Overview
-
-### Core Components
-- **cmd/nuclei** - Main CLI entry point with flag parsing and configuration
-- **internal/runner** - Core runner that orchestrates the entire scanning process
-- **pkg/core** - Execution engine with work pools and template clustering
-- **pkg/templates** - Template parsing, compilation, and management
-- **pkg/protocols** - Protocol implementations (HTTP, DNS, Network, etc.)
-- **pkg/operators** - Matching and extraction logic (matchers/extractors)
-- **pkg/catalog** - Template discovery and loading from disk/remote sources
-
-### Protocol Architecture
-Each protocol (HTTP, DNS, Network, etc.) implements:
-- Request interface with Compile(), ExecuteWithResults(), Match(), Extract() methods
-- Operators embedding for matching/extraction functionality
-- Protocol-specific request building and execution logic
-
-### Template System
-- Templates are YAML files defining vulnerability detection logic
-- Compiled into executable requests with operators (matchers/extractors)
-- Support for workflows (multi-step template execution)
-- Template clustering optimizes identical requests across multiple templates
-
-### Key Execution Flow
-1. Template loading and compilation via pkg/catalog/loader
-2. Input provider setup for targets
-3. Engine creation with work pools for concurrency
-4. Template execution with result collection via operators
-5. Output writing and reporting integration
-
-### JavaScript Integration
-- Custom JavaScript runtime for code protocol templates
-- Auto-generated bindings in pkg/js/generated/
-- Library implementations in pkg/js/libs/
-- Development tools for binding generation in pkg/js/devtools/
-
-## Template Development
-- Templates located in separate nuclei-templates repository
-- YAML format with info, requests, and operators sections  
-- Support for multiple protocol types in single template
-- Built-in DSL functions for dynamic content generation
-- Template validation available via `make template-validate`
-
-## Key Directories
-- **lib/** - SDK for embedding nuclei as a library
-- **examples/** - Usage examples for different scenarios
-- **integration_tests/** - Integration test suite with protocol-specific tests
-- **pkg/fuzz/** - Fuzzing engine and DAST capabilities
-- **pkg/input/** - Input processing for various formats (Burp, OpenAPI, etc.)
-- **pkg/reporting/** - Result export and issue tracking integrations

DEBUG.md

@@ -40,8 +40,6 @@ Nuclei was built with some environment variables in mind to help with debugging.
 | `SHOW_DSL_ERRORS=true`           | Enables Printing DSL Errors (that are hidden by default) |
 | `HIDE_TEMPLATE_SIG_WARNING=true` | Hides Template Signature Verification Warnings           |
 | `NUCLEI_LOG_ALL=true`            | Log All Events that were skipped in verbose mode         |
-| `NUCLEI_CONFIG_DIR`              | Sets custom configuration directory path                 |
-| `NUCLEI_TEMPLATES_DIR`           | Sets custom nuclei templates directory path              |
 
 
 

Dockerfile

@@ -1,5 +1,5 @@
 # Build
-FROM golang:1.24-alpine AS builder
+FROM golang:1.22-alpine AS builder
 
 RUN apk add build-base
 WORKDIR /app
@@ -13,4 +13,4 @@ FROM alpine:latest
 RUN apk add --no-cache bind-tools chromium ca-certificates
 COPY --from=builder /app/bin/nuclei /usr/local/bin/
 
-ENTRYPOINT ["nuclei"]
+ENTRYPOINT ["nuclei"]

Makefile

@@ -15,8 +15,8 @@ ifneq ($(shell go env GOOS),darwin)
 endif
     
 .PHONY: all build build-stats clean devtools-all devtools-bindgen devtools-scrapefuncs
-.PHONY: devtools-tsgen docs docgen dsl-docs functional fuzzplayground go-build lint lint-strict syntax-docs
-.PHONY: integration jsupdate-all jsupdate-bindgen jsupdate-tsgen memogen scan-charts test test-with-lint
+.PHONY: devtools-tsgen docs docgen dsl-docs functional fuzzplayground go-build syntax-docs
+.PHONY: integration jsupdate-all jsupdate-bindgen jsupdate-tsgen memogen scan-charts test 
 .PHONY: tidy ts verify download vet template-validate
 
 all: build
@@ -146,14 +146,5 @@ dsl-docs:
 template-validate: build
 template-validate:
 	./bin/nuclei -ut
-	./bin/nuclei -validate \
-		-et http/technologies \
-		-t dns \
-		-t ssl \
-		-t network \
-		-t http/exposures \
-		-ept code
-	./bin/nuclei -validate \
-		-w workflows \
-		-et http/technologies \
-		-ept code
+	./bin/nuclei -validate -et http/technologies
+	./bin/nuclei -validate -w workflows -et http/technologies

README.md

@@ -7,13 +7,15 @@
   <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_KR.md">`Korean`</a> •
   <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_ID.md">`Indonesia`</a> •
   <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_ES.md">`Spanish`</a> •
-  <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_JP.md">`日本語`</a> •
+  <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_JP.md">`日本語`</a>
   <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_PT-BR.md">`Portuguese`</a>
   
 </div>
 
 <p align="center">
 
+<img src="https://img.shields.io/badge/go-1.22-%2300ADD8.svg?style=for-the-badge&logo=go&logoColor=white">
+&nbsp;&nbsp;
 <a href="https://docs.projectdiscovery.io/tools/nuclei/overview?utm_source=github&utm_medium=web&utm_campaign=nuclei_readme"><img src="https://img.shields.io/badge/Documentation-%23000000.svg?style=for-the-badge&logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIiBzdHJva2U9IiNmZmZmZmYiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIiBjbGFzcz0ibHVjaWRlIGx1Y2lkZS1ib29rLW9wZW4iPjxwYXRoIGQ9Ik0xMiA3djE0Ii8+PHBhdGggZD0iTTMgMThhMSAxIDAgMCAxLTEtMVY0YTEgMSAwIDAgMSAxLTFoNWE0IDQgMCAwIDEgNCA0IDQgNCAwIDAgMSA0LTRoNWExIDEgMCAwIDEgMSAxdjEzYTEgMSAwIDAgMS0xIDFoLTZhMyAzIDAgMCAwLTMgMyAzIDMgMCAwIDAtMy0zeiIvPjwvc3ZnPg==&logoColor=white"></a>
 &nbsp;&nbsp;
 <a href="https://github.com/projectdiscovery/nuclei-templates"><img src="https://img.shields.io/badge/Templates Library-%23000000.svg?style=for-the-badge&logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIiBzdHJva2U9IiNmZmZmZmYiIHN0cm9rZS13aWR0aD0iMS41IiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiIGNsYXNzPSJsdWNpZGUgbHVjaWRlLXNoaWVsZCI+PHBhdGggZD0iTTIwIDEzYzAgNS0zLjUgNy41LTcuNjYgOC45NWExIDEgMCAwIDEtLjY3LS4wMUM3LjUgMjAuNSA0IDE4IDQgMTNWNmExIDEgMCAwIDEgMS0xYzIgMCA0LjUtMS4yIDYuMjQtMi43MmExLjE3IDEuMTcgMCAwIDEgMS41MiAwQzE0LjUxIDMuODEgMTcgNSAxOSA1YTEgMSAwIDAgMSAxIDF6Ii8+PC9zdmc+&logoColor=white"></a>
@@ -109,7 +111,7 @@ Browse the full Nuclei [**`documentation here`**](https://docs.projectdiscovery.
 
 ### Installation
 
-`nuclei` requires **go >= 1.24.1** to install successfully. Run the following command to get the repo:
+`nuclei` requires **go1.22** to install successfully. Run the following command to get the repo:
 
 ```sh
 go install -v github.com/projectdiscovery/nuclei/v3/cmd/nuclei@latest
@@ -161,7 +163,7 @@ TEMPLATES:
    -validate                              validate the passed templates to nuclei
    -nss, -no-strict-syntax                disable strict syntax check on templates
    -td, -template-display                 displays the templates content
-   -tl                                    list all templates matching current filters
+   -tl                                    list all available templates
    -tgl                                   list all available tags
    -sign                                  signs the templates with the private key defined in NUCLEI_SIGNATURE_PRIVATE_KEY env variable
    -code                                  enable loading code protocol-based templates
@@ -284,7 +286,6 @@ RATE-LIMIT:
    -jsc, -js-concurrency int          maximum number of javascript runtimes to be executed in parallel (default 120)
    -pc, -payload-concurrency int      max payload concurrency for each template (default 25)
    -prc, -probe-concurrency int       http probe concurrency with httpx (default 50)
-   -tlc, -template-loading-concurrency int  maximum number of concurrent template loading operations (default 50)
 
 OPTIMIZATIONS:
    -timeout int                     time to wait in seconds before timeout (default 10)
@@ -355,7 +356,6 @@ CLOUD:
 AUTHENTICATION:
    -sf, -secret-file string[]  path to config file containing secrets for nuclei authenticated scan
    -ps, -prefetch-secrets      prefetch secrets from the secrets file
-   # NOTE: Headers in secrets files preserve exact casing (useful for case-sensitive APIs)
 
 
 EXAMPLES:

README_CN.md

@@ -33,7 +33,7 @@
   <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_CN.md">中文</a> •
   <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_KR.md">Korean</a> •
   <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_ID.md">Indonesia</a> •
-  <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_ES.md">Spanish</a> •
+  <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_ES.md">Spanish</a>
   <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_PT-BR.md">Portuguese</a>
 </p>
 
@@ -238,7 +238,6 @@ UNCOVER引擎:
    -c, -concurrency int                  并行执行的最大模板数量（默认：25）
    -hbs, -headless-bulk-size int         每个模板并行运行的无头主机最大数量（默认：10）
    -headc, -headless-concurrency int     并行指定无头主机最大数量（默认：10）
-   -tlc, -template-loading-concurrency int  最大并发模板加载操作数（默认：50）
 
 
 优化：

README_ES.md

@@ -31,7 +31,7 @@
   <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_CN.md">中文</a> •
   <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_KR.md">Korean</a> •
   <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_ID.md">Indonesia</a> •
-  <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_ES.md">Spanish</a> •
+  <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_ES.md">Spanish</a>
   <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_PT-BR.md">Portuguese</a>
 </p>
 
@@ -244,7 +244,6 @@ RATE-LIMIT:
    -headc, -headless-concurrency int  número máximo de plantillas headless a ejecutar en paralelo (por defecto 10)
    -jsc, -js-concurrency int          número máximo de entornos de ejecución de JavaScript a ejecutar en paralelo (por defecto 120)
    -pc, -payload-concurrency int      concurrencia máxima de carga útil para cada plantilla (por defecto 25)
-   -tlc, -template-loading-concurrency int  número máximo de operaciones de carga de plantillas concurrentes (por defecto 50)
 
 OPTIMIZATIONS:
    -timeout int                     tiempo de espera en segundos (por defecto 10)

README_ID.md

@@ -33,7 +33,7 @@
   <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_CN.md">中文</a> •
   <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_KR.md">Korean</a> •
   <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_ID.md">Indonesia</a> •
-  <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_ES.md">Spanish</a> •
+  <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_ES.md">Spanish</a>
   <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_PT-BR.md">Portuguese</a>
 </p>
 
@@ -211,7 +211,6 @@ RATE-LIMIT:
    -c, -concurrency int               maximum number of templates to be executed in parallel (default 25)
    -hbs, -headless-bulk-size int      maximum number of headless hosts to be analyzed in parallel per template (default 10)
    -headc, -headless-concurrency int  maximum number of headless templates to be executed in parallel (default 10)
-   -tlc, -template-loading-concurrency int  maximum number of concurrent template loading operations (default 50)
 
 OPTIMIZATIONS:
    -timeout int                        time to wait in seconds before timeout (default 10)

README_JP.md

@@ -30,7 +30,7 @@
   <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_CN.md">中国語</a> •
   <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_KR.md">韓国語</a> •
   <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_ID.md">インドネシア語</a> •
-  <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_ES.md">スペイン語</a> •
+  <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_ES.md">スペイン語</a>
   <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_PT-BR.md">ポルトガル語</a>
 </p>
 

README_KR.md

@@ -31,7 +31,7 @@
   <a href="https://github.com/projectdiscovery/nuclei/blob/main/README.md">English</a> •
   <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_CN.md">中文</a> •
   <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_KR.md">한국어</a> •
-  <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_ES.md">스페인어</a> •
+  <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_ES.md">스페인어</a>
   <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_PT-BR.md">포르투갈어</a>
 </p>
 
@@ -209,7 +209,6 @@ RATE-LIMIT:
    -c, -concurrency int               병렬로 실행할 최대 템플릿 수 (기본값 25)
    -hbs, -headless-bulk-size int      템플릿당 병렬로 분석할 최대 headless 호스트 수 (기본값 10)
    -headc, -headless-concurrency int  병렬로 실행할 최대 headless 템플릿 수 (기본값 10)
-   -tlc, -template-loading-concurrency int  최대 동시 템플릿 로딩 작업 수 (기본값 50)
 
 OPTIMIZATIONS:
    -timeout int                     타임아웃 전에 기다릴 초 수 (기본값 10)
@@ -342,7 +341,7 @@ Nuclei를 사용하면 자체 검사 모음으로 테스트 접근 방식을 사
 - 몇 분 안에 수천 개의 호스트를 처리할 수 있음.
 - 간단한 YAML DSL로 사용자 지정 테스트 접근 방식을 쉽게 자동화할 수 있음.
 
-버그 바운티 워크플로에 맞는 다른 오픈 소스 프로젝트를 확인할 수 있습니다.: [github.com/projectdiscovery](http://github.com/projectdiscovery), 또한, 우리는 매일 [Chaos에서 DNS 데이터를 갱신해 호스팅합니다](http://chaos.projectdiscovery.io).
+버그 바운티 워크플로에 맞는 다른 오픈 소스 프로젝트를 확인할 수 있습니다.: [github.com/projectdiscovery](http://github.com/projectdiscovery), 또한, 우리는 매일 [Chaos에서 DNS 데이터를 갱신해 호스팅합니다.](http://chaos.projectdiscovery.io).
 
 </td>
 </tr>

README_PT-BR.md

@@ -31,7 +31,7 @@
   <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_CN.md">中文</a> •
   <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_KR.md">Korean</a> •
   <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_ID.md">Indonesia</a> •
-  <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_ES.md">Spanish</a> •
+  <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_ES.md">Spanish</a>
   <a href="https://github.com/projectdiscovery/nuclei/blob/main/README_PT-BR.md">Portuguese</a>
 </p>
 
@@ -244,7 +244,6 @@ RATE-LIMIT:
    -headc, -headless-concurrency int  número máximo de templates headless a serem executados em paralelo (padrão 10)
    -jsc, -js-concurrency int          número máximo de ambientes de execução de JavaScript a serem executados em paralelo (padrão 120)
    -pc, -payload-concurrency int      concorrência máxima de payload para cada template (padrão 25)
-   -tlc, -template-loading-concurrency int  número máximo de operações de carregamento de templates concorrentes (padrão 50)
 
 OPTIMIZATIONS:
    -timeout int                     tempo limite em segundos (padrão 10)

SYNTAX-REFERENCE.md

@@ -3218,7 +3218,7 @@ Inputs contains inputs for the network socket
 <div class="dt">
 
 description: |
-   Port is the port to send network requests to. this acts as default port but is overridden if target/input contains
+   Port is the port to send network requests to. this acts as default port but is overriden if target/input contains
  non-http(s) ports like 80,8080,8081 etc
 
 </div>

cmd/docgen/docgen.go

@@ -19,9 +19,7 @@ func writeToFile(filename string, data []byte) {
 	if err != nil {
 		log.Fatalf("Could not create file %s: %s\n", filename, err)
 	}
-	defer func() {
-		_ = file.Close()
-	}()
+	defer file.Close()
 
 	_, err = file.Write(data)
 	if err != nil {

cmd/functional-test/main.go

@@ -27,7 +27,7 @@ var (
 func main() {
 	flag.Parse()
 
-	debug := os.Getenv("DEBUG") == "true" || os.Getenv("RUNNER_DEBUG") == "1"
+	debug := os.Getenv("DEBUG") == "true"
 
 	if err, errored := runFunctionalTests(debug); err != nil {
 		log.Fatalf("Could not run functional tests: %s\n", err)
@@ -41,9 +41,7 @@ func runFunctionalTests(debug bool) (error, bool) {
 	if err != nil {
 		return errors.Wrap(err, "could not open test cases"), true
 	}
-	defer func() {
-		_ = file.Close()
-	}()
+	defer file.Close()
 
 	errored, failedTestCases := runTestCases(file, debug)
 

cmd/functional-test/run.sh

@@ -1,43 +1,27 @@
 #!/bin/bash
 
-if [ "${RUNNER_OS}" == "Windows" ]; then
-    EXT=".exe"
-elif [ "${RUNNER_OS}" == "macOS" ]; then
-    if [ "${CI}" == "true" ]; then
-        sudo sysctl -w kern.maxfiles{,perproc}=524288
-        sudo launchctl limit maxfiles 65536 524288
-    fi
+# reading os type from arguments
+CURRENT_OS=$1
 
-    ORIGINAL_ULIMIT="$(ulimit -n)"
-    ulimit -n 65536 || true
+if [ "${CURRENT_OS}" == "windows-latest" ];then
+    extension=.exe
 fi
 
-mkdir -p .nuclei-config/nuclei/
-touch .nuclei-config/nuclei/.nuclei-ignore
-
 echo "::group::Building functional-test binary"
-go build -o "functional-test${EXT}"
+go build -o functional-test$extension
 echo "::endgroup::"
 
 echo "::group::Building Nuclei binary from current branch"
-go build -o "nuclei-dev${EXT}" ../nuclei
-echo "::endgroup::"
-
-echo "::group::Building latest release of nuclei"
-go build -o "nuclei${EXT}" -v github.com/projectdiscovery/nuclei/v3/cmd/nuclei
+go build -o nuclei_dev$extension ../nuclei
 echo "::endgroup::"
 
 echo "::group::Installing nuclei templates"
-eval "./nuclei-dev${EXT} -update-templates"
+./nuclei_dev$extension -update-templates
 echo "::endgroup::"
 
-echo "::group::Validating templates"
-eval "./nuclei-dev${EXT} -validate"
+echo "::group::Building latest release of nuclei"
+go build -o nuclei$extension -v github.com/projectdiscovery/nuclei/v3/cmd/nuclei
 echo "::endgroup::"
 
-echo "Starting Nuclei functional test"
-eval "./functional-test${EXT} -main ./nuclei${EXT} -dev ./nuclei-dev${EXT} -testcases testcases.txt"
-
-if [ "${RUNNER_OS}" == "macOS" ]; then
-    ulimit -n "${ORIGINAL_ULIMIT}" || true
-fi
+echo 'Starting Nuclei functional test'
+./functional-test$extension -main ./nuclei$extension -dev ./nuclei_dev$extension -testcases testcases.txt

cmd/functional-test/testcases.txt

@@ -36,24 +36,24 @@
 {{binary}} -tags cve,dos,fuzz
 {{binary}} -tags cve -include-tags dos,fuzz
 {{binary}} -tags cve -exclude-tags cve2020
-{{binary}} -tags cve -exclude-templates http/cves/2020/
-{{binary}} -tags cve -exclude-templates http/cves/2020/CVE-2020-9757.yaml
-{{binary}} -tags cve -exclude-templates http/cves/2020/CVE-2020-9757.yaml -exclude-templates http/cves/2021/
-{{binary}} -t http/cves/
-{{binary}} -t http/cves/ -t http/exposures/
-{{binary}} -t http/cves/ -t http/exposures/ -tags config
-{{binary}} -t http/cves/ -t http/exposures/ -tags config,ssrf
-{{binary}} -t http/cves/ -t http/exposures/ -tags config -severity high,critical
-{{binary}} -t http/cves/ -t http/exposures/ -tags config -severity high,critical -author geeknik,pdteam
-{{binary}} -t http/cves/ -t http/exposures/ -tags config -severity high,critical -author geeknik,pdteam -etags sqli
-{{binary}} -t http/cves/ -t http/exposures/ -tags config -severity high,critical -author geeknik,pdteam -etags sqli -exclude-templates http/cves/2021/
-{{binary}} -t http/cves/ -t http/exposures/ -tags config -severity high,critical -author geeknik,pdteam -etags sqli -exclude-templates http/cves/2017/CVE-2017-7269.yaml
-{{binary}} -t http/cves/ -t http/exposures/ -tags config -severity high,critical -author geeknik,pdteam -etags sqli -include-templates http/cves/2017/CVE-2017-7269.yaml
+{{binary}} -tags cve -exclude-templates cves/2020/
+{{binary}} -tags cve -exclude-templates cves/2020/CVE-2020-9757.yaml
+{{binary}} -tags cve -exclude-templates cves/2020/CVE-2020-9757.yaml -exclude-templates cves/2021/
+{{binary}} -t cves/
+{{binary}} -t cves/ -t exposures/
+{{binary}} -t cves/ -t exposures/ -tags config
+{{binary}} -t cves/ -t exposures/ -tags config,ssrf
+{{binary}} -t cves/ -t exposures/ -tags config -severity high,critical
+{{binary}} -t cves/ -t exposures/ -tags config -severity high,critical -author geeknik,pdteam
+{{binary}} -t cves/ -t exposures/ -tags config -severity high,critical -author geeknik,pdteam -etags sqli
+{{binary}} -t cves/ -t exposures/ -tags config -severity high,critical -author geeknik,pdteam -etags sqli -exclude-templates cves/2021/
+{{binary}} -t cves/ -t exposures/ -tags config -severity high,critical -author geeknik,pdteam -etags sqli -exclude-templates cves/2017/CVE-2017-7269.yaml
+{{binary}} -t cves/ -t exposures/ -tags config -severity high,critical -author geeknik,pdteam -etags sqli -include-templates cves/2017/CVE-2017-7269.yaml
 
 # Advanced Filtering
 {{binary}} -tags cve -author geeknik,pdteam  -tc severity=='high'
 {{binary}} -tc contains(authors,'pdteam')
-{{binary}} -t http/cves/ -t http/exposures/ -tc contains(tags,'cve') -exclude-templates http/cves/2020/CVE-2020-9757.yaml
+{{binary}} -t cves/ -t exposures/ -tc contains(tags,'cve') -exclude-templates cves/2020/CVE-2020-9757.yaml
 {{binary}} -tc protocol=='dns'
 {{binary}} -tc contains(http_method,'GET')
 {{binary}} -tc len(body)>0
@@ -65,7 +65,7 @@
 {{binary}} -w workflows
 {{binary}} -w workflows -author geeknik,pdteam
 {{binary}} -w workflows -severity high,critical
-{{binary}} -w workflows -author geeknik,pdteam -severity high,critical
+{{binary}} -w workflows -author geeknik,pdteam  -severity high,critical
 
 # Input Types
 # http protocol

cmd/generate-checksum/main.go

@@ -23,9 +23,7 @@ func main() {
 	if err != nil {
 		log.Fatalf("Could not create file: %s\n", err)
 	}
-	defer func() {
-		_ = file.Close()
-	}()
+	defer file.Close()
 
 	err = filepath.WalkDir(templatesDirectory, func(path string, d fs.DirEntry, err error) error {
 		if err != nil || d.IsDir() {

cmd/integration-test/code.go

@@ -24,8 +24,6 @@ var codeTestCases = []TestCaseInfo{
 	{Path: "protocols/code/py-interactsh.yaml", TestCase: &codeSnippet{}, DisableOn: isCodeDisabled},
 	{Path: "protocols/code/ps1-snippet.yaml", TestCase: &codeSnippet{}, DisableOn: func() bool { return !osutils.IsWindows() || isCodeDisabled() }},
 	{Path: "protocols/code/pre-condition.yaml", TestCase: &codePreCondition{}, DisableOn: isCodeDisabled},
-	{Path: "protocols/code/sh-virtual.yaml", TestCase: &codeSnippet{}, DisableOn: func() bool { return !osutils.IsLinux() || isCodeDisabled() }},
-	{Path: "protocols/code/py-virtual.yaml", TestCase: &codeSnippet{}, DisableOn: func() bool { return !osutils.IsLinux() || isCodeDisabled() }},
 }
 
 const (

cmd/integration-test/custom-dir.go

@@ -18,9 +18,7 @@ func (h *customConfigDirTest) Execute(filePath string) error {
 	if err != nil {
 		return err
 	}
-	defer func() {
-		_ = os.RemoveAll(customTempDirectory)
-	}()
+	defer os.RemoveAll(customTempDirectory)
 	results, err := testutils.RunNucleiBareArgsAndGetResults(debug, []string{"NUCLEI_CONFIG_DIR=" + customTempDirectory}, "-t", filePath, "-u", "8x8exch02.8x8.com")
 	if err != nil {
 		return err

cmd/integration-test/dsl.go

@@ -21,7 +21,7 @@ type dslVersionWarning struct{}
 func (d *dslVersionWarning) Execute(templatePath string) error {
 	router := httprouter.New()
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		_, _ = fmt.Fprintf(w, "DSL version parsing warning test")
+		fmt.Fprintf(w, "DSL version parsing warning test")
 	})
 	ts := httptest.NewServer(router)
 	defer ts.Close()
@@ -37,7 +37,7 @@ type dslShowVersionWarning struct{}
 func (d *dslShowVersionWarning) Execute(templatePath string) error {
 	router := httprouter.New()
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		_, _ = fmt.Fprintf(w, "DSL version parsing warning test")
+		fmt.Fprintf(w, "DSL version parsing warning test")
 	})
 	ts := httptest.NewServer(router)
 	defer ts.Close()

cmd/integration-test/exporters.go

@@ -1,104 +0,0 @@
-package main
-
-import (
-	"context"
-	"fmt"
-	"log"
-	"time"
-
-	"github.com/projectdiscovery/nuclei/v3/pkg/output"
-	"github.com/projectdiscovery/nuclei/v3/pkg/reporting/exporters/mongo"
-	"github.com/testcontainers/testcontainers-go"
-	mongocontainer "github.com/testcontainers/testcontainers-go/modules/mongodb"
-
-	osutil "github.com/projectdiscovery/utils/os"
-	mongoclient "go.mongodb.org/mongo-driver/mongo"
-	mongooptions "go.mongodb.org/mongo-driver/mongo/options"
-)
-
-const (
-	dbName  = "test"
-	dbImage = "mongo:8"
-)
-
-var exportersTestCases = []TestCaseInfo{
-	{Path: "exporters/mongo", TestCase: &mongoExporter{}, DisableOn: func() bool {
-		return osutil.IsWindows() || osutil.IsOSX()
-	}},
-}
-
-type mongoExporter struct{}
-
-func (m *mongoExporter) Execute(filepath string) error {
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Minute)
-	defer cancel()
-
-	// Start a MongoDB container
-	mongodbContainer, err := mongocontainer.Run(ctx, dbImage)
-	defer func() {
-		if err := testcontainers.TerminateContainer(mongodbContainer); err != nil {
-			log.Printf("failed to terminate container: %s", err)
-		}
-	}()
-	if err != nil {
-		return fmt.Errorf("failed to start container: %w", err)
-	}
-
-	connString, err := mongodbContainer.ConnectionString(ctx)
-	if err != nil {
-		return fmt.Errorf("failed to get connection string for MongoDB container: %s", err)
-	}
-	connString = connString + dbName
-
-	// Create a MongoDB exporter and write a test result to the database
-	opts := mongo.Options{
-		ConnectionString: connString,
-		CollectionName:   "test",
-		BatchSize:        1, // Ensure we write the result immediately
-	}
-
-	exporter, err := mongo.New(&opts)
-	if err != nil {
-		return fmt.Errorf("failed to create MongoDB exporter: %s", err)
-	}
-	defer func() {
-		if err := exporter.Close(); err != nil {
-			fmt.Printf("failed to close exporter: %s\n", err)
-		}
-	}()
-
-	res := &output.ResultEvent{
-		Request:  "test request",
-		Response: "test response",
-	}
-
-	err = exporter.Export(res)
-	if err != nil {
-		return fmt.Errorf("failed to export result event to MongoDB: %s", err)
-	}
-
-	// Verify that the result was written to the database
-	clientOptions := mongooptions.Client().ApplyURI(connString)
-	client, err := mongoclient.Connect(ctx, clientOptions)
-	if err != nil {
-		return fmt.Errorf("error creating MongoDB client: %s", err)
-	}
-	defer func() {
-		if err := client.Disconnect(ctx); err != nil {
-			fmt.Printf("failed to disconnect from MongoDB: %s\n", err)
-		}
-	}()
-
-	collection := client.Database(dbName).Collection(opts.CollectionName)
-	var actualRes output.ResultEvent
-	err = collection.FindOne(ctx, map[string]interface{}{"request": res.Request}).Decode(&actualRes)
-	if err != nil {
-		return fmt.Errorf("failed to find document in MongoDB: %s", err)
-	}
-
-	if actualRes.Request != res.Request || actualRes.Response != res.Response {
-		return fmt.Errorf("exported result does not match expected result: got %v, want %v", actualRes, res)
-	}
-
-	return nil
-}

cmd/integration-test/flow.go

@@ -49,7 +49,7 @@ func (t *iterateValuesFlow) Execute(filePath string) error {
 	}
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 		w.WriteHeader(http.StatusOK)
-		_, _ = fmt.Fprint(w, testemails)
+		_, _ = w.Write([]byte(fmt.Sprint(testemails)))
 	})
 	router.GET("/user/"+getBase64(testemails[0]), func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 		w.WriteHeader(http.StatusOK)

cmd/integration-test/fuzz.go

@@ -55,7 +55,7 @@ func (h *httpFuzzQuery) Execute(filePath string) error {
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 		w.Header().Set("Content-Type", "text/html")
 		value := r.URL.Query().Get("id")
-		_, _ = fmt.Fprintf(w, "This is test matcher text: %v", value)
+		fmt.Fprintf(w, "This is test matcher text: %v", value)
 	})
 	ts := httptest.NewTLSServer(router)
 	defer ts.Close()
@@ -75,7 +75,7 @@ func (h *fuzzModeOverride) Execute(filePath string) error {
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 		w.Header().Set("Content-Type", "text/html")
 		value := r.URL.Query().Get("id")
-		_, _ = fmt.Fprintf(w, "This is test matcher text: %v", value)
+		fmt.Fprintf(w, "This is test matcher text: %v", value)
 	})
 	ts := httptest.NewTLSServer(router)
 	defer ts.Close()
@@ -120,7 +120,7 @@ func (h *fuzzTypeOverride) Execute(filePath string) error {
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 		w.Header().Set("Content-Type", "text/html")
 		value := r.URL.Query().Get("id")
-		_, _ = fmt.Fprintf(w, "This is test matcher text: %v", value)
+		fmt.Fprintf(w, "This is test matcher text: %v", value)
 	})
 	ts := httptest.NewTLSServer(router)
 	defer ts.Close()
@@ -164,7 +164,7 @@ func (h *HeadlessFuzzingQuery) Execute(filePath string) error {
 	router := httprouter.New()
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 		resp := fmt.Sprintf("<html><body>%s</body></html>", r.URL.Query().Get("url"))
-		_, _ = fmt.Fprint(w, resp)
+		fmt.Fprint(w, resp)
 	})
 	ts := httptest.NewTLSServer(router)
 	defer ts.Close()
@@ -190,7 +190,7 @@ func (h *fuzzMultipleMode) Execute(filePath string) error {
 		}
 		w.Header().Set("Content-Type", "text/html")
 		resp := fmt.Sprintf("<html><body><h1>This is multi-mode fuzzing test: %v <h1></body></html>", xClientId)
-		_, _ = fmt.Fprint(w, resp)
+		fmt.Fprint(w, resp)
 	})
 	ts := httptest.NewTLSServer(router)
 	defer ts.Close()

cmd/integration-test/generic.go

@@ -82,15 +82,14 @@ func (h *clientCertificate) Execute(filePath string) error {
 			return
 		}
 
-		_, _ = fmt.Fprintf(w, "Hello, %s!\n", r.TLS.PeerCertificates[0].Subject)
+		fmt.Fprintf(w, "Hello, %s!\n", r.TLS.PeerCertificates[0].Subject)
 	})
 
 	_ = os.WriteFile("server.crt", []byte(serverCRT), permissionutil.ConfigFilePermission)
 	_ = os.WriteFile("server.key", []byte(serverKey), permissionutil.ConfigFilePermission)
-	defer func() {
-		_ = os.Remove("server.crt")
-		_ = os.Remove("server.key")
-	}()
+	defer os.Remove("server.crt")
+	defer os.Remove("server.key")
+
 	serverCert, _ := tls.LoadX509KeyPair("server.crt", "server.key")
 
 	certPool := x509.NewCertPool()

cmd/integration-test/headless.go

@@ -178,9 +178,7 @@ func (h *headlessFileUpload) Execute(filePath string) error {
 			return
 		}
 
-		defer func() {
-			_ = file.Close()
-		}()
+		defer file.Close()
 
 		content, err := io.ReadAll(file)
 		if err != nil {
@@ -237,9 +235,7 @@ func (h *headlessFileUploadNegative) Execute(filePath string) error {
 			return
 		}
 
-		defer func() {
-			_ = file.Close()
-		}()
+		defer file.Close()
 
 		content, err := io.ReadAll(file)
 		if err != nil {

cmd/integration-test/http.go

@@ -19,7 +19,7 @@ import (
 	"github.com/projectdiscovery/nuclei/v3/pkg/testutils"
 	"github.com/projectdiscovery/nuclei/v3/pkg/utils/json"
 	"github.com/projectdiscovery/retryablehttp-go"
-	"github.com/projectdiscovery/utils/errkit"
+	errorutil "github.com/projectdiscovery/utils/errors"
 	logutil "github.com/projectdiscovery/utils/log"
 	sliceutil "github.com/projectdiscovery/utils/slice"
 	stringsutil "github.com/projectdiscovery/utils/strings"
@@ -108,7 +108,7 @@ func (h *httpMatcherExtractorDynamicExtractor) Execute(filePath string) error {
     <a href="/domains">Domains</a>
 </body>
 </html>`
-		_, _ = fmt.Fprint(w, html)
+		fmt.Fprint(w, html)
 	})
 	router.GET("/domains", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 		html := `<!DOCTYPE html>
@@ -121,7 +121,7 @@ func (h *httpMatcherExtractorDynamicExtractor) Execute(filePath string) error {
 		</body>
 		</html>
 		`
-		_, _ = fmt.Fprint(w, html)
+		fmt.Fprint(w, html)
 	})
 	ts := httptest.NewServer(router)
 	defer ts.Close()
@@ -143,7 +143,7 @@ func (h *httpInteractshRequest) Execute(filePath string) error {
 		value := r.Header.Get("url")
 		if value != "" {
 			if resp, _ := retryablehttp.DefaultClient().Get(value); resp != nil {
-				_ = resp.Body.Close()
+				resp.Body.Close()
 			}
 		}
 	})
@@ -196,7 +196,7 @@ func (d *httpDefaultMatcherCondition) Execute(filePath string) error {
 		return err
 	}
 	if routerErr != nil {
-		return errkit.Wrap(routerErr, "failed to send http request to interactsh server")
+		return errorutil.NewWithErr(routerErr).Msgf("failed to send http request to interactsh server")
 	}
 	if err := expectResultsCount(results, 1); err != nil {
 		return err
@@ -213,7 +213,7 @@ func (h *httpInteractshStopAtFirstMatchRequest) Execute(filePath string) error {
 		value := r.Header.Get("url")
 		if value != "" {
 			if resp, _ := retryablehttp.DefaultClient().Get(value); resp != nil {
-				_ = resp.Body.Close()
+				resp.Body.Close()
 			}
 		}
 	})
@@ -235,7 +235,7 @@ func (h *httpGetHeaders) Execute(filePath string) error {
 	router := httprouter.New()
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 		if strings.EqualFold(r.Header.Get("test"), "nuclei") {
-			_, _ = fmt.Fprintf(w, "This is test headers matcher text")
+			fmt.Fprintf(w, "This is test headers matcher text")
 		}
 	})
 	ts := httptest.NewServer(router)
@@ -256,7 +256,7 @@ func (h *httpGetQueryString) Execute(filePath string) error {
 	router := httprouter.New()
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 		if strings.EqualFold(r.URL.Query().Get("test"), "nuclei") {
-			_, _ = fmt.Fprintf(w, "This is test querystring matcher text")
+			fmt.Fprintf(w, "This is test querystring matcher text")
 		}
 	})
 	ts := httptest.NewServer(router)
@@ -279,7 +279,7 @@ func (h *httpGetRedirects) Execute(filePath string) error {
 		http.Redirect(w, r, "/redirected", http.StatusFound)
 	})
 	router.GET("/redirected", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		_, _ = fmt.Fprintf(w, "This is test redirects matcher text")
+		fmt.Fprintf(w, "This is test redirects matcher text")
 	})
 	ts := httptest.NewServer(router)
 	defer ts.Close()
@@ -329,7 +329,7 @@ func (h *httpDisableRedirects) Execute(filePath string) error {
 		http.Redirect(w, r, "/redirected", http.StatusMovedPermanently)
 	})
 	router.GET("/redirected", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		_, _ = fmt.Fprintf(w, "This is test redirects matcher text")
+		fmt.Fprintf(w, "This is test redirects matcher text")
 	})
 	ts := httptest.NewServer(router)
 	defer ts.Close()
@@ -348,7 +348,7 @@ type httpGet struct{}
 func (h *httpGet) Execute(filePath string) error {
 	router := httprouter.New()
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		_, _ = fmt.Fprintf(w, "This is test matcher text")
+		fmt.Fprintf(w, "This is test matcher text")
 	})
 	ts := httptest.NewServer(router)
 	defer ts.Close()
@@ -367,7 +367,7 @@ type httpDSLVariable struct{}
 func (h *httpDSLVariable) Execute(filePath string) error {
 	router := httprouter.New()
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		_, _ = fmt.Fprintf(w, "This is test matcher text")
+		fmt.Fprintf(w, "This is test matcher text")
 	})
 	ts := httptest.NewServer(router)
 	defer ts.Close()
@@ -450,7 +450,7 @@ func (h *httpPostBody) Execute(filePath string) error {
 			return
 		}
 		if strings.EqualFold(r.Form.Get("username"), "test") && strings.EqualFold(r.Form.Get("password"), "nuclei") {
-			_, _ = fmt.Fprintf(w, "This is test post-body matcher text")
+			fmt.Fprintf(w, "This is test post-body matcher text")
 		}
 	})
 	ts := httptest.NewServer(router)
@@ -485,7 +485,7 @@ func (h *httpPostJSONBody) Execute(filePath string) error {
 			return
 		}
 		if strings.EqualFold(obj.Username, "test") && strings.EqualFold(obj.Password, "nuclei") {
-			_, _ = fmt.Fprintf(w, "This is test post-json-body matcher text")
+			fmt.Fprintf(w, "This is test post-json-body matcher text")
 		}
 	})
 	ts := httptest.NewServer(router)
@@ -525,7 +525,7 @@ func (h *httpPostMultipartBody) Execute(filePath string) error {
 			return
 		}
 		if strings.EqualFold(password[0], "nuclei") && strings.EqualFold(file[0].Filename, "username") {
-			_, _ = fmt.Fprintf(w, "This is test post-multipart matcher text")
+			fmt.Fprintf(w, "This is test post-multipart matcher text")
 		}
 	})
 	ts := httptest.NewServer(router)
@@ -555,12 +555,12 @@ func (h *httpRawDynamicExtractor) Execute(filePath string) error {
 			return
 		}
 		if strings.EqualFold(r.Form.Get("testing"), "parameter") {
-			_, _ = fmt.Fprintf(w, "Token: 'nuclei'")
+			fmt.Fprintf(w, "Token: 'nuclei'")
 		}
 	})
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 		if strings.EqualFold(r.URL.Query().Get("username"), "nuclei") {
-			_, _ = fmt.Fprintf(w, "Test is test-dynamic-extractor-raw matcher text")
+			fmt.Fprintf(w, "Test is test-dynamic-extractor-raw matcher text")
 		}
 	})
 	ts := httptest.NewServer(router)
@@ -584,7 +584,7 @@ func (h *httpRawGetQuery) Execute(filePath string) error {
 	router := httprouter.New()
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 		if strings.EqualFold(r.URL.Query().Get("test"), "nuclei") {
-			_, _ = fmt.Fprintf(w, "Test is test raw-get-query-matcher text")
+			fmt.Fprintf(w, "Test is test raw-get-query-matcher text")
 		}
 	})
 	ts := httptest.NewServer(router)
@@ -604,7 +604,7 @@ type httpRawGet struct{}
 func (h *httpRawGet) Execute(filePath string) error {
 	router := httprouter.New()
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		_, _ = fmt.Fprintf(w, "Test is test raw-get-matcher text")
+		fmt.Fprintf(w, "Test is test raw-get-matcher text")
 	})
 	ts := httptest.NewServer(router)
 	defer ts.Close()
@@ -628,12 +628,12 @@ func (h *httpRawWithParams) Execute(filePath string) error {
 		// we intentionally use params["test"] instead of params.Get("test") to test the case where
 		// there are multiple parameters with the same name
 		if !reflect.DeepEqual(params["key1"], []string{"value1"}) {
-			errx = errkit.Append(errx, errkit.New("key1 not found in params", "expected", []string{"value1"}, "got", params["key1"]))
+			errx = errorutil.WrapfWithNil(errx, "expected %v, got %v", []string{"value1"}, params["key1"])
 		}
 		if !reflect.DeepEqual(params["key2"], []string{"value2"}) {
-			errx = errkit.Append(errx, errkit.New("key2 not found in params", "expected", []string{"value2"}, "got", params["key2"]))
+			errx = errorutil.WrapfWithNil(errx, "expected %v, got %v", []string{"value2"}, params["key2"])
 		}
-		_, _ = fmt.Fprintf(w, "Test is test raw-params-matcher text")
+		fmt.Fprintf(w, "Test is test raw-params-matcher text")
 	})
 	ts := httptest.NewServer(router)
 	defer ts.Close()
@@ -685,11 +685,11 @@ func (h *httpRawPayload) Execute(filePath string) error {
 			routerErr = err
 			return
 		}
-		if !strings.EqualFold(r.Header.Get("another_header"), "bnVjbGVp") && !strings.EqualFold(r.Header.Get("another_header"), "Z3Vlc3Q=") {
+		if !(strings.EqualFold(r.Header.Get("another_header"), "bnVjbGVp") || strings.EqualFold(r.Header.Get("another_header"), "Z3Vlc3Q=")) {
 			return
 		}
 		if strings.EqualFold(r.Form.Get("username"), "test") && (strings.EqualFold(r.Form.Get("password"), "nuclei") || strings.EqualFold(r.Form.Get("password"), "guest")) {
-			_, _ = fmt.Fprintf(w, "Test is raw-payload matcher text")
+			fmt.Fprintf(w, "Test is raw-payload matcher text")
 		}
 	})
 	ts := httptest.NewServer(router)
@@ -719,7 +719,7 @@ func (h *httpRawPostBody) Execute(filePath string) error {
 			return
 		}
 		if strings.EqualFold(r.Form.Get("username"), "test") && strings.EqualFold(r.Form.Get("password"), "nuclei") {
-			_, _ = fmt.Fprintf(w, "Test is test raw-post-body-matcher text")
+			fmt.Fprintf(w, "Test is test raw-post-body-matcher text")
 		}
 	})
 	ts := httptest.NewServer(router)
@@ -829,7 +829,10 @@ func (h *httpPaths) Execute(filepath string) error {
 	}
 
 	if len(expected) > len(actual) {
-		actualValuesIndex := max(len(actual)-1, 0)
+		actualValuesIndex := len(actual) - 1
+		if actualValuesIndex < 0 {
+			actualValuesIndex = 0
+		}
 		return fmt.Errorf("missing values : %v", expected[actualValuesIndex:])
 	} else if len(expected) < len(actual) {
 		return fmt.Errorf("unexpected values : %v", actual[len(expected)-1:])
@@ -869,7 +872,7 @@ func (h *httpRawCookieReuse) Execute(filePath string) error {
 		}
 
 		if strings.EqualFold(cookie.Value, "test") {
-			_, _ = fmt.Fprintf(w, "Test is test-cookie-reuse matcher text")
+			fmt.Fprintf(w, "Test is test-cookie-reuse matcher text")
 		}
 	})
 	ts := httptest.NewServer(router)
@@ -947,9 +950,7 @@ func (h *httpRequestSelfContained) Execute(filePath string) error {
 	go func() {
 		_ = server.ListenAndServe()
 	}()
-	defer func() {
-		_ = server.Close()
-	}()
+	defer server.Close()
 
 	results, err := testutils.RunNucleiTemplateAndGetResults(filePath, "", debug, "-esc")
 	if err != nil {
@@ -971,10 +972,10 @@ func (h *httpRequestSelfContainedWithParams) Execute(filePath string) error {
 		// we intentionally use params["test"] instead of params.Get("test") to test the case where
 		// there are multiple parameters with the same name
 		if !reflect.DeepEqual(params["something"], []string{"here"}) {
-			errx = errkit.Append(errx, errkit.New("something not found in params", "expected", []string{"here"}, "got", params["something"]))
+			errx = errorutil.WrapfWithNil(errx, "expected %v, got %v", []string{"here"}, params["something"])
 		}
 		if !reflect.DeepEqual(params["key"], []string{"value"}) {
-			errx = errkit.Append(errx, errkit.New("key not found in params", "expected", []string{"value"}, "got", params["key"]))
+			errx = errorutil.WrapfWithNil(errx, "expected %v, got %v", []string{"value"}, params["key"])
 		}
 		_, _ = w.Write([]byte("This is self-contained response"))
 	})
@@ -985,9 +986,7 @@ func (h *httpRequestSelfContainedWithParams) Execute(filePath string) error {
 	go func() {
 		_ = server.ListenAndServe()
 	}()
-	defer func() {
-		_ = server.Close()
-	}()
+	defer server.Close()
 
 	results, err := testutils.RunNucleiTemplateAndGetResults(filePath, "", debug, "-esc")
 	if err != nil {
@@ -1020,21 +1019,17 @@ func (h *httpRequestSelfContainedFileInput) Execute(filePath string) error {
 	go func() {
 		_ = server.ListenAndServe()
 	}()
-	defer func() {
-		_ = server.Close()
-	}()
+	defer server.Close()
 
 	// create temp file
 	FileLoc, err := os.CreateTemp("", "self-contained-payload-*.txt")
 	if err != nil {
-		return errkit.Wrap(err, "failed to create temp file")
+		return errorutil.NewWithErr(err).Msgf("failed to create temp file")
 	}
 	if _, err := FileLoc.Write([]byte("one\ntwo\n")); err != nil {
-		return errkit.Wrap(err, "failed to write payload to temp file")
+		return errorutil.NewWithErr(err).Msgf("failed to write payload to temp file")
 	}
-	defer func() {
-		_ = FileLoc.Close()
-	}()
+	defer FileLoc.Close()
 
 	results, err := testutils.RunNucleiTemplateAndGetResults(filePath, "", debug, "-V", "test="+FileLoc.Name(), "-esc")
 	if err != nil {
@@ -1046,7 +1041,7 @@ func (h *httpRequestSelfContainedFileInput) Execute(filePath string) error {
 	}
 
 	if !sliceutil.ElementsMatch(gotReqToEndpoints, []string{"/one", "/two", "/one", "/two"}) {
-		return errkit.New("expected requests to be sent to `/one` and `/two` endpoints but were sent to `%v`", gotReqToEndpoints, "filePath", filePath)
+		return errorutil.NewWithTag(filePath, "expected requests to be sent to `/one` and `/two` endpoints but were sent to `%v`", gotReqToEndpoints)
 	}
 	return nil
 }
@@ -1057,7 +1052,7 @@ type httpGetCaseInsensitive struct{}
 func (h *httpGetCaseInsensitive) Execute(filePath string) error {
 	router := httprouter.New()
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		_, _ = fmt.Fprintf(w, "THIS IS TEST MATCHER TEXT")
+		fmt.Fprintf(w, "THIS IS TEST MATCHER TEXT")
 	})
 	ts := httptest.NewServer(router)
 	defer ts.Close()
@@ -1076,7 +1071,7 @@ type httpGetCaseInsensitiveCluster struct{}
 func (h *httpGetCaseInsensitiveCluster) Execute(filesPath string) error {
 	router := httprouter.New()
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		_, _ = fmt.Fprintf(w, "This is test matcher text")
+		fmt.Fprintf(w, "This is test matcher text")
 	})
 	ts := httptest.NewServer(router)
 	defer ts.Close()
@@ -1159,7 +1154,7 @@ type httpStopAtFirstMatch struct{}
 func (h *httpStopAtFirstMatch) Execute(filePath string) error {
 	router := httprouter.New()
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		_, _ = fmt.Fprintf(w, "This is test")
+		fmt.Fprintf(w, "This is test")
 	})
 	ts := httptest.NewServer(router)
 	defer ts.Close()
@@ -1178,7 +1173,7 @@ type httpStopAtFirstMatchWithExtractors struct{}
 func (h *httpStopAtFirstMatchWithExtractors) Execute(filePath string) error {
 	router := httprouter.New()
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		_, _ = fmt.Fprintf(w, "This is test")
+		fmt.Fprintf(w, "This is test")
 	})
 	ts := httptest.NewServer(router)
 	defer ts.Close()
@@ -1197,7 +1192,7 @@ type httpVariables struct{}
 func (h *httpVariables) Execute(filePath string) error {
 	router := httprouter.New()
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		_, _ = fmt.Fprintf(w, "%s\n%s\n%s", r.Header.Get("Test"), r.Header.Get("Another"), r.Header.Get("Email"))
+		fmt.Fprintf(w, "%s\n%s\n%s", r.Header.Get("Test"), r.Header.Get("Another"), r.Header.Get("Email"))
 	})
 	ts := httptest.NewServer(router)
 	defer ts.Close()
@@ -1299,7 +1294,7 @@ func (h *httpRedirectMatchURL) Execute(filePath string) error {
 		_, _ = w.Write([]byte("This is test redirects matcher text"))
 	})
 	router.GET("/redirected", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		_, _ = fmt.Fprintf(w, "This is test redirects matcher text")
+		fmt.Fprintf(w, "This is test redirects matcher text")
 	})
 	ts := httptest.NewServer(router)
 	defer ts.Close()
@@ -1347,7 +1342,7 @@ func (h *annotationTimeout) Execute(filePath string) error {
 	router := httprouter.New()
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 		time.Sleep(4 * time.Second)
-		_, _ = fmt.Fprintf(w, "This is test matcher text")
+		fmt.Fprintf(w, "This is test matcher text")
 	})
 	ts := httptest.NewTLSServer(router)
 	defer ts.Close()
@@ -1367,7 +1362,7 @@ func (h *customAttackType) Execute(filePath string) error {
 	got := []string{}
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 		got = append(got, r.URL.RawQuery)
-		_, _ = fmt.Fprintf(w, "This is test custom payload")
+		fmt.Fprintf(w, "This is test custom payload")
 	})
 	ts := httptest.NewTLSServer(router)
 	defer ts.Close()
@@ -1415,7 +1410,7 @@ func (h *httpCLBodyWithoutHeader) Execute(filePath string) error {
 	router := httprouter.New()
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 		w.Header()["Content-Length"] = []string{"-1"}
-		_, _ = fmt.Fprintf(w, "this is a test")
+		fmt.Fprintf(w, "this is a test")
 	})
 	ts := httptest.NewTLSServer(router)
 	defer ts.Close()
@@ -1435,7 +1430,7 @@ func (h *httpCLBodyWithHeader) Execute(filePath string) error {
 	router := httprouter.New()
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 		w.Header()["Content-Length"] = []string{"50000"}
-		_, _ = fmt.Fprintf(w, "this is a test")
+		fmt.Fprintf(w, "this is a test")
 	})
 	ts := httptest.NewTLSServer(router)
 	defer ts.Close()
@@ -1454,7 +1449,7 @@ type ConstantWithCliVar struct{}
 func (h *ConstantWithCliVar) Execute(filePath string) error {
 	router := httprouter.New()
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		_, _ = fmt.Fprint(w, r.URL.Query().Get("p"))
+		fmt.Fprint(w, r.URL.Query().Get("p"))
 	})
 	ts := httptest.NewTLSServer(router)
 	defer ts.Close()
@@ -1491,10 +1486,10 @@ type httpDisablePathAutomerge struct{}
 func (h *httpDisablePathAutomerge) Execute(filePath string) error {
 	router := httprouter.New()
 	router.GET("/api/v1/test", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		_, _ = fmt.Fprint(w, r.URL.Query().Get("id"))
+		fmt.Fprint(w, r.URL.Query().Get("id"))
 	})
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		_, _ = fmt.Fprint(w, "empty path in raw request")
+		fmt.Fprint(w, "empty path in raw request")
 	})
 
 	ts := httptest.NewServer(router)
@@ -1528,10 +1523,10 @@ func (h *httpPreprocessor) Execute(filePath string) error {
 		value := r.URL.RequestURI()
 		if re.MatchString(value) {
 			w.WriteHeader(http.StatusOK)
-			_, _ = fmt.Fprint(w, "ok")
+			fmt.Fprint(w, "ok")
 		} else {
 			w.WriteHeader(http.StatusBadRequest)
-			_, _ = fmt.Fprint(w, "not ok")
+			fmt.Fprint(w, "not ok")
 		}
 	})
 	ts := httptest.NewServer(router)
@@ -1552,11 +1547,11 @@ func (h *httpMultiRequest) Execute(filePath string) error {
 	router := httprouter.New()
 	router.GET("/ping", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 		w.WriteHeader(http.StatusOK)
-		_, _ = fmt.Fprint(w, "ping")
+		fmt.Fprint(w, "ping")
 	})
 	router.GET("/pong", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 		w.WriteHeader(http.StatusOK)
-		_, _ = fmt.Fprint(w, "pong")
+		fmt.Fprint(w, "pong")
 	})
 	ts := httptest.NewServer(router)
 	defer ts.Close()

cmd/integration-test/integration-test.go

@@ -4,7 +4,6 @@ import (
 	"flag"
 	"fmt"
 	"os"
-	"regexp"
 	"runtime"
 	"strings"
 
@@ -46,7 +45,6 @@ var (
 		"library":         libraryTestcases,
 		"templatesPath":   templatesPathTestCases,
 		"templatesDir":    templatesDirTestCases,
-		"env_vars":        templatesDirEnvTestCases,
 		"file":            fileTestcases,
 		"offlineHttp":     offlineHttpTestcases,
 		"customConfigDir": customConfigDirTestCases,
@@ -58,7 +56,6 @@ var (
 		"flow":            flowTestcases,
 		"javascript":      jsTestcases,
 		"matcher-status":  matcherStatusTestcases,
-		"exporters":       exportersTestCases,
 	}
 	// flakyTests are run with a retry count of 3
 	flakyTests = map[string]bool{
@@ -92,9 +89,7 @@ func main() {
 	// start fuzz playground server
 	defer fuzzplayground.Cleanup()
 	server := fuzzplayground.GetPlaygroundServer()
-	defer func() {
-		_ = server.Close()
-	}()
+	defer server.Close()
 	go func() {
 		if err := server.Start("localhost:8082"); err != nil {
 			if !strings.Contains(err.Error(), "Server closed") {
@@ -213,7 +208,7 @@ func execute(testCase testutils.TestCase, templatePath string) (string, error) {
 }
 
 func expectResultsCount(results []string, expectedNumbers ...int) error {
-	results = filterLines(results)
+	results = filterHeadlessLogs(results)
 	match := sliceutil.Contains(expectedNumbers, len(results))
 	if !match {
 		return fmt.Errorf("incorrect number of results: %d (actual) vs %v (expected) \nResults:\n\t%s\n", len(results), expectedNumbers, strings.Join(results, "\n\t")) // nolint:all
@@ -227,13 +222,6 @@ func normalizeSplit(str string) []string {
 	})
 }
 
-// filterLines applies all filtering functions to the results
-func filterLines(results []string) []string {
-	results = filterHeadlessLogs(results)
-	results = filterUnsignedTemplatesWarnings(results)
-	return results
-}
-
 // if chromium is not installed go-rod installs it in .cache directory
 // this function filters out the logs from download and installation
 func filterHeadlessLogs(results []string) []string {
@@ -247,16 +235,3 @@ func filterHeadlessLogs(results []string) []string {
 	}
 	return filtered
 }
-
-// filterUnsignedTemplatesWarnings filters out warning messages about unsigned templates
-func filterUnsignedTemplatesWarnings(results []string) []string {
-	filtered := []string{}
-	unsignedTemplatesRegex := regexp.MustCompile(`Loading \d+ unsigned templates for scan\. Use with caution\.`)
-	for _, result := range results {
-		if unsignedTemplatesRegex.MatchString(result) {
-			continue
-		}
-		filtered = append(filtered, result)
-	}
-	return filtered
-}

cmd/integration-test/javascript.go

@@ -15,17 +15,13 @@ var jsTestcases = []TestCaseInfo{
 	{Path: "protocols/javascript/ssh-server-fingerprint.yaml", TestCase: &javascriptSSHServerFingerprint{}, DisableOn: func() bool { return osutils.IsWindows() || osutils.IsOSX() }},
 	{Path: "protocols/javascript/net-multi-step.yaml", TestCase: &networkMultiStep{}},
 	{Path: "protocols/javascript/net-https.yaml", TestCase: &javascriptNetHttps{}},
-	{Path: "protocols/javascript/oracle-auth-test.yaml", TestCase: &javascriptOracleAuthTest{}, DisableOn: func() bool { return osutils.IsWindows() || osutils.IsOSX() }},
-	{Path: "protocols/javascript/vnc-pass-brute.yaml", TestCase: &javascriptVncPassBrute{}},
 }
 
 var (
-	redisResource  *dockertest.Resource
-	sshResource    *dockertest.Resource
-	oracleResource *dockertest.Resource
-	vncResource    *dockertest.Resource
-	pool           *dockertest.Pool
-	defaultRetry   = 3
+	redisResource *dockertest.Resource
+	sshResource   *dockertest.Resource
+	pool          *dockertest.Pool
+	defaultRetry  = 3
 )
 
 type javascriptNetHttps struct{}
@@ -102,71 +98,6 @@ func (j *javascriptSSHServerFingerprint) Execute(filePath string) error {
 	return multierr.Combine(errs...)
 }
 
-type javascriptOracleAuthTest struct{}
-
-func (j *javascriptOracleAuthTest) Execute(filePath string) error {
-	if oracleResource == nil || pool == nil {
-		// skip test as oracle is not running
-		return nil
-	}
-	tempPort := oracleResource.GetPort("1521/tcp")
-	finalURL := "localhost:" + tempPort
-	defer purge(oracleResource)
-
-	errs := []error{}
-	for i := 0; i < defaultRetry; i++ {
-		results := []string{}
-		var err error
-		_ = pool.Retry(func() error {
-			//let ssh server start
-			time.Sleep(3 * time.Second)
-			results, err = testutils.RunNucleiTemplateAndGetResults(filePath, finalURL, debug)
-			return nil
-		})
-		if err != nil {
-			return err
-		}
-		if err := expectResultsCount(results, 1); err == nil {
-			return nil
-		} else {
-			errs = append(errs, err)
-		}
-	}
-	return multierr.Combine(errs...)
-}
-
-type javascriptVncPassBrute struct{}
-
-func (j *javascriptVncPassBrute) Execute(filePath string) error {
-	if vncResource == nil || pool == nil {
-		// skip test as vnc is not running
-		return nil
-	}
-	tempPort := vncResource.GetPort("5900/tcp")
-	finalURL := "localhost:" + tempPort
-	defer purge(vncResource)
-	errs := []error{}
-	for i := 0; i < defaultRetry; i++ {
-		results := []string{}
-		var err error
-		_ = pool.Retry(func() error {
-			//let ssh server start
-			time.Sleep(3 * time.Second)
-			results, err = testutils.RunNucleiTemplateAndGetResults(filePath, finalURL, debug)
-			return nil
-		})
-		if err != nil {
-			return err
-		}
-		if err := expectResultsCount(results, 1); err == nil {
-			return nil
-		} else {
-			errs = append(errs, err)
-		}
-	}
-	return multierr.Combine(errs...)
-}
-
 // purge any given resource if it is not nil
 func purge(resource *dockertest.Resource) {
 	if resource != nil && pool != nil {
@@ -232,41 +163,4 @@ func init() {
 	if err := sshResource.Expire(30); err != nil {
 		log.Printf("Could not expire resource: %s", err)
 	}
-
-	// setup a temporary oracle instance
-	oracleResource, err = pool.RunWithOptions(&dockertest.RunOptions{
-		Repository: "gvenzl/oracle-xe",
-		Tag:        "latest",
-		Env: []string{
-			"ORACLE_PASSWORD=mysecret",
-		},
-		Platform: "linux/amd64",
-	})
-	if err != nil {
-		log.Printf("Could not start Oracle resource: %s", err)
-		return
-	}
-
-	// by default expire after 30 sec
-	if err := oracleResource.Expire(30); err != nil {
-		log.Printf("Could not expire Oracle resource: %s", err)
-	}
-
-	// setup a temporary vnc server
-	vncResource, err = pool.RunWithOptions(&dockertest.RunOptions{
-		Repository: "dorowu/ubuntu-desktop-lxde-vnc",
-		Tag:        "latest",
-		Env: []string{
-			"VNC_PASSWORD=mysecret",
-		},
-		Platform: "linux/amd64",
-	})
-	if err != nil {
-		log.Printf("Could not start resource: %s", err)
-		return
-	}
-	// by default expire after 30 sec
-	if err := vncResource.Expire(30); err != nil {
-		log.Printf("Could not expire resource: %s", err)
-	}
 }

cmd/integration-test/library.go

@@ -48,9 +48,9 @@ func (h *goIntegrationTest) Execute(templatePath string) error {
 	router := httprouter.New()
 
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		_, _ = fmt.Fprintf(w, "This is test matcher text")
+		fmt.Fprintf(w, "This is test matcher text")
 		if strings.EqualFold(r.Header.Get("test"), "nuclei") {
-			_, _ = fmt.Fprintf(w, "This is test headers matcher text")
+			fmt.Fprintf(w, "This is test headers matcher text")
 		}
 	})
 	ts := httptest.NewServer(router)
@@ -68,21 +68,17 @@ func executeNucleiAsLibrary(templatePath, templateURL string) ([]string, error)
 	cache := hosterrorscache.New(30, hosterrorscache.DefaultMaxHostsCount, nil)
 	defer cache.Close()
 
-	defaultOpts := types.DefaultOptions()
-	defaultOpts.ExecutionId = "test"
-
 	mockProgress := &testutils.MockProgressClient{}
-	reportingClient, err := reporting.New(&reporting.Options{ExecutionId: defaultOpts.ExecutionId}, "", false)
+	reportingClient, err := reporting.New(&reporting.Options{}, "", false)
 	if err != nil {
 		return nil, err
 	}
 	defer reportingClient.Close()
 
+	defaultOpts := types.DefaultOptions()
 	_ = protocolstate.Init(defaultOpts)
 	_ = protocolinit.Init(defaultOpts)
 
-	defer protocolstate.Close(defaultOpts.ExecutionId)
-
 	defaultOpts.Templates = goflags.StringSlice{templatePath}
 	defaultOpts.ExcludeTags = config.ReadIgnoreFile().Tags
 
@@ -104,7 +100,7 @@ func executeNucleiAsLibrary(templatePath, templateURL string) ([]string, error)
 	ratelimiter := ratelimit.New(context.Background(), 150, time.Second)
 	defer ratelimiter.Stop()
 
-	executerOpts := &protocols.ExecutorOptions{
+	executerOpts := protocols.ExecutorOptions{
 		Output:          outputWriter,
 		Options:         defaultOpts,
 		Progress:        mockProgress,
@@ -120,7 +116,7 @@ func executeNucleiAsLibrary(templatePath, templateURL string) ([]string, error)
 	engine := core.New(defaultOpts)
 	engine.SetExecuterOptions(executerOpts)
 
-	workflowLoader, err := parsers.NewLoader(executerOpts)
+	workflowLoader, err := parsers.NewLoader(&executerOpts)
 	if err != nil {
 		log.Fatalf("Could not create workflow loader: %s\n", err)
 	}
@@ -132,7 +128,7 @@ func executeNucleiAsLibrary(templatePath, templateURL string) ([]string, error)
 	}
 	store.Load()
 
-	_ = engine.Execute(context.Background(), store.Templates(), provider.NewSimpleInputProviderWithUrls(defaultOpts.ExecutionId, templateURL))
+	_ = engine.Execute(context.Background(), store.Templates(), provider.NewSimpleInputProviderWithUrls(templateURL))
 	engine.WorkPool().Wait() // Wait for the scan to finish
 
 	return results, nil

cmd/integration-test/loader.go

@@ -10,7 +10,7 @@ import (
 	"github.com/julienschmidt/httprouter"
 
 	"github.com/projectdiscovery/nuclei/v3/pkg/testutils"
-	"github.com/projectdiscovery/utils/errkit"
+	errorutil "github.com/projectdiscovery/utils/errors"
 	permissionutil "github.com/projectdiscovery/utils/permission"
 )
 
@@ -31,9 +31,9 @@ func (h *remoteTemplateList) Execute(templateList string) error {
 	router := httprouter.New()
 
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		_, _ = fmt.Fprintf(w, "This is test matcher text")
+		fmt.Fprintf(w, "This is test matcher text")
 		if strings.EqualFold(r.Header.Get("test"), "nuclei") {
-			_, _ = fmt.Fprintf(w, "This is test headers matcher text")
+			fmt.Fprintf(w, "This is test headers matcher text")
 		}
 	})
 
@@ -55,9 +55,7 @@ func (h *remoteTemplateList) Execute(templateList string) error {
 	if err != nil {
 		return err
 	}
-	defer func() {
-		_ = os.Remove("test-config.yaml")
-	}()
+	defer os.Remove("test-config.yaml")
 
 	results, err := testutils.RunNucleiBareArgsAndGetResults(debug, nil, "-target", ts.URL, "-template-url", ts.URL+"/template_list", "-config", "test-config.yaml")
 	if err != nil {
@@ -74,9 +72,9 @@ func (h *excludedTemplate) Execute(templateList string) error {
 	router := httprouter.New()
 
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		_, _ = fmt.Fprintf(w, "This is test matcher text")
+		fmt.Fprintf(w, "This is test matcher text")
 		if strings.EqualFold(r.Header.Get("test"), "nuclei") {
-			_, _ = fmt.Fprintf(w, "This is test headers matcher text")
+			fmt.Fprintf(w, "This is test headers matcher text")
 		}
 	})
 	ts := httptest.NewServer(router)
@@ -97,9 +95,9 @@ func (h *remoteTemplateListNotAllowed) Execute(templateList string) error {
 	router := httprouter.New()
 
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		_, _ = fmt.Fprintf(w, "This is test matcher text")
+		fmt.Fprintf(w, "This is test matcher text")
 		if strings.EqualFold(r.Header.Get("test"), "nuclei") {
-			_, _ = fmt.Fprintf(w, "This is test headers matcher text")
+			fmt.Fprintf(w, "This is test headers matcher text")
 		}
 	})
 
@@ -132,9 +130,9 @@ func (h *remoteWorkflowList) Execute(workflowList string) error {
 	router := httprouter.New()
 
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		_, _ = fmt.Fprintf(w, "This is test matcher text")
+		fmt.Fprintf(w, "This is test matcher text")
 		if strings.EqualFold(r.Header.Get("test"), "nuclei") {
-			_, _ = fmt.Fprintf(w, "This is test headers matcher text")
+			fmt.Fprintf(w, "This is test headers matcher text")
 		}
 	})
 
@@ -156,9 +154,7 @@ func (h *remoteWorkflowList) Execute(workflowList string) error {
 	if err != nil {
 		return err
 	}
-	defer func() {
-		_ = os.Remove("test-config.yaml")
-	}()
+	defer os.Remove("test-config.yaml")
 
 	results, err := testutils.RunNucleiBareArgsAndGetResults(debug, nil, "-target", ts.URL, "-workflow-url", ts.URL+"/workflow_list", "-config", "test-config.yaml")
 	if err != nil {
@@ -181,9 +177,7 @@ func (h *nonExistentTemplateList) Execute(nonExistingTemplateList string) error
 	if err != nil {
 		return err
 	}
-	defer func() {
-		_ = os.Remove("test-config.yaml")
-	}()
+	defer os.Remove("test-config.yaml")
 
 	_, err = testutils.RunNucleiBareArgsAndGetResults(debug, nil, "-target", ts.URL, "-template-url", ts.URL+"/404", "-config", "test-config.yaml")
 	if err == nil {
@@ -206,9 +200,7 @@ func (h *nonExistentWorkflowList) Execute(nonExistingWorkflowList string) error
 	if err != nil {
 		return err
 	}
-	defer func() {
-		_ = os.Remove("test-config.yaml")
-	}()
+	defer os.Remove("test-config.yaml")
 
 	_, err = testutils.RunNucleiBareArgsAndGetResults(debug, nil, "-target", ts.URL, "-workflow-url", ts.URL+"/404", "-config", "test-config.yaml")
 	if err == nil {
@@ -223,7 +215,7 @@ type loadTemplateWithID struct{}
 func (h *loadTemplateWithID) Execute(nooop string) error {
 	results, err := testutils.RunNucleiBareArgsAndGetResults(debug, nil, "-target", "scanme.sh", "-id", "self-signed-ssl")
 	if err != nil {
-		return errkit.Wrap(err, "failed to load template with id")
+		return errorutil.NewWithErr(err).Msgf("failed to load template with id")
 	}
 	return expectResultsCount(results, 1)
 }

cmd/integration-test/network.go

@@ -33,9 +33,7 @@ func (h *networkBasic) Execute(filePath string) error {
 	var routerErr error
 
 	ts := testutils.NewTCPServer(nil, defaultStaticPort, func(conn net.Conn) {
-		defer func() {
-			_ = conn.Close()
-		}()
+		defer conn.Close()
 
 		data, err := reader.ConnReadNWithTimeout(conn, 4, time.Duration(5)*time.Second)
 		if err != nil {
@@ -52,11 +50,11 @@ func (h *networkBasic) Execute(filePath string) error {
 
 	results, err := testutils.RunNucleiTemplateAndGetResults(filePath, ts.URL, debug)
 	if err != nil {
-		_, _ = fmt.Fprintf(os.Stderr, "Could not run nuclei: %s\n", err)
+		fmt.Fprintf(os.Stderr, "Could not run nuclei: %s\n", err)
 		return err
 	}
 	if routerErr != nil {
-		_, _ = fmt.Fprintf(os.Stderr, "routerErr: %s\n", routerErr)
+		fmt.Fprintf(os.Stderr, "routerErr: %s\n", routerErr)
 		return routerErr
 	}
 
@@ -70,9 +68,7 @@ func (h *networkMultiStep) Execute(filePath string) error {
 	var routerErr error
 
 	ts := testutils.NewTCPServer(nil, defaultStaticPort, func(conn net.Conn) {
-		defer func() {
-			_ = conn.Close()
-		}()
+		defer conn.Close()
 
 		data, err := reader.ConnReadNWithTimeout(conn, 5, time.Duration(5)*time.Second)
 		if err != nil {
@@ -118,9 +114,7 @@ type networkRequestSelContained struct{}
 // Execute executes a test case and returns an error if occurred
 func (h *networkRequestSelContained) Execute(filePath string) error {
 	ts := testutils.NewTCPServer(nil, defaultStaticPort, func(conn net.Conn) {
-		defer func() {
-			_ = conn.Close()
-		}()
+		defer conn.Close()
 
 		_, _ = conn.Write([]byte("Authentication successful"))
 	})
@@ -140,9 +134,7 @@ func (h *networkVariables) Execute(filePath string) error {
 	var routerErr error
 
 	ts := testutils.NewTCPServer(nil, defaultStaticPort, func(conn net.Conn) {
-		defer func() {
-			_ = conn.Close()
-		}()
+		defer conn.Close()
 
 		data, err := reader.ConnReadNWithTimeout(conn, 4, time.Duration(5)*time.Second)
 		if err != nil {
@@ -170,9 +162,7 @@ type networkPort struct{}
 
 func (n *networkPort) Execute(filePath string) error {
 	ts := testutils.NewTCPServer(nil, 23846, func(conn net.Conn) {
-		defer func() {
-			_ = conn.Close()
-		}()
+		defer conn.Close()
 
 		data, err := reader.ConnReadNWithTimeout(conn, 4, time.Duration(5)*time.Second)
 		if err != nil {
@@ -205,9 +195,7 @@ func (n *networkPort) Execute(filePath string) error {
 
 	// this is positive test case where we expect port to be overridden and 34567 to be used
 	ts2 := testutils.NewTCPServer(nil, 34567, func(conn net.Conn) {
-		defer func() {
-			_ = conn.Close()
-		}()
+		defer conn.Close()
 
 		data, err := reader.ConnReadNWithTimeout(conn, 4, time.Duration(5)*time.Second)
 		if err != nil {

cmd/integration-test/profile-loader.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/projectdiscovery/nuclei/v3/pkg/testutils"
-	"github.com/projectdiscovery/utils/errkit"
+	errorutil "github.com/projectdiscovery/utils/errors"
 )
 
 var profileLoaderTestcases = []TestCaseInfo{
@@ -16,9 +16,9 @@ var profileLoaderTestcases = []TestCaseInfo{
 type profileLoaderByRelFile struct{}
 
 func (h *profileLoaderByRelFile) Execute(testName string) error {
-	results, err := testutils.RunNucleiWithArgsAndGetResults(debug, "-tl", "-tp", "cloud.yml")
+	results, err := testutils.RunNucleiWithArgsAndGetResults(false, "-tl", "-tp", "cloud.yml")
 	if err != nil {
-		return errkit.Wrap(err, "failed to load template with id")
+		return errorutil.NewWithErr(err).Msgf("failed to load template with id")
 	}
 	if len(results) <= 10 {
 		return fmt.Errorf("incorrect result: expected more results than %d, got %v", 10, len(results))
@@ -29,9 +29,9 @@ func (h *profileLoaderByRelFile) Execute(testName string) error {
 type profileLoaderById struct{}
 
 func (h *profileLoaderById) Execute(testName string) error {
-	results, err := testutils.RunNucleiWithArgsAndGetResults(debug, "-tl", "-tp", "cloud")
+	results, err := testutils.RunNucleiWithArgsAndGetResults(false, "-tl", "-tp", "cloud")
 	if err != nil {
-		return errkit.Wrap(err, "failed to load template with id")
+		return errorutil.NewWithErr(err).Msgf("failed to load template with id")
 	}
 	if len(results) <= 10 {
 		return fmt.Errorf("incorrect result: expected more results than %d, got %v", 10, len(results))
@@ -43,9 +43,9 @@ func (h *profileLoaderById) Execute(testName string) error {
 type customProfileLoader struct{}
 
 func (h *customProfileLoader) Execute(filepath string) error {
-	results, err := testutils.RunNucleiWithArgsAndGetResults(debug, "-tl", "-tp", filepath)
+	results, err := testutils.RunNucleiWithArgsAndGetResults(false, "-tl", "-tp", filepath)
 	if err != nil {
-		return errkit.Wrap(err, "failed to load template with id")
+		return errorutil.NewWithErr(err).Msgf("failed to load template with id")
 	}
 	if len(results) < 1 {
 		return fmt.Errorf("incorrect result: expected more results than %d, got %v", 1, len(results))

cmd/integration-test/ssl.go

@@ -21,9 +21,7 @@ type sslBasic struct{}
 // Execute executes a test case and returns an error if occurred
 func (h *sslBasic) Execute(filePath string) error {
 	ts := testutils.NewTCPServer(&tls.Config{}, defaultStaticPort, func(conn net.Conn) {
-		defer func() {
-			_ = conn.Close()
-		}()
+		defer conn.Close()
 		data := make([]byte, 4)
 		if _, err := conn.Read(data); err != nil {
 			return
@@ -44,9 +42,7 @@ type sslBasicZtls struct{}
 // Execute executes a test case and returns an error if occurred
 func (h *sslBasicZtls) Execute(filePath string) error {
 	ts := testutils.NewTCPServer(&tls.Config{}, defaultStaticPort, func(conn net.Conn) {
-		defer func() {
-			_ = conn.Close()
-		}()
+		defer conn.Close()
 		data := make([]byte, 4)
 		if _, err := conn.Read(data); err != nil {
 			return
@@ -67,9 +63,7 @@ type sslCustomCipher struct{}
 // Execute executes a test case and returns an error if occurred
 func (h *sslCustomCipher) Execute(filePath string) error {
 	ts := testutils.NewTCPServer(&tls.Config{CipherSuites: []uint16{tls.TLS_AES_128_GCM_SHA256}}, defaultStaticPort, func(conn net.Conn) {
-		defer func() {
-			_ = conn.Close()
-		}()
+		defer conn.Close()
 		data := make([]byte, 4)
 		if _, err := conn.Read(data); err != nil {
 			return
@@ -90,9 +84,7 @@ type sslCustomVersion struct{}
 // Execute executes a test case and returns an error if occurred
 func (h *sslCustomVersion) Execute(filePath string) error {
 	ts := testutils.NewTCPServer(&tls.Config{MinVersion: tls.VersionTLS12, MaxVersion: tls.VersionTLS12}, defaultStaticPort, func(conn net.Conn) {
-		defer func() {
-			_ = conn.Close()
-		}()
+		defer conn.Close()
 		data := make([]byte, 4)
 		if _, err := conn.Read(data); err != nil {
 			return
@@ -112,9 +104,7 @@ type sslWithVars struct{}
 
 func (h *sslWithVars) Execute(filePath string) error {
 	ts := testutils.NewTCPServer(&tls.Config{}, defaultStaticPort, func(conn net.Conn) {
-		defer func() {
-			_ = conn.Close()
-		}()
+		defer conn.Close()
 		data := make([]byte, 4)
 		if _, err := conn.Read(data); err != nil {
 			return
@@ -138,9 +128,7 @@ func (h *sslMultiReq) Execute(filePath string) error {
 		MinVersion: tls.VersionSSL30,
 		MaxVersion: tls.VersionTLS11,
 	}, defaultStaticPort, func(conn net.Conn) {
-		defer func() {
-			_ = conn.Close()
-		}()
+		defer conn.Close()
 		data := make([]byte, 4)
 		if _, err := conn.Read(data); err != nil {
 			return

cmd/integration-test/template-dir.go

@@ -4,7 +4,7 @@ import (
 	"os"
 
 	"github.com/projectdiscovery/nuclei/v3/pkg/testutils"
-	"github.com/projectdiscovery/utils/errkit"
+	errorutil "github.com/projectdiscovery/utils/errors"
 )
 
 var templatesDirTestCases = []TestCaseInfo{
@@ -17,11 +17,9 @@ type templateDirWithTargetTest struct{}
 func (h *templateDirWithTargetTest) Execute(filePath string) error {
 	tempdir, err := os.MkdirTemp("", "nuclei-update-dir-*")
 	if err != nil {
-		return errkit.Wrap(err, "failed to create temp dir")
+		return errorutil.NewWithErr(err).Msgf("failed to create temp dir")
 	}
-	defer func() {
-		_ = os.RemoveAll(tempdir)
-	}()
+	defer os.RemoveAll(tempdir)
 
 	results, err := testutils.RunNucleiTemplateAndGetResults(filePath, "8x8exch02.8x8.com", debug, "-ud", tempdir)
 	if err != nil {

cmd/integration-test/templates-dir-env.go

@@ -1,217 +0,0 @@
-package main
-
-import (
-	"os"
-	"path/filepath"
-
-	osutils "github.com/projectdiscovery/utils/os"
-
-	"github.com/projectdiscovery/nuclei/v3/pkg/testutils"
-	"github.com/projectdiscovery/utils/errkit"
-)
-
-// isNotLinux returns true if not running on Linux (used to skip tests on non-Linux OS)
-var isNotLinux = func() bool { return !osutils.IsLinux() }
-
-var templatesDirEnvTestCases = []TestCaseInfo{
-	{Path: "protocols/dns/cname-fingerprint.yaml", TestCase: &templatesDirEnvBasicTest{}, DisableOn: isNotLinux},
-	{Path: "protocols/dns/cname-fingerprint.yaml", TestCase: &templatesDirEnvAbsolutePathTest{}, DisableOn: isNotLinux},
-	{Path: "protocols/dns/cname-fingerprint.yaml", TestCase: &templatesDirEnvRelativePathTest{}, DisableOn: isNotLinux},
-	{Path: "protocols/dns/cname-fingerprint.yaml", TestCase: &templatesDirEnvPrecedenceTest{}, DisableOn: isNotLinux},
-	{Path: "protocols/dns/cname-fingerprint.yaml", TestCase: &templatesDirEnvCustomTemplatesTest{}, DisableOn: isNotLinux},
-}
-
-// copyTemplateToDir copies a template file to a destination directory, preserving the directory structure
-func copyTemplateToDir(templatePath, destDir string) error {
-	// Read the template file
-	templateData, err := os.ReadFile(templatePath)
-	if err != nil {
-		return errkit.Wrap(err, "failed to read template file")
-	}
-
-	// Create the destination path preserving directory structure
-	destPath := filepath.Join(destDir, templatePath)
-	destDirPath := filepath.Dir(destPath)
-
-	// Create the destination directory if it doesn't exist
-	if err := os.MkdirAll(destDirPath, 0755); err != nil {
-		return errkit.Wrap(err, "failed to create destination directory")
-	}
-
-	// Write the template file
-	if err := os.WriteFile(destPath, templateData, 0644); err != nil {
-		return errkit.Wrap(err, "failed to write template file")
-	}
-
-	return nil
-}
-
-// templatesDirEnvBasicTest tests basic functionality of NUCLEI_TEMPLATES_DIR
-type templatesDirEnvBasicTest struct{}
-
-// Execute executes a test case and returns an error if occurred
-func (h *templatesDirEnvBasicTest) Execute(filePath string) error {
-	tempdir, err := os.MkdirTemp("", "nuclei-templates-dir-env-*")
-	if err != nil {
-		return errkit.Wrap(err, "failed to create temp dir")
-	}
-	defer func() {
-		_ = os.RemoveAll(tempdir)
-	}()
-
-	// Copy template to temp directory
-	if err := copyTemplateToDir(filePath, tempdir); err != nil {
-		return err
-	}
-
-	// Set NUCLEI_TEMPLATES_DIR and run nuclei
-	envVars := []string{"NUCLEI_TEMPLATES_DIR=" + tempdir}
-	results, err := testutils.RunNucleiBareArgsAndGetResults(debug, envVars, "-t", filePath, "-u", "8x8exch02.8x8.com")
-	if err != nil {
-		return err
-	}
-
-	return expectResultsCount(results, 1)
-}
-
-// templatesDirEnvAbsolutePathTest tests that absolute paths work correctly
-type templatesDirEnvAbsolutePathTest struct{}
-
-// Execute executes a test case and returns an error if occurred
-func (h *templatesDirEnvAbsolutePathTest) Execute(filePath string) error {
-	tempdir, err := os.MkdirTemp("", "nuclei-templates-dir-env-abs-*")
-	if err != nil {
-		return errkit.Wrap(err, "failed to create temp dir")
-	}
-	defer func() {
-		_ = os.RemoveAll(tempdir)
-	}()
-
-	// Get absolute path
-	absTempDir, err := filepath.Abs(tempdir)
-	if err != nil {
-		return errkit.Wrap(err, "failed to get absolute path")
-	}
-
-	// Copy template to temp directory
-	if err := copyTemplateToDir(filePath, absTempDir); err != nil {
-		return err
-	}
-
-	// Set NUCLEI_TEMPLATES_DIR with absolute path and run nuclei
-	envVars := []string{"NUCLEI_TEMPLATES_DIR=" + absTempDir}
-	results, err := testutils.RunNucleiBareArgsAndGetResults(debug, envVars, "-t", filePath, "-u", "8x8exch02.8x8.com")
-	if err != nil {
-		return err
-	}
-
-	return expectResultsCount(results, 1)
-}
-
-// templatesDirEnvRelativePathTest tests that relative paths are resolved correctly
-type templatesDirEnvRelativePathTest struct{}
-
-// Execute executes a test case and returns an error if occurred
-func (h *templatesDirEnvRelativePathTest) Execute(filePath string) error {
-	// Create temp directory in current working directory
-	tempdir, err := os.MkdirTemp(".", "nuclei-templates-dir-env-rel-*")
-	if err != nil {
-		return errkit.Wrap(err, "failed to create temp dir")
-	}
-	defer func() {
-		_ = os.RemoveAll(tempdir)
-	}()
-
-	// Get relative path (just the directory name)
-	relPath := filepath.Base(tempdir)
-
-	// Copy template to temp directory
-	if err := copyTemplateToDir(filePath, tempdir); err != nil {
-		return err
-	}
-
-	// Set NUCLEI_TEMPLATES_DIR with relative path and run nuclei
-	// Note: The implementation should convert relative paths to absolute
-	envVars := []string{"NUCLEI_TEMPLATES_DIR=" + relPath}
-	results, err := testutils.RunNucleiBareArgsAndGetResults(debug, envVars, "-t", filePath, "-u", "8x8exch02.8x8.com")
-	if err != nil {
-		return err
-	}
-
-	return expectResultsCount(results, 1)
-}
-
-// templatesDirEnvPrecedenceTest tests that -ud flag takes precedence over NUCLEI_TEMPLATES_DIR
-type templatesDirEnvPrecedenceTest struct{}
-
-// Execute executes a test case and returns an error if occurred
-func (h *templatesDirEnvPrecedenceTest) Execute(filePath string) error {
-	// Create two temp directories
-	envTempDir, err := os.MkdirTemp("", "nuclei-templates-dir-env-*")
-	if err != nil {
-		return errkit.Wrap(err, "failed to create env temp dir")
-	}
-	defer func() {
-		_ = os.RemoveAll(envTempDir)
-	}()
-
-	flagTempDir, err := os.MkdirTemp("", "nuclei-templates-dir-flag-*")
-	if err != nil {
-		return errkit.Wrap(err, "failed to create flag temp dir")
-	}
-	defer func() {
-		_ = os.RemoveAll(flagTempDir)
-	}()
-
-	// Copy template to flag temp directory (this should be used due to precedence)
-	if err := copyTemplateToDir(filePath, flagTempDir); err != nil {
-		return err
-	}
-
-	// Set NUCLEI_TEMPLATES_DIR to envTempDir (should be ignored due to -ud flag)
-	envVars := []string{"NUCLEI_TEMPLATES_DIR=" + envTempDir}
-	// Use -ud flag which should take precedence
-	results, err := testutils.RunNucleiBareArgsAndGetResults(debug, envVars, "-t", filePath, "-u", "8x8exch02.8x8.com", "-ud", flagTempDir)
-	if err != nil {
-		return err
-	}
-
-	return expectResultsCount(results, 1)
-}
-
-// templatesDirEnvCustomTemplatesTest tests that custom template subdirectories are correctly set
-type templatesDirEnvCustomTemplatesTest struct{}
-
-// Execute executes a test case and returns an error if occurred
-func (h *templatesDirEnvCustomTemplatesTest) Execute(filePath string) error {
-	tempdir, err := os.MkdirTemp("", "nuclei-templates-dir-custom-*")
-	if err != nil {
-		return errkit.Wrap(err, "failed to create temp dir")
-	}
-	defer func() {
-		_ = os.RemoveAll(tempdir)
-	}()
-
-	// Create custom template subdirectories structure
-	customDirs := []string{"github", "s3", "gitlab", "azure"}
-	for _, dir := range customDirs {
-		customDirPath := filepath.Join(tempdir, dir)
-		if err := os.MkdirAll(customDirPath, 0755); err != nil {
-			return errkit.Wrap(err, "failed to create custom template directory")
-		}
-	}
-
-	// Copy template to temp directory
-	if err := copyTemplateToDir(filePath, tempdir); err != nil {
-		return err
-	}
-
-	// Set NUCLEI_TEMPLATES_DIR and run nuclei
-	envVars := []string{"NUCLEI_TEMPLATES_DIR=" + tempdir}
-	results, err := testutils.RunNucleiBareArgsAndGetResults(debug, envVars, "-t", filePath, "-u", "8x8exch02.8x8.com")
-	if err != nil {
-		return err
-	}
-
-	return expectResultsCount(results, 1)
-}

cmd/integration-test/workflow.go

@@ -62,7 +62,7 @@ type workflowBasic struct{}
 func (h *workflowBasic) Execute(filePath string) error {
 	router := httprouter.New()
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		_, _ = fmt.Fprintf(w, "This is test matcher text")
+		fmt.Fprintf(w, "This is test matcher text")
 	})
 	ts := httptest.NewServer(router)
 	defer ts.Close()
@@ -81,7 +81,7 @@ type workflowConditionMatched struct{}
 func (h *workflowConditionMatched) Execute(filePath string) error {
 	router := httprouter.New()
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		_, _ = fmt.Fprintf(w, "This is test matcher text")
+		fmt.Fprintf(w, "This is test matcher text")
 	})
 	ts := httptest.NewServer(router)
 	defer ts.Close()
@@ -100,7 +100,7 @@ type workflowConditionUnmatch struct{}
 func (h *workflowConditionUnmatch) Execute(filePath string) error {
 	router := httprouter.New()
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		_, _ = fmt.Fprintf(w, "This is test matcher text")
+		fmt.Fprintf(w, "This is test matcher text")
 	})
 	ts := httptest.NewServer(router)
 	defer ts.Close()
@@ -119,7 +119,7 @@ type workflowMatcherName struct{}
 func (h *workflowMatcherName) Execute(filePath string) error {
 	router := httprouter.New()
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		_, _ = fmt.Fprintf(w, "This is test matcher text")
+		fmt.Fprintf(w, "This is test matcher text")
 	})
 	ts := httptest.NewServer(router)
 	defer ts.Close()
@@ -138,7 +138,7 @@ type workflowComplexConditions struct{}
 func (h *workflowComplexConditions) Execute(filePath string) error {
 	router := httprouter.New()
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		_, _ = fmt.Fprintf(w, "This is test matcher text")
+		fmt.Fprintf(w, "This is test matcher text")
 	})
 	ts := httptest.NewServer(router)
 	defer ts.Close()
@@ -162,11 +162,11 @@ type workflowHttpKeyValueShare struct{}
 func (h *workflowHttpKeyValueShare) Execute(filePath string) error {
 	router := httprouter.New()
 	router.GET("/path1", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		_, _ = fmt.Fprintf(w, "href=\"test-value\"")
+		fmt.Fprintf(w, "href=\"test-value\"")
 	})
 	router.GET("/path2", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 		body, _ := io.ReadAll(r.Body)
-		_, _ = fmt.Fprintf(w, "%s", body)
+		fmt.Fprintf(w, "%s", body)
 	})
 	ts := httptest.NewServer(router)
 	defer ts.Close()
@@ -214,11 +214,11 @@ func (h *workflowMultiProtocolKeyValueShare) Execute(filePath string) error {
 	router := httprouter.New()
 	// the response of path1 contains a domain that will be extracted and shared with the second template
 	router.GET("/path1", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		_, _ = fmt.Fprintf(w, "href=\"blog.projectdiscovery.io\"")
+		fmt.Fprintf(w, "href=\"blog.projectdiscovery.io\"")
 	})
 	// path2 responds with the value of the "extracted" query parameter, e.g.: /path2?extracted=blog.projectdiscovery.io => blog.projectdiscovery.io
 	router.GET("/path2", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		_, _ = fmt.Fprintf(w, "%s", r.URL.Query().Get("extracted"))
+		fmt.Fprintf(w, "%s", r.URL.Query().Get("extracted"))
 	})
 	ts := httptest.NewServer(router)
 	defer ts.Close()
@@ -238,15 +238,15 @@ func (h *workflowMultiMatchKeyValueShare) Execute(filePath string) error {
 	var receivedData []string
 	router := httprouter.New()
 	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		_, _ = fmt.Fprintf(w, "This is test matcher text")
+		fmt.Fprintf(w, "This is test matcher text")
 	})
 	router.GET("/path1", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		_, _ = fmt.Fprintf(w, "href=\"test-value-%s\"", r.URL.Query().Get("v"))
+		fmt.Fprintf(w, "href=\"test-value-%s\"", r.URL.Query().Get("v"))
 	})
 	router.GET("/path2", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 		body, _ := io.ReadAll(r.Body)
 		receivedData = append(receivedData, string(body))
-		_, _ = fmt.Fprintf(w, "test-value")
+		fmt.Fprintf(w, "test-value")
 	})
 	ts := httptest.NewServer(router)
 	defer ts.Close()

cmd/nuclei/main.go

@@ -13,16 +13,14 @@ import (
 	"strings"
 	"time"
 
-	"github.com/projectdiscovery/gologger"
 	_pdcp "github.com/projectdiscovery/nuclei/v3/internal/pdcp"
 	"github.com/projectdiscovery/utils/auth/pdcp"
 	"github.com/projectdiscovery/utils/env"
 	_ "github.com/projectdiscovery/utils/pprof"
 	stringsutil "github.com/projectdiscovery/utils/strings"
-	"github.com/rs/xid"
-	"gopkg.in/yaml.v2"
 
 	"github.com/projectdiscovery/goflags"
+	"github.com/projectdiscovery/gologger"
 	"github.com/projectdiscovery/gologger/levels"
 	"github.com/projectdiscovery/interactsh/pkg/client"
 	"github.com/projectdiscovery/nuclei/v3/internal/runner"
@@ -40,7 +38,7 @@ import (
 	"github.com/projectdiscovery/nuclei/v3/pkg/types"
 	"github.com/projectdiscovery/nuclei/v3/pkg/types/scanstrategy"
 	"github.com/projectdiscovery/nuclei/v3/pkg/utils/monitor"
-	"github.com/projectdiscovery/utils/errkit"
+	errorutil "github.com/projectdiscovery/utils/errors"
 	fileutil "github.com/projectdiscovery/utils/file"
 	unitutils "github.com/projectdiscovery/utils/unit"
 	updateutils "github.com/projectdiscovery/utils/update"
@@ -54,18 +52,16 @@ var (
 )
 
 func main() {
-	options.Logger = gologger.DefaultLogger
-
 	// enables CLI specific configs mostly interactive behavior
 	config.CurrentAppMode = config.AppModeCLI
 
 	if err := runner.ConfigureOptions(); err != nil {
-		options.Logger.Fatal().Msgf("Could not initialize options: %s\n", err)
+		gologger.Fatal().Msgf("Could not initialize options: %s\n", err)
 	}
 	_ = readConfig()
 
 	if options.ListDslSignatures {
-		options.Logger.Info().Msgf("The available custom DSL functions are:")
+		gologger.Info().Msgf("The available custom DSL functions are:")
 		fmt.Println(dsl.GetPrintableDslFunctionSignatures(options.NoColor))
 		return
 	}
@@ -76,7 +72,7 @@ func main() {
 		templates.UseOptionsForSigner(options)
 		tsigner, err := signer.NewTemplateSigner(nil, nil) // will read from env , config or generate new keys
 		if err != nil {
-			options.Logger.Fatal().Msgf("couldn't initialize signer crypto engine: %s\n", err)
+			gologger.Fatal().Msgf("couldn't initialize signer crypto engine: %s\n", err)
 		}
 
 		successCounter := 0
@@ -92,7 +88,7 @@ func main() {
 					if err != templates.ErrNotATemplate {
 						// skip warnings and errors as given items are not templates
 						errorCounter++
-						options.Logger.Error().Msgf("could not sign '%s': %s\n", iterItem, err)
+						gologger.Error().Msgf("could not sign '%s': %s\n", iterItem, err)
 					}
 				} else {
 					successCounter++
@@ -101,10 +97,10 @@ func main() {
 				return nil
 			})
 			if err != nil {
-				options.Logger.Error().Msgf("%s\n", err)
+				gologger.Error().Msgf("%s\n", err)
 			}
 		}
-		options.Logger.Info().Msgf("All templates signatures were elaborated success=%d failed=%d\n", successCounter, errorCounter)
+		gologger.Info().Msgf("All templates signatures were elaborated success=%d failed=%d\n", successCounter, errorCounter)
 		return
 	}
 
@@ -115,7 +111,7 @@ func main() {
 		createProfileFile := func(ext, profileType string) *os.File {
 			f, err := os.Create(memProfile + ext)
 			if err != nil {
-				options.Logger.Fatal().Msgf("profile: could not create %s profile %q file: %v", profileType, f.Name(), err)
+				gologger.Fatal().Msgf("profile: could not create %s profile %q file: %v", profileType, f.Name(), err)
 			}
 			return f
 		}
@@ -129,47 +125,45 @@ func main() {
 
 		// Start tracing
 		if err := trace.Start(traceFile); err != nil {
-			options.Logger.Fatal().Msgf("profile: could not start trace: %v", err)
+			gologger.Fatal().Msgf("profile: could not start trace: %v", err)
 		}
 
 		// Start CPU profiling
 		if err := pprof.StartCPUProfile(cpuProfileFile); err != nil {
-			options.Logger.Fatal().Msgf("profile: could not start CPU profile: %v", err)
+			gologger.Fatal().Msgf("profile: could not start CPU profile: %v", err)
 		}
 
 		defer func() {
 			// Start heap memory snapshot
 			if err := pprof.WriteHeapProfile(memProfileFile); err != nil {
-				options.Logger.Fatal().Msgf("profile: could not write memory profile: %v", err)
+				gologger.Fatal().Msgf("profile: could not write memory profile: %v", err)
 			}
 
 			pprof.StopCPUProfile()
-			_ = memProfileFile.Close()
-			_ = traceFile.Close()
+			memProfileFile.Close()
+			traceFile.Close()
 			trace.Stop()
 
 			runtime.MemProfileRate = oldMemProfileRate
 
-			options.Logger.Info().Msgf("CPU profile saved at %q", cpuProfileFile.Name())
-			options.Logger.Info().Msgf("Memory usage snapshot saved at %q", memProfileFile.Name())
-			options.Logger.Info().Msgf("Traced at %q", traceFile.Name())
+			gologger.Info().Msgf("CPU profile saved at %q", cpuProfileFile.Name())
+			gologger.Info().Msgf("Memory usage snapshot saved at %q", memProfileFile.Name())
+			gologger.Info().Msgf("Traced at %q", traceFile.Name())
 		}()
 	}
 
-	options.ExecutionId = xid.New().String()
-
 	runner.ParseOptions(options)
 
 	if options.ScanUploadFile != "" {
 		if err := runner.UploadResultsToCloud(options); err != nil {
-			options.Logger.Fatal().Msgf("could not upload scan results to cloud dashboard: %s\n", err)
+			gologger.Fatal().Msgf("could not upload scan results to cloud dashboard: %s\n", err)
 		}
 		return
 	}
 
 	nucleiRunner, err := runner.New(options)
 	if err != nil {
-		options.Logger.Fatal().Msgf("Could not create runner: %s\n", err)
+		gologger.Fatal().Msgf("Could not create runner: %s\n", err)
 	}
 	if nucleiRunner == nil {
 		return
@@ -182,13 +176,13 @@ func main() {
 		stackMonitor.RegisterCallback(func(dumpID string) error {
 			resumeFileName := fmt.Sprintf("crash-resume-file-%s.dump", dumpID)
 			if options.EnableCloudUpload {
-				options.Logger.Info().Msgf("Uploading scan results to cloud...")
+				gologger.Info().Msgf("Uploading scan results to cloud...")
 			}
 			nucleiRunner.Close()
-			options.Logger.Info().Msgf("Creating resume file: %s\n", resumeFileName)
+			gologger.Info().Msgf("Creating resume file: %s\n", resumeFileName)
 			err := nucleiRunner.SaveResumeConfig(resumeFileName)
 			if err != nil {
-				return errkit.Wrap(err, "couldn't create crash resume file")
+				return errorutil.NewWithErr(err).Msgf("couldn't create crash resume file")
 			}
 			return nil
 		})
@@ -197,41 +191,43 @@ func main() {
 	// Setup graceful exits
 	resumeFileName := types.DefaultResumeFilePath()
 	c := make(chan os.Signal, 1)
+	defer close(c)
 	signal.Notify(c, os.Interrupt)
 	go func() {
-		<-c
-		options.Logger.Info().Msgf("CTRL+C pressed: Exiting\n")
-		if options.DASTServer {
+		for range c {
+			gologger.Info().Msgf("CTRL+C pressed: Exiting\n")
+			if options.DASTServer || options.PassiveServer {
+				nucleiRunner.Close()
+				os.Exit(1)
+			}
+
+			gologger.Info().Msgf("Attempting graceful shutdown...")
+			if options.EnableCloudUpload {
+				gologger.Info().Msgf("Uploading scan results to cloud...")
+			}
 			nucleiRunner.Close()
+			if options.ShouldSaveResume() {
+				gologger.Info().Msgf("Creating resume file: %s\n", resumeFileName)
+				err := nucleiRunner.SaveResumeConfig(resumeFileName)
+				if err != nil {
+					gologger.Error().Msgf("Couldn't create resume file: %s\n", err)
+				}
+			}
 			os.Exit(1)
 		}
-
-		options.Logger.Info().Msgf("Attempting graceful shutdown...")
-		if options.EnableCloudUpload {
-			options.Logger.Info().Msgf("Uploading scan results to cloud...")
-		}
-		nucleiRunner.Close()
-		if options.ShouldSaveResume() {
-			options.Logger.Info().Msgf("Creating resume file: %s\n", resumeFileName)
-			err := nucleiRunner.SaveResumeConfig(resumeFileName)
-			if err != nil {
-				options.Logger.Error().Msgf("Couldn't create resume file: %s\n", err)
-			}
-		}
-		os.Exit(1)
 	}()
 
 	if err := nucleiRunner.RunEnumeration(); err != nil {
 		if options.Validate {
-			options.Logger.Fatal().Msgf("Could not validate templates: %s\n", err)
+			gologger.Fatal().Msgf("Could not validate templates: %s\n", err)
 		} else {
-			options.Logger.Fatal().Msgf("Could not run nuclei: %s\n", err)
+			gologger.Fatal().Msgf("Could not run nuclei: %s\n", err)
 		}
 	}
 	nucleiRunner.Close()
 	// on successful execution remove the resume file in case it exists
 	if fileutil.FileExists(resumeFileName) {
-		_ = os.Remove(resumeFileName)
+		os.Remove(resumeFileName)
 	}
 }
 
@@ -264,8 +260,6 @@ on extensive configurability, massive extensibility and ease of use.`)
 		flagSet.StringVarP(&options.InputFileMode, "input-mode", "im", "list", fmt.Sprintf("mode of input file (%v)", provider.SupportedInputFormats())),
 		flagSet.BoolVarP(&options.FormatUseRequiredOnly, "required-only", "ro", false, "use only required fields in input format when generating requests"),
 		flagSet.BoolVarP(&options.SkipFormatValidation, "skip-format-validation", "sfv", false, "skip format validation (like missing vars) when parsing input file"),
-		flagSet.BoolVarP(&options.VarsTextTemplating, "vars-text-templating", "vtt", false, "enable text templating for vars in input file (only for yaml input mode)"),
-		flagSet.StringSliceVarP(&options.VarsFilePaths, "var-file-paths", "vfp", nil, "list of yaml file contained vars to inject into yaml input", goflags.CommaSeparatedStringSliceOptions),
 	)
 
 	flagSet.CreateGroup("templates", "Templates",
@@ -280,7 +274,7 @@ on extensive configurability, massive extensibility and ease of use.`)
 		flagSet.BoolVar(&options.Validate, "validate", false, "validate the passed templates to nuclei"),
 		flagSet.BoolVarP(&options.NoStrictSyntax, "no-strict-syntax", "nss", false, "disable strict syntax check on templates"),
 		flagSet.BoolVarP(&options.TemplateDisplay, "template-display", "td", false, "displays the templates content"),
-		flagSet.BoolVar(&options.TemplateList, "tl", false, "list all templates matching current filters"),
+		flagSet.BoolVar(&options.TemplateList, "tl", false, "list all available templates"),
 		flagSet.BoolVar(&options.TagList, "tgl", false, "list all available tags"),
 		flagSet.StringSliceVarConfigOnly(&options.RemoteTemplateDomainList, "remote-template-domain", []string{"cloud.projectdiscovery.io"}, "allowed domain list to load remote templates from"),
 		flagSet.BoolVar(&options.SignTemplates, "sign", false, "signs the templates with the private key defined in NUCLEI_SIGNATURE_PRIVATE_KEY env variable"),
@@ -381,6 +375,9 @@ on extensive configurability, massive extensibility and ease of use.`)
 		flagSet.BoolVar(&fuzzFlag, "fuzz", false, "enable loading fuzzing templates (Deprecated: use -dast instead)"),
 		flagSet.BoolVar(&options.DAST, "dast", false, "enable / run dast (fuzz) nuclei templates"),
 		flagSet.BoolVarP(&options.DASTServer, "dast-server", "dts", false, "enable dast server mode (live fuzzing)"),
+		flagSet.BoolVarP(&options.PassiveServer, "passive-server", "psr", false, "enable passive server mode"),
+		flagSet.IntVarP(&options.ProxyServerPort, "proxy-server-port", "psp", 9053, "port to use for the proxy server"),
+		flagSet.StringVarP(&options.ProxyCacheDirectory, "proxy-cache-directory", "pcd", "", "directory to use for the proxy server cache"),
 		flagSet.BoolVarP(&options.DASTReport, "dast-report", "dtr", false, "write dast scan report to file"),
 		flagSet.StringVarP(&options.DASTServerToken, "dast-server-token", "dtst", "", "dast server token (optional)"),
 		flagSet.StringVarP(&options.DASTServerAddress, "dast-server-address", "dtsa", "localhost:9055", "dast server address"),
@@ -411,7 +408,6 @@ on extensive configurability, massive extensibility and ease of use.`)
 		flagSet.IntVarP(&options.JsConcurrency, "js-concurrency", "jsc", 120, "maximum number of javascript runtimes to be executed in parallel"),
 		flagSet.IntVarP(&options.PayloadConcurrency, "payload-concurrency", "pc", 25, "max payload concurrency for each template"),
 		flagSet.IntVarP(&options.ProbeConcurrency, "probe-concurrency", "prc", 50, "http probe concurrency with httpx"),
-		flagSet.IntVarP(&options.TemplateLoadingConcurrency, "template-loading-concurrency", "tlc", types.DefaultTemplateLoadingConcurrency, "maximum number of concurrent template loading operations"),
 	)
 	flagSet.CreateGroup("optimization", "Optimizations",
 		flagSet.IntVar(&options.Timeout, "timeout", 10, "time to wait in seconds before timeout"),
@@ -549,11 +545,11 @@ Additional documentation is available at: https://docs.nuclei.sh/getting-started
 		h := &pdcp.PDCPCredHandler{}
 		_, err := h.GetCreds()
 		if err != nil {
-			options.Logger.Fatal().Msg("To utilize the `-ai` flag, please configure your API key with the `-auth` flag or set the `PDCP_API_KEY` environment variable")
+			gologger.Fatal().Msg("To utilize the `-ai` flag, please configure your API key with the `-auth` flag or set the `PDCP_API_KEY` environment variable")
 		}
 	}
 
-	options.Logger.SetTimestamp(options.Timestamp, levels.LevelDebug)
+	gologger.DefaultLogger.SetTimestamp(options.Timestamp, levels.LevelDebug)
 
 	if options.VerboseVerbose {
 		// hide release notes if silent mode is enabled
@@ -575,58 +571,17 @@ Additional documentation is available at: https://docs.nuclei.sh/getting-started
 		config.DefaultConfig.SetConfigDir(customConfigDir)
 		readFlagsConfig(flagSet)
 	}
-
 	if cfgFile != "" {
 		if !fileutil.FileExists(cfgFile) {
-			options.Logger.Fatal().Msgf("given config file '%s' does not exist", cfgFile)
+			gologger.Fatal().Msgf("given config file '%s' does not exist", cfgFile)
 		}
 		// merge config file with flags
 		if err := flagSet.MergeConfigFile(cfgFile); err != nil {
-			options.Logger.Fatal().Msgf("Could not read config: %s\n", err)
-		}
-
-		if !options.Vars.IsEmpty() {
-			// Maybe we should add vars to the config file as well even if they are set via flags?
-			file, err := os.Open(cfgFile)
-			if err != nil {
-				gologger.Fatal().Msgf("Could not open config file: %s\n", err)
-			}
-			defer func() {
-				_ = file.Close()
-			}()
-			data := make(map[string]interface{})
-			err = yaml.NewDecoder(file).Decode(&data)
-			if err != nil {
-				gologger.Fatal().Msgf("Could not decode config file: %s\n", err)
-			}
-
-			variables := data["var"]
-			if variables != nil {
-				if varSlice, ok := variables.([]interface{}); ok {
-					for _, value := range varSlice {
-						if strVal, ok := value.(string); ok {
-							err = options.Vars.Set(strVal)
-							if err != nil {
-								gologger.Warning().Msgf("Could not set variable from config file: %s\n", err)
-							}
-						} else {
-							gologger.Warning().Msgf("Skipping non-string variable in config: %#v", value)
-						}
-					}
-				} else {
-					gologger.Warning().Msgf("No 'var' section found in config file: %s", cfgFile)
-				}
-			}
-
+			gologger.Fatal().Msgf("Could not read config: %s\n", err)
 		}
 	}
-
-	templatesDir := options.NewTemplatesDirectory
-	if templatesDir == "" {
-		templatesDir = os.Getenv(config.NucleiTemplatesDirEnv)
-	}
-	if templatesDir != "" {
-		config.DefaultConfig.SetTemplatesDir(templatesDir)
+	if options.NewTemplatesDirectory != "" {
+		config.DefaultConfig.SetTemplatesDir(options.NewTemplatesDirectory)
 	}
 
 	defaultProfilesPath := filepath.Join(config.DefaultConfig.GetTemplateDir(), "profiles")
@@ -635,7 +590,7 @@ Additional documentation is available at: https://docs.nuclei.sh/getting-started
 			if tp := findProfilePathById(templateProfile, defaultProfilesPath); tp != "" {
 				templateProfile = tp
 			} else {
-				options.Logger.Fatal().Msgf("'%s' is not a profile-id or profile path", templateProfile)
+				gologger.Fatal().Msgf("'%s' is not a profile-id or profile path", templateProfile)
 			}
 		}
 		if !filepath.IsAbs(templateProfile) {
@@ -650,17 +605,17 @@ Additional documentation is available at: https://docs.nuclei.sh/getting-started
 			}
 		}
 		if !fileutil.FileExists(templateProfile) {
-			options.Logger.Fatal().Msgf("given template profile file '%s' does not exist", templateProfile)
+			gologger.Fatal().Msgf("given template profile file '%s' does not exist", templateProfile)
 		}
 		if err := flagSet.MergeConfigFile(templateProfile); err != nil {
-			options.Logger.Fatal().Msgf("Could not read template profile: %s\n", err)
+			gologger.Fatal().Msgf("Could not read template profile: %s\n", err)
 		}
 	}
 
 	if len(options.SecretsFile) > 0 {
 		for _, secretFile := range options.SecretsFile {
 			if !fileutil.FileExists(secretFile) {
-				options.Logger.Fatal().Msgf("given secrets file '%s' does not exist", secretFile)
+				gologger.Fatal().Msgf("given secrets file '%s' does not exist", options.SecretsFile)
 			}
 		}
 	}
@@ -686,25 +641,25 @@ func readFlagsConfig(flagset *goflags.FlagSet) {
 	if err != nil {
 		// something went wrong either dir is not readable or something else went wrong upstream in `goflags`
 		// warn and exit in this case
-		options.Logger.Warning().Msgf("Could not read config file: %s\n", err)
+		gologger.Warning().Msgf("Could not read config file: %s\n", err)
 		return
 	}
 	cfgFile := config.DefaultConfig.GetFlagsConfigFilePath()
 	if !fileutil.FileExists(cfgFile) {
 		if !fileutil.FileExists(defaultCfgFile) {
 			// if default config does not exist, warn and exit
-			options.Logger.Warning().Msgf("missing default config file : %s", defaultCfgFile)
+			gologger.Warning().Msgf("missing default config file : %s", defaultCfgFile)
 			return
 		}
 		// if does not exist copy it from the default config
 		if err = fileutil.CopyFile(defaultCfgFile, cfgFile); err != nil {
-			options.Logger.Warning().Msgf("Could not copy config file: %s\n", err)
+			gologger.Warning().Msgf("Could not copy config file: %s\n", err)
 		}
 		return
 	}
 	// if config file exists, merge it with the default config
 	if err = flagset.MergeConfigFile(cfgFile); err != nil {
-		options.Logger.Warning().Msgf("failed to merge configfile with flags got: %s\n", err)
+		gologger.Warning().Msgf("failed to merge configfile with flags got: %s\n", err)
 	}
 }
 
@@ -715,29 +670,29 @@ func disableUpdatesCallback() {
 
 // printVersion prints the nuclei version and exits.
 func printVersion() {
-	options.Logger.Info().Msgf("Nuclei Engine Version: %s", config.Version)
-	options.Logger.Info().Msgf("Nuclei Config Directory: %s", config.DefaultConfig.GetConfigDir())
-	options.Logger.Info().Msgf("Nuclei Cache Directory: %s", config.DefaultConfig.GetCacheDir()) // cache dir contains resume files
-	options.Logger.Info().Msgf("PDCP Directory: %s", pdcp.PDCPDir)
+	gologger.Info().Msgf("Nuclei Engine Version: %s", config.Version)
+	gologger.Info().Msgf("Nuclei Config Directory: %s", config.DefaultConfig.GetConfigDir())
+	gologger.Info().Msgf("Nuclei Cache Directory: %s", config.DefaultConfig.GetCacheDir()) // cache dir contains resume files
+	gologger.Info().Msgf("PDCP Directory: %s", pdcp.PDCPDir)
 	os.Exit(0)
 }
 
 // printTemplateVersion prints the nuclei template version and exits.
 func printTemplateVersion() {
 	cfg := config.DefaultConfig
-	options.Logger.Info().Msgf("Public nuclei-templates version: %s (%s)\n", cfg.TemplateVersion, cfg.TemplatesDirectory)
+	gologger.Info().Msgf("Public nuclei-templates version: %s (%s)\n", cfg.TemplateVersion, cfg.TemplatesDirectory)
 
 	if fileutil.FolderExists(cfg.CustomS3TemplatesDirectory) {
-		options.Logger.Info().Msgf("Custom S3 templates location: %s\n", cfg.CustomS3TemplatesDirectory)
+		gologger.Info().Msgf("Custom S3 templates location: %s\n", cfg.CustomS3TemplatesDirectory)
 	}
 	if fileutil.FolderExists(cfg.CustomGitHubTemplatesDirectory) {
-		options.Logger.Info().Msgf("Custom GitHub templates location: %s ", cfg.CustomGitHubTemplatesDirectory)
+		gologger.Info().Msgf("Custom GitHub templates location: %s ", cfg.CustomGitHubTemplatesDirectory)
 	}
 	if fileutil.FolderExists(cfg.CustomGitLabTemplatesDirectory) {
-		options.Logger.Info().Msgf("Custom GitLab templates location: %s ", cfg.CustomGitLabTemplatesDirectory)
+		gologger.Info().Msgf("Custom GitLab templates location: %s ", cfg.CustomGitLabTemplatesDirectory)
 	}
 	if fileutil.FolderExists(cfg.CustomAzureTemplatesDirectory) {
-		options.Logger.Info().Msgf("Custom Azure templates location: %s ", cfg.CustomAzureTemplatesDirectory)
+		gologger.Info().Msgf("Custom Azure templates location: %s ", cfg.CustomAzureTemplatesDirectory)
 	}
 	os.Exit(0)
 }
@@ -753,13 +708,13 @@ Following files will be deleted:
 Note: Make sure you have backup of your custom nuclei-templates before proceeding
 
 `, config.DefaultConfig.GetConfigDir(), config.DefaultConfig.TemplatesDirectory)
-	options.Logger.Print().Msg(warning)
+	gologger.Print().Msg(warning)
 	reader := bufio.NewReader(os.Stdin)
 	for {
 		fmt.Print("Are you sure you want to continue? [y/n]: ")
 		resp, err := reader.ReadString('\n')
 		if err != nil {
-			options.Logger.Fatal().Msgf("could not read response: %s", err)
+			gologger.Fatal().Msgf("could not read response: %s", err)
 		}
 		resp = strings.TrimSpace(resp)
 		if stringsutil.EqualFoldAny(resp, "y", "yes") {
@@ -772,13 +727,13 @@ Note: Make sure you have backup of your custom nuclei-templates before proceedin
 	}
 	err := os.RemoveAll(config.DefaultConfig.GetConfigDir())
 	if err != nil {
-		options.Logger.Fatal().Msgf("could not delete config dir: %s", err)
+		gologger.Fatal().Msgf("could not delete config dir: %s", err)
 	}
 	err = os.RemoveAll(config.DefaultConfig.TemplatesDirectory)
 	if err != nil {
-		options.Logger.Fatal().Msgf("could not delete templates dir: %s", err)
+		gologger.Fatal().Msgf("could not delete templates dir: %s", err)
 	}
-	options.Logger.Info().Msgf("Successfully deleted all nuclei configurations files and nuclei-templates")
+	gologger.Info().Msgf("Successfully deleted all nuclei configurations files and nuclei-templates")
 	os.Exit(0)
 }
 
@@ -798,7 +753,14 @@ func findProfilePathById(profileId, templatesDir string) string {
 		return nil
 	})
 	if err != nil && err.Error() != "FOUND" {
-		options.Logger.Error().Msgf("%s\n", err)
+		gologger.Error().Msgf("%s\n", err)
 	}
 	return profilePath
 }
+
+func init() {
+	// print stacktrace of errors in debug mode
+	if strings.EqualFold(os.Getenv("DEBUG"), "true") {
+		errorutil.ShowStackTrace = true
+	}
+}

cmd/nuclei/main_test.go

@@ -3,55 +3,28 @@ package main_test
 import (
 	"net/http"
 	"net/http/httptest"
-	"os"
 	"testing"
 	"time"
 
+	"github.com/projectdiscovery/goflags"
 	"github.com/projectdiscovery/gologger"
 	"github.com/projectdiscovery/gologger/levels"
 	"github.com/projectdiscovery/nuclei/v3/internal/runner"
 	"github.com/projectdiscovery/nuclei/v3/pkg/types"
 )
 
-var (
-	projectPath string
-	targetURL   string
-)
-
-func TestMain(m *testing.M) {
-	// Set up
-	gologger.DefaultLogger.SetMaxLevel(levels.LevelSilent)
-	_ = os.Setenv("DISABLE_STDOUT", "true")
-
-	var err error
-
-	projectPath, err = os.MkdirTemp("", "nuclei-benchmark-")
-	if err != nil {
-		panic(err)
-	}
-
+func BenchmarkRunEnumeration(b *testing.B) {
 	dummyServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusNoContent)
 	}))
-	targetURL = dummyServer.URL
+	defer dummyServer.Close()
 
-	// Execute tests
-
-	exitCode := m.Run()
-
-	// Tear down
-
-	dummyServer.Close()
-	_ = os.RemoveAll(projectPath)
-	_ = os.Unsetenv("DISABLE_STDOUT")
-
-	os.Exit(exitCode)
-}
-
-func getDefaultOptions() *types.Options {
-	return &types.Options{
-		RemoteTemplateDomainList:   []string{"cloud.projectdiscovery.io"},
-		ProjectPath:                projectPath,
+	options := &types.Options{
+		RemoteTemplateDomainList: goflags.StringSlice{
+			"cloud.projectdiscovery.io",
+		},
+		ProjectPath:                "/tmp",
+		Targets:                    goflags.StringSlice{dummyServer.URL},
 		StatsInterval:              5,
 		MetricsPort:                9092,
 		MaxHostError:               30,
@@ -92,45 +65,23 @@ func getDefaultOptions() *types.Options {
 		LoadHelperFileFunction:     types.DefaultOptions().LoadHelperFileFunction,
 		// DialerKeepAlive:            time.Duration(0),
 		// DASTServerAddress:          "localhost:9055",
-		ExecutionId: "test",
-		Logger:      gologger.DefaultLogger,
 	}
-}
 
-func runEnumBenchmark(b *testing.B, options *types.Options) {
 	runner.ParseOptions(options)
 
+	// Disable logging to reduce benchmark noise.
+	gologger.DefaultLogger.SetMaxLevel(levels.LevelSilent)
+
 	nucleiRunner, err := runner.New(options)
 	if err != nil {
 		b.Fatalf("failed to create runner: %s", err)
 	}
-	defer nucleiRunner.Close()
 
 	b.ResetTimer()
-	b.ReportAllocs()
 
 	for i := 0; i < b.N; i++ {
 		if err := nucleiRunner.RunEnumeration(); err != nil {
-			b.Fatalf("%s failed: %s", b.Name(), err)
+			b.Fatalf("RunEnumeration failed: %s", err)
 		}
 	}
 }
-
-func BenchmarkRunEnumeration(b *testing.B) {
-	// Default case: run enumeration with default options == all nuclei-templates
-	// b.Run("Default", func(b *testing.B) {
-	// 	options := getDefaultOptions()
-	// 	options.Targets = []string{targetURL}
-
-	// 	runEnumBenchmark(b, options)
-	// })
-
-	// Case: https://github.com/projectdiscovery/nuclei/pull/6258
-	b.Run("Multiproto", func(b *testing.B) {
-		options := getDefaultOptions()
-		options.Targets = []string{targetURL}
-		options.Templates = []string{"./cmd/nuclei/testdata/benchmark/multiproto/"}
-
-		runEnumBenchmark(b, options)
-	})
-}

cmd/nuclei/testdata/benchmark/multiproto/basic-template-multiproto-mixed.yaml

@@ -1,239 +0,0 @@
-id: basic-template-multiproto-mixed
-
-info:
-  name: Test Template Multiple Protocols (Mixed)
-  author: pdteam
-  severity: info
-
-http:
-  - method: GET
-    id: first_iter_http
-    path:
-      - '{{BaseURL}}/1'
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - method: GET
-    path:
-      - '{{BaseURL}}/2'
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - method: GET
-    path:
-      - '{{BaseURL}}/3'
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - method: GET
-    path:
-      - '{{BaseURL}}/4'
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - method: GET
-    path:
-      - '{{BaseURL}}/5'
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - method: GET
-    path:
-      - '{{BaseURL}}/6'
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - method: GET
-    path:
-      - '{{BaseURL}}/7'
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - method: GET
-    path:
-      - '{{BaseURL}}/8'
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - method: GET
-    path:
-      - '{{BaseURL}}/9'
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - raw:
-      - |
-        GET /10 HTTP/1.1
-        Host: {{Hostname}}
-        Origin: {{BaseURL}}
-        Connection: close
-        User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko)
-        Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8
-        Accept-Language: en-US,en;q=0.9
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - raw:
-      - |
-        GET /11 HTTP/1.1
-        Host: {{Hostname}}
-        Origin: {{BaseURL}}
-        Connection: close
-        User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko)
-        Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8
-        Accept-Language: en-US,en;q=0.9
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - raw:
-      - |
-        GET /12 HTTP/1.1
-        Host: {{Hostname}}
-        Origin: {{BaseURL}}
-        Connection: close
-        User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko)
-        Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8
-        Accept-Language: en-US,en;q=0.9
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - raw:
-      - |
-        GET /13 HTTP/1.1
-        Host: {{Hostname}}
-        Origin: {{BaseURL}}
-        Connection: close
-        User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko)
-        Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8
-        Accept-Language: en-US,en;q=0.9
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - raw:
-      - |
-        GET /14 HTTP/1.1
-        Host: {{Hostname}}
-        Origin: {{BaseURL}}
-        Connection: close
-        User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko)
-        Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8
-        Accept-Language: en-US,en;q=0.9
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - raw:
-      - |
-        GET / HTTP/1.1
-        Host: {{Hostname}}
-        Origin: {{BaseURL}}
-        Connection: close
-        User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko)
-        Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8
-        Accept-Language: en-US,en;q=0.9
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - raw:
-      - |
-        GET /15 HTTP/1.1
-        Host: {{Hostname}}
-        Origin: {{BaseURL}}
-        Connection: close
-        User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko)
-        Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8
-        Accept-Language: en-US,en;q=0.9
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - raw:
-      - |
-        GET /16 HTTP/1.1
-        Host: {{Hostname}}
-        Origin: {{BaseURL}}
-        Connection: close
-        User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko)
-        Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8
-        Accept-Language: en-US,en;q=0.9
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - raw:
-      - |
-        GET /17 HTTP/1.1
-        Host: {{Hostname}}
-        Origin: {{BaseURL}}
-        Connection: close
-        User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko)
-        Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8
-        Accept-Language: en-US,en;q=0.9
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - raw:
-      - |
-        GET /18 HTTP/1.1
-        Host: {{Hostname}}
-        Origin: {{BaseURL}}
-        Connection: close
-        User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko)
-        Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8
-        Accept-Language: en-US,en;q=0.9
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"

cmd/nuclei/testdata/benchmark/multiproto/basic-template-multiproto-raw.yaml

@@ -1,292 +0,0 @@
-id: basic-template-multiproto-raw
-
-info:
-  name: Test Template Multiple Protocols RAW
-  author: pdteam
-  severity: info
-
-http:
-  - raw:
-      - |
-        GET /1 HTTP/1.1
-        Host: {{Hostname}}
-        Origin: {{BaseURL}}
-        Connection: close
-        User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko)
-        Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8
-        Accept-Language: en-US,en;q=0.9
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - raw:
-      - |
-        GET /2 HTTP/1.1
-        Host: {{Hostname}}
-        Origin: {{BaseURL}}
-        Connection: close
-        User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko)
-        Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8
-        Accept-Language: en-US,en;q=0.9
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - raw:
-      - |
-        GET /3 HTTP/1.1
-        Host: {{Hostname}}
-        Origin: {{BaseURL}}
-        Connection: close
-        User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko)
-        Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8
-        Accept-Language: en-US,en;q=0.9
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - raw:
-      - |
-        GET /4 HTTP/1.1
-        Host: {{Hostname}}
-        Origin: {{BaseURL}}
-        Connection: close
-        User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko)
-        Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8
-        Accept-Language: en-US,en;q=0.9
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - raw:
-      - |
-        GET /5 HTTP/1.1
-        Host: {{Hostname}}
-        Origin: {{BaseURL}}
-        Connection: close
-        User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko)
-        Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8
-        Accept-Language: en-US,en;q=0.9
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - raw:
-      - |
-        GET /6 HTTP/1.1
-        Host: {{Hostname}}
-        Origin: {{BaseURL}}
-        Connection: close
-        User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko)
-        Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8
-        Accept-Language: en-US,en;q=0.9
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - raw:
-      - |
-        GET /7 HTTP/1.1
-        Host: {{Hostname}}
-        Origin: {{BaseURL}}
-        Connection: close
-        User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko)
-        Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8
-        Accept-Language: en-US,en;q=0.9
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - raw:
-      - |
-        GET /8 HTTP/1.1
-        Host: {{Hostname}}
-        Origin: {{BaseURL}}
-        Connection: close
-        User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko)
-        Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8
-        Accept-Language: en-US,en;q=0.9
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - raw:
-      - |
-        GET /9 HTTP/1.1
-        Host: {{Hostname}}
-        Origin: {{BaseURL}}
-        Connection: close
-        User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko)
-        Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8
-        Accept-Language: en-US,en;q=0.9
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - raw:
-      - |
-        GET /10 HTTP/1.1
-        Host: {{Hostname}}
-        Origin: {{BaseURL}}
-        Connection: close
-        User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko)
-        Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8
-        Accept-Language: en-US,en;q=0.9
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - raw:
-      - |
-        GET /11 HTTP/1.1
-        Host: {{Hostname}}
-        Origin: {{BaseURL}}
-        Connection: close
-        User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko)
-        Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8
-        Accept-Language: en-US,en;q=0.9
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - raw:
-      - |
-        GET /12 HTTP/1.1
-        Host: {{Hostname}}
-        Origin: {{BaseURL}}
-        Connection: close
-        User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko)
-        Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8
-        Accept-Language: en-US,en;q=0.9
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - raw:
-      - |
-        GET /13 HTTP/1.1
-        Host: {{Hostname}}
-        Origin: {{BaseURL}}
-        Connection: close
-        User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko)
-        Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8
-        Accept-Language: en-US,en;q=0.9
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - raw:
-      - |
-        GET /14 HTTP/1.1
-        Host: {{Hostname}}
-        Origin: {{BaseURL}}
-        Connection: close
-        User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko)
-        Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8
-        Accept-Language: en-US,en;q=0.9
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - raw:
-      - |
-        GET / HTTP/1.1
-        Host: {{Hostname}}
-        Origin: {{BaseURL}}
-        Connection: close
-        User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko)
-        Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8
-        Accept-Language: en-US,en;q=0.9
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - raw:
-      - |
-        GET /15 HTTP/1.1
-        Host: {{Hostname}}
-        Origin: {{BaseURL}}
-        Connection: close
-        User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko)
-        Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8
-        Accept-Language: en-US,en;q=0.9
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - raw:
-      - |
-        GET /16 HTTP/1.1
-        Host: {{Hostname}}
-        Origin: {{BaseURL}}
-        Connection: close
-        User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko)
-        Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8
-        Accept-Language: en-US,en;q=0.9
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - raw:
-      - |
-        GET /17 HTTP/1.1
-        Host: {{Hostname}}
-        Origin: {{BaseURL}}
-        Connection: close
-        User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko)
-        Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8
-        Accept-Language: en-US,en;q=0.9
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - raw:
-      - |
-        GET /18 HTTP/1.1
-        Host: {{Hostname}}
-        Origin: {{BaseURL}}
-        Connection: close
-        User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko)
-        Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8
-        Accept-Language: en-US,en;q=0.9
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"

cmd/nuclei/testdata/benchmark/multiproto/basic-template-multiproto.yaml

@@ -1,170 +0,0 @@
-id: basic-template-multiproto
-
-info:
-  name: Test Template Multiple Protocols
-  author: pdteam
-  severity: info
-
-http:
-  - method: GET
-    id: first_iter_http
-    path:
-      - '{{BaseURL}}/1'
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - method: GET
-    path:
-      - '{{BaseURL}}/2'
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - method: GET
-    path:
-      - '{{BaseURL}}/3'
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - method: GET
-    path:
-      - '{{BaseURL}}/4'
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - method: GET
-    path:
-      - '{{BaseURL}}/5'
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - method: GET
-    path:
-      - '{{BaseURL}}/6'
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - method: GET
-    path:
-      - '{{BaseURL}}/7'
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - method: GET
-    path:
-      - '{{BaseURL}}/8'
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - method: GET
-    path:
-      - '{{BaseURL}}/9'
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - method: GET
-    path:
-      - '{{BaseURL}}/10'
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - method: GET
-    path:
-      - '{{BaseURL}}/11'
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - method: GET
-    path:
-      - '{{BaseURL}}/12'
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - method: GET
-    path:
-      - '{{BaseURL}}/13'
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - method: GET
-    path:
-      - '{{BaseURL}}/14'
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - method: GET
-    path:
-      - '{{BaseURL}}/15'
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - method: GET
-    path:
-      - '{{BaseURL}}/16'
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - method: GET
-    path:
-      - '{{BaseURL}}/17'
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"
-
-  - method: GET
-    path:
-      - '{{BaseURL}}/18'
-
-    matchers:
-      - type: word
-        words:
-          - "Test is test matcher text"

cmd/tmc/main.go

@@ -23,7 +23,7 @@ import (
 	"github.com/projectdiscovery/nuclei/v3/pkg/types"
 	"github.com/projectdiscovery/nuclei/v3/pkg/utils/json"
 	"github.com/projectdiscovery/retryablehttp-go"
-	"github.com/projectdiscovery/utils/errkit"
+	errorutil "github.com/projectdiscovery/utils/errors"
 	"gopkg.in/yaml.v3"
 )
 
@@ -65,6 +65,7 @@ func init() {
 		allTagsRegex = append(allTagsRegex, re)
 	}
 
+	defaultOpts := types.DefaultOptions()
 	// need to set headless to true for headless templates
 	defaultOpts.Headless = true
 	defaultOpts.EnableCodeTemplates = true
@@ -131,13 +132,11 @@ func main() {
 }
 
 func process(opts options) error {
-	tempDir, err := os.MkdirTemp("", "nuclei-nvd")
+	tempDir, err := os.MkdirTemp("", "nuclei-nvd-%s")
 	if err != nil {
 		return err
 	}
-	defer func() {
-		_ = os.RemoveAll(tempDir)
-	}()
+	defer os.RemoveAll(tempDir)
 
 	var errFile *os.File
 	if opts.errorLogFile != "" {
@@ -145,9 +144,7 @@ func process(opts options) error {
 		if err != nil {
 			gologger.Fatal().Msgf("could not open error log file: %s\n", err)
 		}
-		defer func() {
-			_ = errFile.Close()
-		}()
+		defer errFile.Close()
 	}
 
 	templateCatalog := disk.NewCatalog(filepath.Dir(opts.input))
@@ -230,7 +227,7 @@ func logErrMsg(path string, err error, debug bool, errFile *os.File) string {
 		msg = fmt.Sprintf("❌ template: %s err: %s\n", path, err)
 	}
 	if errFile != nil {
-		_, _ = fmt.Fprintf(errFile, "❌ template: %s err: %s\n", path, err)
+		_, _ = errFile.WriteString(fmt.Sprintf("❌ template: %s err: %s\n", path, err))
 	}
 	return msg
 }
@@ -243,7 +240,7 @@ func enhanceTemplate(data string) (string, bool, error) {
 		return data, false, err
 	}
 	if resp.StatusCode != 200 {
-		return data, false, errkit.New("unexpected status code: %v", resp.Status)
+		return data, false, errorutil.New("unexpected status code: %v", resp.Status)
 	}
 	var templateResp TemplateResp
 	if err := json.NewDecoder(resp.Body).Decode(&templateResp); err != nil {
@@ -254,20 +251,20 @@ func enhanceTemplate(data string) (string, bool, error) {
 	}
 	if templateResp.ValidateErrorCount > 0 {
 		if len(templateResp.ValidateError) > 0 {
-			return data, false, errkit.New(templateResp.ValidateError[0].Message+": at line %v", templateResp.ValidateError[0].Mark.Line, "tag", "validate")
+			return data, false, errorutil.NewWithTag("validate", templateResp.ValidateError[0].Message+": at line %v", templateResp.ValidateError[0].Mark.Line)
 		}
-		return data, false, errkit.New("validation failed", "tag", "validate")
+		return data, false, errorutil.New("validation failed").WithTag("validate")
 	}
 	if templateResp.Error.Name != "" {
-		return data, false, errkit.New("%s", templateResp.Error.Name)
+		return data, false, errorutil.New("%s", templateResp.Error.Name)
 	}
 	if strings.TrimSpace(templateResp.Enhanced) == "" && !templateResp.Lint {
 		if templateResp.LintError.Reason != "" {
-			return data, false, errkit.New(templateResp.LintError.Reason+" : at line %v", templateResp.LintError.Mark.Line, "tag", "lint")
+			return data, false, errorutil.NewWithTag("lint", templateResp.LintError.Reason+" : at line %v", templateResp.LintError.Mark.Line)
 		}
-		return data, false, errkit.New("at line: %v", templateResp.LintError.Mark.Line, "tag", "lint")
+		return data, false, errorutil.NewWithTag("lint", "at line: %v", templateResp.LintError.Mark.Line)
 	}
-	return data, false, errkit.New("template enhance failed")
+	return data, false, errorutil.New("template enhance failed")
 }
 
 // formatTemplate formats template data using templateman format api
@@ -277,7 +274,7 @@ func formatTemplate(data string) (string, bool, error) {
 		return data, false, err
 	}
 	if resp.StatusCode != 200 {
-		return data, false, errkit.New("unexpected status code: %v", resp.Status)
+		return data, false, errorutil.New("unexpected status code: %v", resp.Status)
 	}
 	var templateResp TemplateResp
 	if err := json.NewDecoder(resp.Body).Decode(&templateResp); err != nil {
@@ -288,20 +285,20 @@ func formatTemplate(data string) (string, bool, error) {
 	}
 	if templateResp.ValidateErrorCount > 0 {
 		if len(templateResp.ValidateError) > 0 {
-			return data, false, errkit.New(templateResp.ValidateError[0].Message+": at line %v", templateResp.ValidateError[0].Mark.Line, "tag", "validate")
+			return data, false, errorutil.NewWithTag("validate", templateResp.ValidateError[0].Message+": at line %v", templateResp.ValidateError[0].Mark.Line)
 		}
-		return data, false, errkit.New("validation failed", "tag", "validate")
+		return data, false, errorutil.New("validation failed").WithTag("validate")
 	}
 	if templateResp.Error.Name != "" {
-		return data, false, errkit.New("%s", templateResp.Error.Name)
+		return data, false, errorutil.New("%s", templateResp.Error.Name)
 	}
 	if strings.TrimSpace(templateResp.Updated) == "" && !templateResp.Lint {
 		if templateResp.LintError.Reason != "" {
-			return data, false, errkit.New(templateResp.LintError.Reason+" : at line %v", templateResp.LintError.Mark.Line, "tag", "lint")
+			return data, false, errorutil.NewWithTag("lint", templateResp.LintError.Reason+" : at line %v", templateResp.LintError.Mark.Line)
 		}
-		return data, false, errkit.New("at line: %v", templateResp.LintError.Mark.Line, "tag", "lint")
+		return data, false, errorutil.NewWithTag("lint", "at line: %v", templateResp.LintError.Mark.Line)
 	}
-	return data, false, errkit.New("template format failed")
+	return data, false, errorutil.New("template format failed")
 }
 
 // lintTemplate lints template data using templateman lint api
@@ -311,7 +308,7 @@ func lintTemplate(data string) (bool, error) {
 		return false, err
 	}
 	if resp.StatusCode != 200 {
-		return false, errkit.New("unexpected status code: %v", resp.Status)
+		return false, errorutil.New("unexpected status code: %v", resp.Status)
 	}
 	var lintResp TemplateLintResp
 	if err := json.NewDecoder(resp.Body).Decode(&lintResp); err != nil {
@@ -321,9 +318,9 @@ func lintTemplate(data string) (bool, error) {
 		return true, nil
 	}
 	if lintResp.LintError.Reason != "" {
-		return false, errkit.New(lintResp.LintError.Reason+" : at line %v", lintResp.LintError.Mark.Line, "tag", "lint")
+		return false, errorutil.NewWithTag("lint", lintResp.LintError.Reason+" : at line %v", lintResp.LintError.Mark.Line)
 	}
-	return false, errkit.New("at line: %v", lintResp.LintError.Mark.Line, "tag", "lint")
+	return false, errorutil.NewWithTag("lint", "at line: %v", lintResp.LintError.Mark.Line)
 }
 
 // validateTemplate validates template data using templateman validate api
@@ -333,7 +330,7 @@ func validateTemplate(data string) (bool, error) {
 		return false, err
 	}
 	if resp.StatusCode != 200 {
-		return false, errkit.New("unexpected status code: %v", resp.Status)
+		return false, errorutil.New("unexpected status code: %v", resp.Status)
 	}
 	var validateResp TemplateResp
 	if err := json.NewDecoder(resp.Body).Decode(&validateResp); err != nil {
@@ -344,14 +341,14 @@ func validateTemplate(data string) (bool, error) {
 	}
 	if validateResp.ValidateErrorCount > 0 {
 		if len(validateResp.ValidateError) > 0 {
-			return false, errkit.New(validateResp.ValidateError[0].Message+": at line %v", validateResp.ValidateError[0].Mark.Line, "tag", "validate")
+			return false, errorutil.NewWithTag("validate", validateResp.ValidateError[0].Message+": at line %v", validateResp.ValidateError[0].Mark.Line)
 		}
-		return false, errkit.New("validation failed", "tag", "validate")
+		return false, errorutil.New("validation failed").WithTag("validate")
 	}
 	if validateResp.Error.Name != "" {
-		return false, errkit.New("%s", validateResp.Error.Name)
+		return false, errorutil.New("%s", validateResp.Error.Name)
 	}
-	return false, errkit.New("template validation failed")
+	return false, errorutil.New("template validation failed")
 }
 
 // parseAndAddMaxRequests parses and adds max requests to templates
@@ -401,7 +398,7 @@ func parseAndAddMaxRequests(catalog catalog.Catalog, path, data string) (string,
 
 // parseTemplate parses a template and returns the template object
 func parseTemplate(catalog catalog.Catalog, templatePath string) (*templates.Template, error) {
-	executorOpts := &protocols.ExecutorOptions{
+	executorOpts := protocols.ExecutorOptions{
 		Catalog: catalog,
 		Options: defaultOpts,
 	}

cmd/tools/fuzzplayground/main.go

@@ -18,9 +18,7 @@ func main() {
 
 	defer fuzzplayground.Cleanup()
 	server := fuzzplayground.GetPlaygroundServer()
-	defer func() {
-		_ = server.Close()
-	}()
+	defer server.Close()
 
 	// Start the server
 	if err := server.Start(addr); err != nil {

cmd/tools/signer/main.go

@@ -99,12 +99,12 @@ func main() {
 	gologger.Info().Msgf("✓ Template signed & verified successfully")
 }
 
-func defaultExecutorOpts(templatePath string) *protocols.ExecutorOptions {
+func defaultExecutorOpts(templatePath string) protocols.ExecutorOptions {
 	// use parsed options when initializing signer instead of default options
 	options := types.DefaultOptions()
 	templates.UseOptionsForSigner(options)
 	catalog := disk.NewCatalog(filepath.Dir(templatePath))
-	executerOpts := &protocols.ExecutorOptions{
+	executerOpts := protocols.ExecutorOptions{
 		Catalog:      catalog,
 		Options:      options,
 		TemplatePath: templatePath,

examples/with_speed_control/main.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"context"
 	"log"
 	"sync"
 	"time"
@@ -35,7 +34,7 @@ func main() {
 }
 
 func initializeNucleiEngine() (*nuclei.NucleiEngine, error) {
-	return nuclei.NewNucleiEngineCtx(context.TODO(),
+	return nuclei.NewNucleiEngine(
 		nuclei.WithTemplateFilters(nuclei.TemplateFilters{Tags: []string{"oast"}}),
 		nuclei.EnableStatsWithOpts(nuclei.StatsOptions{MetricServerPort: 6064}),
 		nuclei.WithGlobalRateLimit(1, time.Second),

go.mod

@@ -1,431 +1,387 @@
 module github.com/projectdiscovery/nuclei/v3
 
-go 1.24.2
-
-toolchain go1.24.4
+go 1.22.2
 
 require (
 	github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible
-	github.com/andygrunwald/go-jira v1.16.1
-	github.com/antchfx/htmlquery v1.3.4
+	github.com/andygrunwald/go-jira v1.16.0
+	github.com/antchfx/htmlquery v1.3.0
 	github.com/bluele/gcache v0.0.2
-	github.com/go-playground/validator/v10 v10.26.0
-	github.com/go-rod/rod v0.116.2
-	github.com/gobwas/ws v1.4.0
+	github.com/go-playground/validator/v10 v10.14.1
+	github.com/go-rod/rod v0.114.0
+	github.com/gobwas/ws v1.2.1
 	github.com/google/go-github v17.0.0+incompatible
-	github.com/invopop/jsonschema v0.13.0
-	github.com/itchyny/gojq v0.12.17
+	github.com/invopop/jsonschema v0.12.0
+	github.com/itchyny/gojq v0.12.13
 	github.com/json-iterator/go v1.1.12
 	github.com/julienschmidt/httprouter v1.3.0
 	github.com/logrusorgru/aurora v2.0.3+incompatible
-	github.com/miekg/dns v1.1.68
-	github.com/olekukonko/tablewriter v1.0.8
+	github.com/miekg/dns v1.1.62
+	github.com/olekukonko/tablewriter v0.0.5
 	github.com/pkg/errors v0.9.1
 	github.com/projectdiscovery/clistats v0.1.1
-	github.com/projectdiscovery/fastdialer v0.4.15
-	github.com/projectdiscovery/hmap v0.0.95
+	github.com/projectdiscovery/fastdialer v0.4.0
+	github.com/projectdiscovery/hmap v0.0.85
 	github.com/projectdiscovery/interactsh v1.2.4
 	github.com/projectdiscovery/rawhttp v0.1.90
-	github.com/projectdiscovery/retryabledns v1.0.108
-	github.com/projectdiscovery/retryablehttp-go v1.0.131
+	github.com/projectdiscovery/retryabledns v1.0.96
+	github.com/projectdiscovery/retryablehttp-go v1.0.102
 	github.com/projectdiscovery/yamldoc-go v1.0.6
 	github.com/remeh/sizedwaitgroup v1.0.0
-	github.com/rs/xid v1.6.0
+	github.com/rs/xid v1.5.0
 	github.com/segmentio/ksuid v1.0.4
-	github.com/shirou/gopsutil/v3 v3.24.5 // indirect
+	github.com/shirou/gopsutil/v3 v3.24.2 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
-	github.com/spf13/cast v1.9.2
+	github.com/spf13/cast v1.5.1
 	github.com/syndtr/goleveldb v1.0.0
 	github.com/valyala/fasttemplate v1.2.2
-	github.com/weppos/publicsuffix-go v0.50.0
+	github.com/weppos/publicsuffix-go v0.30.2
+	github.com/xanzy/go-gitlab v0.107.0
 	go.uber.org/multierr v1.11.0
-	golang.org/x/net v0.46.0
-	golang.org/x/oauth2 v0.30.0
-	golang.org/x/text v0.30.0
+	golang.org/x/net v0.35.0
+	golang.org/x/oauth2 v0.22.0
+	golang.org/x/text v0.22.0
 	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
-	carvel.dev/ytt v0.52.0
 	code.gitea.io/sdk/gitea v0.17.0
-	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1
+	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0
 	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.1.0
-	github.com/DataDog/gostackparse v0.7.0
+	github.com/DataDog/gostackparse v0.6.0
 	github.com/Masterminds/semver/v3 v3.2.1
 	github.com/Mzack9999/gcache v0.0.0-20230410081825-519e28eab057
-	github.com/Mzack9999/goja v0.0.0-20250507184235-e46100e9c697
-	github.com/Mzack9999/goja_nodejs v0.0.0-20250507184139-66bcbf65c883
-	github.com/alexsnet/go-vnc v0.1.0
 	github.com/alitto/pond v1.9.2
-	github.com/antchfx/xmlquery v1.4.4
-	github.com/antchfx/xpath v1.3.3
+	github.com/antchfx/xmlquery v1.3.17
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
-	github.com/aws/aws-sdk-go-v2 v1.36.5
-	github.com/aws/aws-sdk-go-v2/config v1.29.17
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.70
-	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.82
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.82.0
-	github.com/bytedance/sonic v1.14.0
+	github.com/aws/aws-sdk-go-v2 v1.19.0
+	github.com/aws/aws-sdk-go-v2/config v1.18.28
+	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/bytedance/sonic v1.12.8
 	github.com/cespare/xxhash v1.1.0
-	github.com/charmbracelet/glamour v0.10.0
+	github.com/charmbracelet/glamour v0.8.0
 	github.com/clbanning/mxj/v2 v2.7.0
 	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.132.0
-	github.com/go-git/go-git/v5 v5.16.2
-	github.com/go-ldap/ldap/v3 v3.4.11
-	github.com/go-pg/pg/v10 v10.15.0
-	github.com/go-sql-driver/mysql v1.9.3
+	github.com/getkin/kin-openapi v0.126.0
+	github.com/go-git/go-git/v5 v5.13.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/goccy/go-json v0.10.5
-	github.com/google/uuid v1.6.0
 	github.com/h2non/filetype v1.1.3
 	github.com/invopop/yaml v0.3.1
-	github.com/jcmturner/gokrb5/v8 v8.4.4
 	github.com/kitabisa/go-ci v1.0.3
-	github.com/labstack/echo/v4 v4.13.4
+	github.com/labstack/echo/v4 v4.12.0
 	github.com/leslie-qiwa/flat v0.0.0-20230424180412-f9d1cf014baa
 	github.com/lib/pq v1.10.9
-	github.com/mattn/go-sqlite3 v1.14.28
-	github.com/mholt/archives v0.1.5
-	github.com/microsoft/go-mssqldb v1.9.2
-	github.com/ory/dockertest/v3 v3.12.0
-	github.com/praetorian-inc/fingerprintx v1.1.15
-	github.com/projectdiscovery/dsl v0.8.4
+	github.com/mattn/go-sqlite3 v1.14.22
+	github.com/mholt/archives v0.1.0
+	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.3.21
 	github.com/projectdiscovery/fasttemplate v0.0.2
-	github.com/projectdiscovery/gcache v0.0.0-20241015120333-12546c6e3f4c
 	github.com/projectdiscovery/go-smb2 v0.0.0-20240129202741-052cc450c6cb
 	github.com/projectdiscovery/goflags v0.1.74
-	github.com/projectdiscovery/gologger v1.1.59
+	github.com/projectdiscovery/gologger v1.1.49
 	github.com/projectdiscovery/gostruct v0.0.2
-	github.com/projectdiscovery/gozero v0.1.1-0.20251027191944-a4ea43320b81
-	github.com/projectdiscovery/httpx v1.7.2-0.20250911192144-fc425deb041a
-	github.com/projectdiscovery/mapcidr v1.1.97
+	github.com/projectdiscovery/gozero v0.0.3
+	github.com/projectdiscovery/httpx v1.6.10
+	github.com/projectdiscovery/mapcidr v1.1.34
+	github.com/projectdiscovery/martian/v3 v3.0.0-20240219194442-fed3b744f477
 	github.com/projectdiscovery/n3iwf v0.0.0-20230523120440-b8cd232ff1f5
-	github.com/projectdiscovery/networkpolicy v0.1.27
-	github.com/projectdiscovery/ratelimit v0.0.82
-	github.com/projectdiscovery/rdap v0.9.0
+	github.com/projectdiscovery/proxify v0.0.15
+	github.com/projectdiscovery/ratelimit v0.0.77
+	github.com/projectdiscovery/rdap v0.9.1-0.20221108103045-9865884d1917
 	github.com/projectdiscovery/sarif v0.0.1
-	github.com/projectdiscovery/tlsx v1.2.1
-	github.com/projectdiscovery/uncover v1.1.0
-	github.com/projectdiscovery/useragent v0.0.102
-	github.com/projectdiscovery/utils v0.6.1-0.20251030144701-ce5c4b44e1e6
-	github.com/projectdiscovery/wappalyzergo v0.2.54
-	github.com/redis/go-redis/v9 v9.11.0
+	github.com/projectdiscovery/tlsx v1.1.9
+	github.com/projectdiscovery/uncover v1.0.10
+	github.com/projectdiscovery/useragent v0.0.97
+	github.com/projectdiscovery/utils v0.4.15
+	github.com/projectdiscovery/wappalyzergo v0.2.21
+	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/sijms/go-ora/v2 v2.9.0
-	github.com/stretchr/testify v1.11.1
+	github.com/stretchr/testify v1.10.0
 	github.com/tarunKoyalwar/goleak v0.0.0-20240429141123-0efa90dbdcf9
-	github.com/testcontainers/testcontainers-go v0.38.0
-	github.com/testcontainers/testcontainers-go/modules/mongodb v0.37.0
-	github.com/yassinebenaid/godump v0.11.1
-	github.com/zmap/zgrab2 v0.1.8
-	gitlab.com/gitlab-org/api/client-go v0.130.1
-	go.mongodb.org/mongo-driver v1.17.4
-	golang.org/x/term v0.36.0
+	github.com/yassinebenaid/godump v0.10.0
+	github.com/zmap/zgrab2 v0.1.8-0.20230806160807-97ba87c0e706
+	go.mongodb.org/mongo-driver v1.17.0
+	golang.org/x/term v0.29.0
 	gopkg.in/yaml.v3 v3.0.1
 	moul.io/http2curl v1.0.0
 )
 
 require (
 	aead.dev/minisign v0.2.0 // indirect
-	dario.cat/mergo v1.0.2 // indirect
-	filippo.io/edwards25519 v1.1.0 // indirect
-	git.mills.io/prologic/smtpd v0.0.0-20210710122116-a525b76c287a // indirect
-	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0 // indirect
-	github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 // indirect
-	github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
+	dario.cat/mergo v1.0.0 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0 // indirect
+	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
 	github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
-	github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect
-	github.com/BurntSushi/toml v1.3.2 // indirect
-	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/Mzack9999/go-http-digest-auth-client v0.6.1-0.20220414142836-eb8883508809 // indirect
+	github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
 	github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
-	github.com/ProtonMail/go-crypto v1.1.6 // indirect
-	github.com/PuerkitoBio/goquery v1.10.3 // indirect
-	github.com/STARRY-S/zip v0.2.3 // indirect
+	github.com/STARRY-S/zip v0.2.1 // indirect
+	github.com/Shopify/sarama v1.38.1 // indirect
 	github.com/VividCortex/ewma v1.2.0 // indirect
-	github.com/akrylysov/pogreb v0.10.2 // indirect
 	github.com/alecthomas/chroma/v2 v2.14.0 // indirect
-	github.com/alecthomas/kingpin/v2 v2.4.0 // indirect
-	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
-	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
-	github.com/andybalholm/brotli v1.2.0 // indirect
-	github.com/andybalholm/cascadia v1.3.3 // indirect
-	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.11 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.32 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.36 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.36 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.36 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.17 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.17 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.25.5 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.3 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.34.0 // indirect
-	github.com/aws/smithy-go v1.22.4 // indirect
+	github.com/andybalholm/brotli v1.1.1 // indirect
+	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 // indirect
+	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.27 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.30 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.4 // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
-	github.com/aymerick/douceur v0.2.0 // indirect
 	github.com/bahlo/generic-list-go v0.2.0 // indirect
 	github.com/bits-and-blooms/bitset v1.13.0 // indirect
 	github.com/bits-and-blooms/bloom/v3 v3.5.0 // indirect
 	github.com/bodgit/plumbing v1.3.0 // indirect
-	github.com/bodgit/sevenzip v1.6.1 // indirect
+	github.com/bodgit/sevenzip v1.6.0 // indirect
 	github.com/bodgit/windows v1.0.1 // indirect
-	github.com/brianvoe/gofakeit/v7 v7.2.1 // indirect
 	github.com/buger/jsonparser v1.1.1 // indirect
-	github.com/bytedance/sonic/loader v0.3.0 // indirect
-	github.com/caddyserver/certmagic v0.19.2 // indirect
-	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
-	github.com/cenkalti/backoff/v5 v5.0.3 // indirect
-	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
-	github.com/charmbracelet/lipgloss v1.1.1-0.20250404203927-76690c660834 // indirect
-	github.com/charmbracelet/x/ansi v0.8.0 // indirect
-	github.com/charmbracelet/x/cellbuf v0.0.13 // indirect
-	github.com/charmbracelet/x/exp/slice v0.0.0-20250327172914-2fdc97757edf // indirect
-	github.com/charmbracelet/x/term v0.2.1 // indirect
-	github.com/cheggaaa/pb/v3 v3.1.6 // indirect
+	github.com/bytedance/sonic/loader v0.2.2 // indirect
+	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/charmbracelet/lipgloss v0.13.0 // indirect
+	github.com/charmbracelet/x/ansi v0.3.2 // indirect
+	github.com/cheggaaa/pb/v3 v3.1.4 // indirect
 	github.com/cloudflare/cfssl v1.6.4 // indirect
-	github.com/cloudflare/circl v1.6.1 // indirect
+	github.com/cloudflare/circl v1.3.8 // indirect
 	github.com/cloudwego/base64x v0.1.5 // indirect
-	github.com/cnf/structhash v0.0.0-20250313080605-df4c6cc74a9a // indirect
-	github.com/containerd/continuity v0.4.5 // indirect
-	github.com/containerd/errdefs v1.0.0 // indirect
-	github.com/containerd/errdefs/pkg v0.3.0 // indirect
-	github.com/containerd/log v0.1.0 // indirect
-	github.com/containerd/platforms v0.2.1 // indirect
-	github.com/cpuguy83/dockercfg v0.3.2 // indirect
-	github.com/cyphar/filepath-securejoin v0.5.1 // indirect
-	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/containerd/continuity v0.4.2 // indirect
+	github.com/cyphar/filepath-securejoin v0.2.5 // indirect
 	github.com/davidmz/go-pageant v1.0.2 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
-	github.com/distribution/reference v0.6.0 // indirect
-	github.com/dlclark/regexp2 v1.11.5 // indirect
-	github.com/docker/cli v27.4.1+incompatible // indirect
-	github.com/docker/docker v28.3.3+incompatible // indirect
-	github.com/docker/go-connections v0.6.0 // indirect
-	github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 // indirect
-	github.com/ebitengine/purego v0.8.4 // indirect
-	github.com/emirpasic/gods v1.18.1 // indirect
-	github.com/fatih/color v1.18.0 // indirect
+	github.com/dlclark/regexp2 v1.11.4 // indirect
+	github.com/docker/cli v24.0.5+incompatible // indirect
+	github.com/docker/docker v24.0.9+incompatible // indirect
+	github.com/docker/go-connections v0.4.0 // indirect
+	github.com/eapache/go-resiliency v1.3.0 // indirect
+	github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6 // indirect
+	github.com/eapache/queue v1.1.0 // indirect
+	github.com/elastic/go-elasticsearch/v7 v7.17.10 // indirect
+	github.com/fatih/color v1.16.0 // indirect
 	github.com/felixge/fgprof v0.9.5 // indirect
-	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/free5gc/util v1.0.5-0.20230511064842-2e120956883b // indirect
-	github.com/gabriel-vasile/mimetype v1.4.8 // indirect
-	github.com/gaissmai/bart v0.26.0 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
+	github.com/gaissmai/bart v0.17.10 // indirect
 	github.com/geoffgarside/ber v1.1.0 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/gin-gonic/gin v1.9.1 // indirect
-	github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667 // indirect
+	github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
 	github.com/go-fed/httpsig v1.1.0 // indirect
-	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
-	github.com/go-git/go-billy/v5 v5.6.2 // indirect
-	github.com/go-logr/logr v1.4.3 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/swag v0.23.0 // indirect
-	github.com/go-pg/zerochecker v0.2.0 // indirect
-	github.com/go-playground/locales v0.14.1 // indirect
-	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-sourcemap/sourcemap v2.1.4+incompatible // indirect
-	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
+	github.com/goccy/go-yaml v1.11.3 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang-jwt/jwt/v5 v5.2.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/sqlexp v0.1.0 // indirect
-	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
-	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/certificate-transparency-go v1.3.2 // indirect
+	github.com/google/certificate-transparency-go v1.1.4 // indirect
 	github.com/google/go-github/v30 v30.1.0 // indirect
-	github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
+	github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
-	github.com/gorilla/css v1.0.1 // indirect
-	github.com/gosimple/slug v1.15.0 // indirect
-	github.com/gosimple/unidecode v1.0.1 // indirect
-	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-uuid v1.0.3 // indirect
-	github.com/hashicorp/go-version v1.7.0 // indirect
+	github.com/hashicorp/go-version v1.6.0 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
+	github.com/haxii/fastproxy v0.5.37 // indirect
 	github.com/hbakhtiyor/strsim v0.0.0-20190107154042-4d2bbb273edf // indirect
-	github.com/hdm/jarm-go v0.0.7 // indirect
-	github.com/iangcarroll/cookiemonster v1.6.0 // indirect
-	github.com/imdario/mergo v0.3.16 // indirect
-	github.com/itchyny/timefmt-go v0.1.6 // indirect
-	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // 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
 	github.com/jcmturner/rpc/v2 v2.0.3 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
-	github.com/k14s/starlark-go v0.0.0-20200720175618-3a5c849cc368 // indirect
 	github.com/kataras/jwt v0.1.10 // indirect
-	github.com/kevinburke/ssh_config v1.2.0 // indirect
-	github.com/klauspost/compress v1.18.1 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
+	github.com/klauspost/compress v1.17.11 // indirect
 	github.com/klauspost/pgzip v1.2.6 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
-	github.com/labstack/gommon v0.4.2 // indirect
-	github.com/leodido/go-urn v1.4.0 // indirect
-	github.com/libdns/libdns v0.2.1 // indirect
 	github.com/logrusorgru/aurora/v4 v4.0.0 // indirect
-	github.com/lor00x/goldap v0.0.0-20180618054307-a546dffdd1a3 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
-	github.com/lufia/plan9stats v0.0.0-20250821153705-5981dea3221d // indirect
 	github.com/mackerelio/go-osstat v0.2.4 // indirect
-	github.com/magiconair/properties v1.8.10 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-colorable v0.1.14 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-runewidth v0.0.16 // indirect
-	github.com/mholt/acmez v1.2.0 // indirect
-	github.com/microcosm-cc/bluemonday v1.0.27 // indirect
-	github.com/mikelolasagasti/xz v1.0.1 // indirect
-	github.com/minio/minlz v1.0.1 // indirect
+	github.com/mholt/archiver/v3 v3.5.1 // indirect
 	github.com/minio/selfupdate v0.6.1-0.20230907112617-f11e74f84ca7 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/moby/docker-image-spec v1.3.1 // indirect
-	github.com/moby/go-archive v0.1.0 // indirect
-	github.com/moby/patternmatcher v0.6.0 // indirect
-	github.com/moby/sys/sequential v0.6.0 // indirect
-	github.com/moby/sys/user v0.4.0 // indirect
-	github.com/moby/sys/userns v0.1.0 // indirect
-	github.com/moby/term v0.5.2 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/moby/term v0.5.0 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/montanaflynn/stats v0.7.1 // indirect
-	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/muesli/reflow v0.3.0 // indirect
-	github.com/muesli/termenv v0.16.0 // indirect
-	github.com/nwaples/rardecode/v2 v2.2.1 // indirect
-	github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 // indirect
-	github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect
-	github.com/olekukonko/errors v1.1.0 // indirect
-	github.com/olekukonko/ll v0.0.9 // indirect
+	github.com/muesli/termenv v0.15.3-0.20240618155329-98d742f6907a // indirect
+	github.com/nwaples/rardecode/v2 v2.0.1 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.1.1 // indirect
-	github.com/opencontainers/runc v1.2.8 // indirect
-	github.com/openrdap/rdap v0.9.1 // indirect
+	github.com/opencontainers/image-spec v1.0.2 // indirect
+	github.com/opencontainers/runc v1.1.14 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
 	github.com/perimeterx/marshmallow v1.1.5 // indirect
 	github.com/pierrec/lz4/v4 v4.1.22 // indirect
-	github.com/pjbgf/sha1cd v0.3.2 // indirect
+	github.com/pjbgf/sha1cd v0.3.0 // indirect
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
 	github.com/projectdiscovery/asnmap v1.1.1 // indirect
-	github.com/projectdiscovery/blackrock v0.0.1 // indirect
-	github.com/projectdiscovery/cdncheck v1.2.9 // indirect
+	github.com/projectdiscovery/cdncheck v1.1.11 // indirect
 	github.com/projectdiscovery/freeport v0.0.7 // 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.7.1 // indirect
+	github.com/projectdiscovery/roundrobin v0.0.6 // indirect
+	github.com/projectdiscovery/tinydns v0.0.31 // indirect
+	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
+	github.com/refraction-networking/utls v1.6.7 // indirect
 	github.com/sashabaranov/go-openai v1.37.0 // indirect
-	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
-	github.com/shirou/gopsutil/v4 v4.25.7 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/skeema/knownhosts v1.3.1 // indirect
-	github.com/sorairolake/lzip-go v0.3.8 // indirect
-	github.com/spf13/afero v1.15.0 // indirect
+	github.com/skeema/knownhosts v1.3.0 // indirect
+	github.com/sorairolake/lzip-go v0.3.5 // indirect
+	github.com/therootcompany/xz v1.0.1 // indirect
 	github.com/tidwall/btree v1.7.0 // indirect
 	github.com/tidwall/buntdb v1.3.1 // indirect
 	github.com/tidwall/gjson v1.18.0 // indirect
 	github.com/tidwall/grect v0.1.4 // indirect
-	github.com/tidwall/match v1.2.0 // indirect
+	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
 	github.com/tidwall/rtred v0.1.2 // indirect
 	github.com/tidwall/tinyqueue v0.1.1 // indirect
 	github.com/tim-ywliu/nested-logrus-formatter v1.3.2 // indirect
-	github.com/tklauser/go-sysconf v0.3.15 // indirect
-	github.com/tklauser/numcpus v0.10.0 // indirect
-	github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.11 // indirect
-	github.com/ulikunitz/xz v0.5.15 // indirect
-	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/vmihailenco/bufpool v0.1.11 // indirect
-	github.com/vmihailenco/msgpack/v5 v5.3.4 // indirect
-	github.com/vmihailenco/tagparser v0.1.2 // indirect
-	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
 	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
-	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
 	github.com/xdg-go/scram v1.1.2 // indirect
 	github.com/xdg-go/stringprep v1.0.4 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
-	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
 	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
 	github.com/ysmood/fetchup v0.2.3 // indirect
-	github.com/ysmood/got v0.40.0 // indirect
-	github.com/yuin/goldmark v1.7.13 // indirect
-	github.com/yuin/goldmark-emoji v1.0.5 // indirect
+	github.com/ysmood/got v0.34.1 // indirect
+	github.com/yuin/goldmark v1.7.4 // indirect
+	github.com/yuin/goldmark-emoji v1.0.3 // indirect
 	github.com/zcalusic/sysinfo v1.0.2 // indirect
 	github.com/zeebo/blake3 v0.2.3 // indirect
-	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
-	go.opentelemetry.io/otel v1.38.0 // indirect
-	go.opentelemetry.io/otel/metric v1.38.0 // indirect
-	go.opentelemetry.io/otel/trace v1.38.0 // indirect
+	go.uber.org/goleak v1.3.0 // indirect
 	go4.org v0.0.0-20230225012048-214862532bf5 // indirect
 	golang.org/x/arch v0.3.0 // indirect
-	golang.org/x/sync v0.17.0 // indirect
+	golang.org/x/sync v0.11.0 // indirect
+	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
 	gopkg.in/djherbis/times.v1 v1.3.0 // indirect
-	mellium.im/sasl v0.3.2 // indirect
+	mellium.im/sasl v0.3.1 // indirect
 )
 
 require (
+	git.mills.io/prologic/smtpd v0.0.0-20210710122116-a525b76c287a // indirect
+	github.com/Mzack9999/go-http-digest-auth-client v0.6.1-0.20220414142836-eb8883508809 // indirect
+	github.com/PuerkitoBio/goquery v1.8.1 // indirect
+	github.com/akrylysov/pogreb v0.10.2 // indirect
+	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
+	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
+	github.com/andybalholm/cascadia v1.3.2 // indirect
+	github.com/antchfx/xpath v1.2.4
+	github.com/aymerick/douceur v0.2.0 // indirect
+	github.com/caddyserver/certmagic v0.19.2 // indirect
+	github.com/cnf/structhash v0.0.0-20201127153200-e1b16c1ebc08 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dimchansky/utfbom v1.1.1 // indirect
+	github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 // indirect
+	github.com/go-ole/go-ole v1.2.6 // indirect
+	github.com/go-playground/locales v0.14.1 // indirect
+	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/goburrow/cache v0.1.4 // indirect
 	github.com/gobwas/httphead v0.1.0 // indirect
 	github.com/gobwas/pool v0.2.1 // indirect
-	github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
+	github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // 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
+	github.com/gorilla/css v1.0.1 // indirect
+	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
+	github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
+	github.com/hdm/jarm-go v0.0.7 // indirect
+	github.com/itchyny/timefmt-go v0.1.5 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
+	github.com/leodido/go-urn v1.2.4 // indirect
+	github.com/libdns/libdns v0.2.1 // indirect
+	github.com/lor00x/goldap v0.0.0-20180618054307-a546dffdd1a3 // indirect
+	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-runewidth v0.0.16 // indirect
+	github.com/mholt/acmez v1.2.0 // indirect
+	github.com/microcosm-cc/bluemonday v1.0.27 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
+	github.com/projectdiscovery/blackrock v0.0.1 // indirect
+	github.com/projectdiscovery/networkpolicy v0.1.9
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d // indirect
+	github.com/tklauser/go-sysconf v0.3.12 // indirect
+	github.com/tklauser/numcpus v0.6.1 // indirect
 	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/ysmood/goob v0.4.0 // indirect
 	github.com/ysmood/gson v0.7.3 // indirect
-	github.com/ysmood/leakless v0.9.0 // indirect
+	github.com/ysmood/leakless v0.8.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	github.com/zmap/rc2 v0.0.0-20190804163417-abaa70531248 // indirect
 	github.com/zmap/zcrypto v0.0.0-20240512203510-0fef58d9a9db // indirect
-	go.etcd.io/bbolt v1.4.0 // indirect
-	go.uber.org/zap v1.27.0 // indirect
+	go.etcd.io/bbolt v1.3.10 // indirect
+	go.uber.org/zap v1.25.0 // indirect
 	goftp.io/server/v2 v2.0.1 // indirect
-	golang.org/x/crypto v0.43.0 // indirect
-	golang.org/x/exp v0.0.0-20250911091902-df9299821621
-	golang.org/x/mod v0.28.0 // indirect
-	golang.org/x/sys v0.37.0 // indirect
-	golang.org/x/time v0.14.0 // indirect
-	golang.org/x/tools v0.37.0
-	google.golang.org/protobuf v1.36.6 // indirect
+	golang.org/x/crypto v0.33.0 // indirect
+	golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8
+	golang.org/x/mod v0.22.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/time v0.6.0 // indirect
+	golang.org/x/tools v0.29.0
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
 	gopkg.in/corvus-ch/zbase32.v1 v1.0.0 // indirect
 )
 
 require (
+	github.com/Microsoft/go-winio v0.6.1 // indirect
+	github.com/ProtonMail/go-crypto v1.1.3 // indirect
 	github.com/alecthomas/chroma v0.10.0
-	github.com/go-echarts/go-echarts/v2 v2.6.0
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.5 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.35 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.29 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.3.36 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.29 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.12.13 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.13 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.19.3 // indirect
+	github.com/aws/smithy-go v1.13.5 // indirect
+	github.com/dop251/goja_nodejs v0.0.0-20230821135201-94e508132562
+	github.com/emirpasic/gods v1.18.1 // indirect
+	github.com/go-echarts/go-echarts/v2 v2.3.3
+	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
+	github.com/go-git/go-billy/v5 v5.6.0 // indirect
+	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
+	github.com/imdario/mergo v0.3.16 // indirect
+	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
+	github.com/jcmturner/gokrb5/v8 v8.4.4
+	github.com/kevinburke/ssh_config v1.2.0 // indirect
+	github.com/labstack/gommon v0.4.2 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/nwaples/rardecode v1.1.3 // indirect
+	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
+	github.com/xanzy/ssh-agent v0.3.3 // indirect
+	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 )
 
 // https://go.dev/ref/mod#go-mod-file-retract
 retract v3.2.0 // retract due to broken js protocol issue
-
-// Fix genproto version conflicts
-replace (
-	google.golang.org/genproto => google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142
-	google.golang.org/genproto/googleapis/api => google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142
-	google.golang.org/genproto/googleapis/rpc => google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1
-)

helm/templates/interactsh-ingress.yaml

@@ -1,7 +1,6 @@
 {{- if .Values.interactsh.ingress.enabled -}}
 {{- $fullName := include "nuclei.fullname" . -}}
-{{- $svcPort := .Values.interactsh.service.port -}}
-{{- $svcName := .Values.interactsh.service.name -}}
+{{- $svcPort := .Values.service.port -}}
 {{- if and .Values.interactsh.ingress.className (not (semverCompare ">=1.20-0" .Capabilities.KubeVersion.GitVersion)) }}
   {{- if not (hasKey .Values.interactsh.ingress.annotations "kubernetes.io/ingress.class") }}
   {{- $_ := set .Values.interactsh.ingress.annotations "kubernetes.io/ingress.class" .Values.interactsh.ingress.className}}
@@ -50,11 +49,11 @@ spec:
             backend:
               {{- if semverCompare ">=1.20-0" $.Capabilities.KubeVersion.GitVersion }}
               service:
-                name: {{ $svcName }}
+                name: {{ $fullName }}
                 port:
                   number: {{ $svcPort }}
               {{- else }}
-              serviceName: {{ $svcName }}
+              serviceName: {{ $fullName }}
               servicePort: {{ $svcPort }}
               {{- end }}
           {{- end }}

integration_tests/fuzz/fuzz-body.yaml

@@ -1,38 +0,0 @@
-id: fuzz-body
-
-info:
-  name: fuzzing error sqli payloads in http req body
-  author: pdteam
-  severity: info
-  description: |
-    This template attempts to find SQL injection vulnerabilities by fuzzing http body
-    It automatically handles and parses json,xml,multipart form and x-www-form-urlencoded data
-    and performs fuzzing on the value of every key
-
-http:
-  - pre-condition:
-      - type: dsl
-        dsl:
-          - method != "GET"
-          - method != "HEAD"
-        condition: and
-    
-    payloads:
-      injection:
-        - "'"
-        - "\""
-        - ";"
-    
-    fuzzing:
-      - part: body
-        type: postfix
-        mode: single
-        fuzz:
-          - '{{injection}}'
-  
-    stop-at-first-match: true
-    matchers:
-      - type: word
-        words:
-          - "unrecognized token:"
-          - "null"

integration_tests/protocols/code/py-virtual.yaml

@@ -1,27 +0,0 @@
-id: signed-python-code-in-virtual-env
-
-info:
-  name: signed-python-code-in-virtual-env
-  author: pdteam
-  severity: info
-  tags: code
-  description: |
-    signed python code in virtual environment
-
-code:
-  - engine:
-      - sh
-      - bash
-    sandbox:
-      working-dir: /tmp
-      image: python:3.14
-    source: |
-      #!/usr/bin/env python3
-      
-      import sys
-      print("hello from python virtual code")
-    
-    matchers:
-      - type: word
-        words:
-          - "hello from python virtual code"

integration_tests/protocols/code/sh-virtual.yaml

@@ -1,25 +0,0 @@
-id: signed-code-in-virtual-env
-
-info:
-  name: signed-code-in-virtual-env
-  author: pdteam
-  severity: info
-  tags: code
-  description: |
-    signed code in virtual environment
-
-code:
-  - engine:
-      - sh
-      - bash
-    sandbox:
-      working-dir: /tmp
-      image: ubuntu:latest
-    source: |
-      echo "hello from sh virtual code"
-    
-    matchers:
-      - type: word
-        words:
-          - "hello from sh virtual code"
-# digest: 4a0a00473045022100a2a71c423b72e600ac2d78209482b48591924157d49e2dfb7767445b0073e92b022009a6365e84247e268c7ffcb2f9ed424529dada6f087d5f21400ab0b2a822ca56:4a3eb6b4988d95847d4203be25ed1d46

integration_tests/protocols/javascript/vnc-pass-brute.yaml

@@ -1,38 +0,0 @@
-id: vnc-password-test
-
-info:
-  name: VNC Password Authentication Test
-  author: pdteam
-  severity: high
-  description: |
-    Tests VNC authentication with correct and incorrect passwords.
-  metadata:
-    shodan-query: product:"vnc"
-  tags: js,network,vnc,authentication
-
-javascript:
-  - pre-condition: |
-      isPortOpen(Host,Port)
-
-    code: |
-      let vnc = require('nuclei/vnc');
-      let client = new vnc.VNCClient();
-      client.Connect(Host, Port, Password);
-
-    args:
-      Host: "{{Host}}"
-      Port: "5900"
-      Password: "{{passwords}}"
-    payloads:
-      passwords:
-        - ""
-        - root
-        - password
-        - admin
-        - mysecret
-    stop-at-first-match: true
-      
-    matchers:
-      - type: dsl
-        dsl:
-          - "success == true"

internal/pdcp/writer.go

@@ -19,7 +19,7 @@ import (
 	"github.com/projectdiscovery/retryablehttp-go"
 	pdcpauth "github.com/projectdiscovery/utils/auth/pdcp"
 	"github.com/projectdiscovery/utils/env"
-	"github.com/projectdiscovery/utils/errkit"
+	errorutil "github.com/projectdiscovery/utils/errors"
 	unitutils "github.com/projectdiscovery/utils/unit"
 	updateutils "github.com/projectdiscovery/utils/update"
 	urlutil "github.com/projectdiscovery/utils/url"
@@ -55,11 +55,10 @@ type UploadWriter struct {
 	scanName  string
 	counter   atomic.Int32
 	TeamID    string
-	Logger    *gologger.Logger
 }
 
 // NewUploadWriter creates a new upload writer
-func NewUploadWriter(ctx context.Context, logger *gologger.Logger, creds *pdcpauth.PDCPCredentials) (*UploadWriter, error) {
+func NewUploadWriter(ctx context.Context, creds *pdcpauth.PDCPCredentials) (*UploadWriter, error) {
 	if creds == nil {
 		return nil, fmt.Errorf("no credentials provided")
 	}
@@ -67,7 +66,6 @@ func NewUploadWriter(ctx context.Context, logger *gologger.Logger, creds *pdcpau
 		creds:  creds,
 		done:   make(chan struct{}, 1),
 		TeamID: NoneTeamID,
-		Logger: logger,
 	}
 	var err error
 	reader, writer := io.Pipe()
@@ -77,11 +75,11 @@ func NewUploadWriter(ctx context.Context, logger *gologger.Logger, creds *pdcpau
 		output.WithJson(true, true),
 	)
 	if err != nil {
-		return nil, errkit.Wrap(err, "could not create output writer")
+		return nil, errorutil.NewWithErr(err).Msgf("could not create output writer")
 	}
 	tmp, err := urlutil.Parse(creds.Server)
 	if err != nil {
-		return nil, errkit.Wrap(err, "could not parse server url")
+		return nil, errorutil.NewWithErr(err).Msgf("could not parse server url")
 	}
 	tmp.Path = uploadEndpoint
 	tmp.Update()
@@ -129,9 +127,7 @@ func (u *UploadWriter) autoCommit(ctx context.Context, r *io.PipeReader) {
 
 	// continuously read from the reader and send to channel
 	go func() {
-		defer func() {
-			_ = r.Close()
-		}()
+		defer r.Close()
 		defer close(ch)
 		for {
 			data, err := reader.ReadString('\n')
@@ -149,9 +145,9 @@ func (u *UploadWriter) autoCommit(ctx context.Context, r *io.PipeReader) {
 		close(u.done)
 		// if no scanid is generated no results were uploaded
 		if u.scanID == "" {
-			u.Logger.Verbose().Msgf("Scan results upload to cloud skipped, no results found to upload")
+			gologger.Verbose().Msgf("Scan results upload to cloud skipped, no results found to upload")
 		} else {
-			u.Logger.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, u.TeamID))
 		}
 	}()
 	// temporary buffer to store the results
@@ -164,7 +160,7 @@ func (u *UploadWriter) autoCommit(ctx context.Context, r *io.PipeReader) {
 			// flush before exit
 			if buff.Len() > 0 {
 				if err := u.uploadChunk(buff); err != nil {
-					u.Logger.Error().Msgf("Failed to upload scan results on cloud: %v", err)
+					gologger.Error().Msgf("Failed to upload scan results on cloud: %v", err)
 				}
 			}
 			return
@@ -172,14 +168,14 @@ func (u *UploadWriter) autoCommit(ctx context.Context, r *io.PipeReader) {
 			// flush the buffer
 			if buff.Len() > 0 {
 				if err := u.uploadChunk(buff); err != nil {
-					u.Logger.Error().Msgf("Failed to upload scan results on cloud: %v", err)
+					gologger.Error().Msgf("Failed to upload scan results on cloud: %v", err)
 				}
 			}
 		case line, ok := <-ch:
 			if !ok {
 				if buff.Len() > 0 {
 					if err := u.uploadChunk(buff); err != nil {
-						u.Logger.Error().Msgf("Failed to upload scan results on cloud: %v", err)
+						gologger.Error().Msgf("Failed to upload scan results on cloud: %v", err)
 					}
 				}
 				return
@@ -187,7 +183,7 @@ func (u *UploadWriter) autoCommit(ctx context.Context, r *io.PipeReader) {
 			if buff.Len()+len(line) > MaxChunkSize {
 				// flush existing buffer
 				if err := u.uploadChunk(buff); err != nil {
-					u.Logger.Error().Msgf("Failed to upload scan results on cloud: %v", err)
+					gologger.Error().Msgf("Failed to upload scan results on cloud: %v", err)
 				}
 			} else {
 				buff.WriteString(line)
@@ -199,37 +195,35 @@ func (u *UploadWriter) autoCommit(ctx context.Context, r *io.PipeReader) {
 // uploadChunk uploads a chunk of data to the server
 func (u *UploadWriter) uploadChunk(buff *bytes.Buffer) error {
 	if err := u.upload(buff.Bytes()); err != nil {
-		return errkit.Wrap(err, "could not upload chunk")
+		return errorutil.NewWithErr(err).Msgf("could not upload chunk")
 	}
 	// if successful, reset the buffer
 	buff.Reset()
 	// log in verbose mode
-	u.Logger.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, u.TeamID))
 	return nil
 }
 
 func (u *UploadWriter) upload(data []byte) error {
 	req, err := u.getRequest(data)
 	if err != nil {
-		return errkit.Wrap(err, "could not create upload request")
+		return errorutil.NewWithErr(err).Msgf("could not create upload request")
 	}
 	resp, err := u.client.Do(req)
 	if err != nil {
-		return errkit.Wrap(err, "could not upload results")
+		return errorutil.NewWithErr(err).Msgf("could not upload results")
 	}
-	defer func() {
-		_ = resp.Body.Close()
-	}()
+	defer resp.Body.Close()
 	bin, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return errkit.Wrap(err, "could not get id from response")
+		return errorutil.NewWithErr(err).Msgf("could not get id from response")
 	}
 	if resp.StatusCode != http.StatusOK {
 		return fmt.Errorf("could not upload results got status code %v on %v", resp.StatusCode, resp.Request.URL.String())
 	}
 	var uploadResp uploadResponse
 	if err := json.Unmarshal(bin, &uploadResp); err != nil {
-		return errkit.Wrap(err, fmt.Sprintf("could not unmarshal response got %v", string(bin)))
+		return errorutil.NewWithErr(err).Msgf("could not unmarshal response got %v", string(bin))
 	}
 	if uploadResp.ID != "" && u.scanID == "" {
 		u.scanID = uploadResp.ID
@@ -254,15 +248,15 @@ func (u *UploadWriter) getRequest(bin []byte) (*retryablehttp.Request, error) {
 	}
 	req, err := retryablehttp.NewRequest(method, url, bytes.NewReader(bin))
 	if err != nil {
-		return nil, errkit.Wrap(err, "could not create cloud upload request")
+		return nil, errorutil.NewWithErr(err).Msgf("could not create cloud upload request")
 	}
 	// add pdtm meta params
-	req.Params.Merge(updateutils.GetpdtmParams(config.Version))
+	req.URL.Params.Merge(updateutils.GetpdtmParams(config.Version))
 	// if it is upload endpoint also include name if it exists
-	if u.scanName != "" && req.Path == uploadEndpoint {
-		req.Params.Add("name", u.scanName)
+	if u.scanName != "" && req.URL.Path == uploadEndpoint {
+		req.URL.Params.Add("name", u.scanName)
 	}
-	req.Update()
+	req.URL.Update()
 
 	req.Header.Set(pdcpauth.ApiKeyHeaderName, u.creds.APIKey)
 	if u.TeamID != NoneTeamID && u.TeamID != "" {

internal/runner/healthcheck.go

@@ -47,7 +47,7 @@ func DoHealthCheck(options *types.Options) string {
 	}
 	c4, err := net.Dial("tcp4", "scanme.sh:80")
 	if err == nil && c4 != nil {
-		_ = c4.Close()
+		c4.Close()
 	}
 	testResult = "Ok"
 	if err != nil {
@@ -56,7 +56,7 @@ func DoHealthCheck(options *types.Options) string {
 	test.WriteString(fmt.Sprintf("IPv4 connectivity to scanme.sh:80 => %s\n", testResult))
 	c6, err := net.Dial("tcp6", "scanme.sh:80")
 	if err == nil && c6 != nil {
-		_ = c6.Close()
+		c6.Close()
 	}
 	testResult = "Ok"
 	if err != nil {
@@ -65,7 +65,7 @@ func DoHealthCheck(options *types.Options) string {
 	test.WriteString(fmt.Sprintf("IPv6 connectivity to scanme.sh:80 => %s\n", testResult))
 	u4, err := net.Dial("udp4", "scanme.sh:53")
 	if err == nil && u4 != nil {
-		_ = u4.Close()
+		u4.Close()
 	}
 	testResult = "Ok"
 	if err != nil {

internal/runner/inputs.go

@@ -2,11 +2,11 @@ package runner
 
 import (
 	"context"
-	"fmt"
 	"sync/atomic"
 	"time"
 
 	"github.com/pkg/errors"
+	"github.com/projectdiscovery/gologger"
 	"github.com/projectdiscovery/hmap/store/hybrid"
 	"github.com/projectdiscovery/httpx/common/httpx"
 	"github.com/projectdiscovery/nuclei/v3/pkg/input/provider"
@@ -28,23 +28,12 @@ func (r *Runner) initializeTemplatesHTTPInput() (*hybrid.HybridMap, error) {
 		// currently http probing for input mode types is not supported
 		return hm, nil
 	}
-	r.Logger.Info().Msgf("Running httpx on input host")
+	gologger.Info().Msgf("Running httpx on input host")
 
 	httpxOptions := httpx.DefaultOptions
-	if r.options.AliveHttpProxy != "" {
-		httpxOptions.Proxy = r.options.AliveHttpProxy
-	} else if r.options.AliveSocksProxy != "" {
-		httpxOptions.Proxy = r.options.AliveSocksProxy
-	}
 	httpxOptions.RetryMax = r.options.Retries
 	httpxOptions.Timeout = time.Duration(r.options.Timeout) * time.Second
-
-	dialers := protocolstate.GetDialersWithId(r.options.ExecutionId)
-	if dialers == nil {
-		return nil, fmt.Errorf("dialers not initialized for %s", r.options.ExecutionId)
-	}
-
-	httpxOptions.NetworkPolicy = dialers.NetworkPolicy
+	httpxOptions.NetworkPolicy = protocolstate.NetworkPolicy
 	httpxClient, err := httpx.New(&httpxOptions)
 	if err != nil {
 		return nil, errors.Wrap(err, "could not create httpx client")
@@ -63,7 +52,7 @@ func (r *Runner) initializeTemplatesHTTPInput() (*hybrid.HybridMap, error) {
 
 		if r.options.ProbeConcurrency > 0 && swg.Size != r.options.ProbeConcurrency {
 			if err := swg.Resize(context.Background(), r.options.ProbeConcurrency); err != nil {
-				r.Logger.Error().Msgf("Could not resize workpool: %s\n", err)
+				gologger.Error().Msgf("Could not resize workpool: %s\n", err)
 			}
 		}
 
@@ -80,6 +69,6 @@ func (r *Runner) initializeTemplatesHTTPInput() (*hybrid.HybridMap, error) {
 	})
 	swg.Wait()
 
-	r.Logger.Info().Msgf("Found %d URL from httpx", count.Load())
+	gologger.Info().Msgf("Found %d URL from httpx", count.Load())
 	return hm, nil
 }

internal/runner/lazy.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/projectdiscovery/nuclei/v3/pkg/authprovider/authx"
 	"github.com/projectdiscovery/nuclei/v3/pkg/catalog"
-	"github.com/projectdiscovery/nuclei/v3/pkg/catalog/disk"
 	"github.com/projectdiscovery/nuclei/v3/pkg/catalog/loader"
 	"github.com/projectdiscovery/nuclei/v3/pkg/output"
 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols"
@@ -18,22 +17,22 @@ import (
 	"github.com/projectdiscovery/nuclei/v3/pkg/scan"
 	"github.com/projectdiscovery/nuclei/v3/pkg/types"
 	"github.com/projectdiscovery/utils/env"
-	"github.com/projectdiscovery/utils/errkit"
+	errorutil "github.com/projectdiscovery/utils/errors"
 )
 
 type AuthLazyFetchOptions struct {
 	TemplateStore *loader.Store
-	ExecOpts      *protocols.ExecutorOptions
+	ExecOpts      protocols.ExecutorOptions
 	OnError       func(error)
 }
 
 // GetAuthTmplStore create new loader for loading auth templates
-func GetAuthTmplStore(opts *types.Options, catalog catalog.Catalog, execOpts *protocols.ExecutorOptions) (*loader.Store, error) {
+func GetAuthTmplStore(opts types.Options, catalog catalog.Catalog, execOpts protocols.ExecutorOptions) (*loader.Store, error) {
 	tmpls := []string{}
 	for _, file := range opts.SecretsFile {
 		data, err := authx.GetTemplatePathsFromSecretFile(file)
 		if err != nil {
-			return nil, errkit.Wrap(err, "failed to get template paths from secrets file")
+			return nil, errorutil.NewWithErr(err).Msgf("failed to get template paths from secrets file")
 		}
 		tmpls = append(tmpls, data...)
 	}
@@ -55,11 +54,11 @@ func GetAuthTmplStore(opts *types.Options, catalog catalog.Catalog, execOpts *pr
 	opts.Protocols = nil
 	opts.ExcludeProtocols = nil
 	opts.IncludeConditions = nil
-	cfg := loader.NewConfig(opts, catalog, execOpts)
+	cfg := loader.NewConfig(&opts, catalog, execOpts)
 	cfg.StoreId = loader.AuthStoreId
 	store, err := loader.New(cfg)
 	if err != nil {
-		return nil, errkit.Wrap(err, "failed to initialize dynamic auth templates store")
+		return nil, errorutil.NewWithErr(err).Msgf("failed to initialize dynamic auth templates store")
 	}
 	return store, nil
 }
@@ -69,7 +68,7 @@ func GetLazyAuthFetchCallback(opts *AuthLazyFetchOptions) authx.LazyFetchSecret
 	return func(d *authx.Dynamic) error {
 		tmpls := opts.TemplateStore.LoadTemplates([]string{d.TemplatePath})
 		if len(tmpls) == 0 {
-			return fmt.Errorf("%w for path: %s", disk.ErrNoTemplatesFound, d.TemplatePath)
+			return fmt.Errorf("no templates found for path: %s", d.TemplatePath)
 		}
 		if len(tmpls) > 1 {
 			return fmt.Errorf("multiple templates found for path: %s", d.TemplatePath)

internal/runner/options.go

@@ -31,6 +31,7 @@ import (
 	"github.com/projectdiscovery/nuclei/v3/pkg/utils/yaml"
 	fileutil "github.com/projectdiscovery/utils/file"
 	"github.com/projectdiscovery/utils/generic"
+	logutil "github.com/projectdiscovery/utils/log"
 	stringsutil "github.com/projectdiscovery/utils/strings"
 )
 
@@ -39,8 +40,6 @@ const (
 	DefaultDumpTrafficOutputFolder = "output"
 )
 
-var validateOptions = validator.New()
-
 func ConfigureOptions() error {
 	// with FileStringSliceOptions, FileNormalizedStringSliceOptions, FileCommaSeparatedStringSliceOptions
 	// if file has the extension `.yaml` or `.json` we consider those as strings and not files to be read
@@ -72,17 +71,17 @@ func ParseOptions(options *types.Options) {
 		vardump.Limit = options.VarDumpLimit
 	}
 	if options.ShowActions {
-		options.Logger.Info().Msgf("Showing available headless actions: ")
+		gologger.Info().Msgf("Showing available headless actions: ")
 		for action := range engine.ActionStringToAction {
-			options.Logger.Print().Msgf("\t%s", action)
+			gologger.Print().Msgf("\t%s", action)
 		}
 		os.Exit(0)
 	}
 
 	defaultProfilesPath := filepath.Join(config.DefaultConfig.GetTemplateDir(), "profiles")
 	if options.ListTemplateProfiles {
-		options.Logger.Print().Msgf(
-			"Listing available %v nuclei template profiles for %v",
+		gologger.Print().Msgf(
+			"\nListing available %v nuclei template profiles for %v",
 			config.DefaultConfig.TemplateVersion,
 			config.DefaultConfig.TemplatesDirectory,
 		)
@@ -94,23 +93,23 @@ func ParseOptions(options *types.Options) {
 				return nil
 			}
 			if profileRelPath, err := filepath.Rel(templatesRootDir, iterItem); err == nil {
-				options.Logger.Print().Msgf("%s (%s)\n", profileRelPath, strings.TrimSuffix(filepath.Base(iterItem), ext))
+				gologger.Print().Msgf("%s (%s)\n", profileRelPath, strings.TrimSuffix(filepath.Base(iterItem), ext))
 			}
 			return nil
 		})
 		if err != nil {
-			options.Logger.Error().Msgf("%s\n", err)
+			gologger.Error().Msgf("%s\n", err)
 		}
 		os.Exit(0)
 	}
 	if options.StoreResponseDir != DefaultDumpTrafficOutputFolder && !options.StoreResponse {
-		options.Logger.Debug().Msgf("Store response directory specified, enabling \"store-resp\" flag automatically\n")
+		gologger.Debug().Msgf("Store response directory specified, enabling \"store-resp\" flag automatically\n")
 		options.StoreResponse = true
 	}
 	// Validate the options passed by the user and if any
 	// invalid options have been used, exit.
 	if err := ValidateOptions(options); err != nil {
-		options.Logger.Fatal().Msgf("Program exiting: %s\n", err)
+		gologger.Fatal().Msgf("Program exiting: %s\n", err)
 	}
 
 	// Load the resolvers if user asked for them
@@ -118,12 +117,12 @@ func ParseOptions(options *types.Options) {
 
 	err := protocolinit.Init(options)
 	if err != nil {
-		options.Logger.Fatal().Msgf("Could not initialize protocols: %s\n", err)
+		gologger.Fatal().Msgf("Could not initialize protocols: %s\n", err)
 	}
 
 	// Set GitHub token in env variable. runner.getGHClientWithToken() reads token from env
 	if options.GitHubToken != "" && os.Getenv("GITHUB_TOKEN") != options.GitHubToken {
-		_ = os.Setenv("GITHUB_TOKEN", options.GitHubToken)
+		os.Setenv("GITHUB_TOKEN", options.GitHubToken)
 	}
 
 	if options.UncoverQuery != nil {
@@ -140,7 +139,8 @@ func ParseOptions(options *types.Options) {
 
 // validateOptions validates the configuration options passed
 func ValidateOptions(options *types.Options) error {
-	if err := validateOptions.Struct(options); err != nil {
+	validate := validator.New()
+	if err := validate.Struct(options); err != nil {
 		if _, ok := err.(*validator.InvalidValidationError); ok {
 			return err
 		}
@@ -169,7 +169,7 @@ func ValidateOptions(options *types.Options) error {
 		return err
 	}
 	if options.Validate {
-		validateTemplatePaths(options.Logger, config.DefaultConfig.TemplatesDirectory, options.Templates, options.Workflows)
+		validateTemplatePaths(config.DefaultConfig.TemplatesDirectory, options.Templates, options.Workflows)
 	}
 	if options.DAST {
 		if err := validateDASTOptions(options); err != nil {
@@ -182,7 +182,7 @@ func ValidateOptions(options *types.Options) error {
 		if generic.EqualsAny("", options.ClientCertFile, options.ClientKeyFile, options.ClientCAFile) {
 			return errors.New("if a client certification option is provided, then all three must be provided")
 		}
-		validateCertificatePaths(options.Logger, options.ClientCertFile, options.ClientKeyFile, options.ClientCAFile)
+		validateCertificatePaths(options.ClientCertFile, options.ClientKeyFile, options.ClientCAFile)
 	}
 	// Verify AWS secrets are passed if a S3 template bucket is passed
 	if options.AwsBucketName != "" && options.UpdateTemplates && !options.AwsTemplateDisableDownload {
@@ -304,9 +304,7 @@ func createReportingOptions(options *types.Options) (*reporting.Options, error)
 		if err != nil {
 			return nil, errors.Wrap(err, "could not open reporting config file")
 		}
-		defer func() {
-			_ = file.Close()
-		}()
+		defer file.Close()
 
 		if err := yaml.DecodeAndValidate(file, reportingOptions); err != nil {
 			return nil, errors.Wrap(err, "could not parse reporting config file")
@@ -344,33 +342,32 @@ func createReportingOptions(options *types.Options) (*reporting.Options, error)
 	}
 
 	reportingOptions.OmitRaw = options.OmitRawRequests
-	reportingOptions.ExecutionId = options.ExecutionId
 	return reportingOptions, nil
 }
 
 // configureOutput configures the output logging levels to be displayed on the screen
 func configureOutput(options *types.Options) {
 	if options.NoColor {
-		options.Logger.SetFormatter(formatter.NewCLI(true))
+		gologger.DefaultLogger.SetFormatter(formatter.NewCLI(true))
 	}
 	// If the user desires verbose output, show verbose output
 	if options.Debug || options.DebugRequests || options.DebugResponse {
-		options.Logger.SetMaxLevel(levels.LevelDebug)
+		gologger.DefaultLogger.SetMaxLevel(levels.LevelDebug)
 	}
 	// Debug takes precedence before verbose
 	// because debug is a lower logging level.
 	if options.Verbose || options.Validate {
-		options.Logger.SetMaxLevel(levels.LevelVerbose)
+		gologger.DefaultLogger.SetMaxLevel(levels.LevelVerbose)
 	}
 	if options.NoColor {
-		options.Logger.SetFormatter(formatter.NewCLI(true))
+		gologger.DefaultLogger.SetFormatter(formatter.NewCLI(true))
 	}
 	if options.Silent {
-		options.Logger.SetMaxLevel(levels.LevelSilent)
+		gologger.DefaultLogger.SetMaxLevel(levels.LevelSilent)
 	}
 
 	// disable standard logger (ref: https://github.com/golang/go/issues/19895)
-	// logutil.DisableDefaultLogger()
+	logutil.DisableDefaultLogger()
 }
 
 // loadResolvers loads resolvers from both user-provided flags and file
@@ -381,11 +378,9 @@ func loadResolvers(options *types.Options) {
 
 	file, err := os.Open(options.ResolversFile)
 	if err != nil {
-		options.Logger.Fatal().Msgf("Could not open resolvers file: %s\n", err)
+		gologger.Fatal().Msgf("Could not open resolvers file: %s\n", err)
 	}
-	defer func() {
-		_ = file.Close()
-	}()
+	defer file.Close()
 
 	scanner := bufio.NewScanner(file)
 	for scanner.Scan() {
@@ -401,7 +396,7 @@ func loadResolvers(options *types.Options) {
 	}
 }
 
-func validateTemplatePaths(logger *gologger.Logger, templatesDirectory string, templatePaths, workflowPaths []string) {
+func validateTemplatePaths(templatesDirectory string, templatePaths, workflowPaths []string) {
 	allGivenTemplatePaths := append(templatePaths, workflowPaths...)
 	for _, templatePath := range allGivenTemplatePaths {
 		if templatesDirectory != templatePath && filepath.IsAbs(templatePath) {
@@ -409,7 +404,7 @@ func validateTemplatePaths(logger *gologger.Logger, templatesDirectory string, t
 			if err == nil && fileInfo.IsDir() {
 				relativizedPath, err2 := filepath.Rel(templatesDirectory, templatePath)
 				if err2 != nil || (len(relativizedPath) >= 2 && relativizedPath[:2] == "..") {
-					logger.Warning().Msgf("The given path (%s) is outside the default template directory path (%s)! "+
+					gologger.Warning().Msgf("The given path (%s) is outside the default template directory path (%s)! "+
 						"Referenced sub-templates with relative paths in workflows will be resolved against the default template directory.", templatePath, templatesDirectory)
 					break
 				}
@@ -418,12 +413,12 @@ func validateTemplatePaths(logger *gologger.Logger, templatesDirectory string, t
 	}
 }
 
-func validateCertificatePaths(logger *gologger.Logger, certificatePaths ...string) {
+func validateCertificatePaths(certificatePaths ...string) {
 	for _, certificatePath := range certificatePaths {
 		if !fileutil.FileExists(certificatePath) {
 			// The provided path to the PEM certificate does not exist for the client authentication. As this is
 			// required for successful authentication, log and return an error
-			logger.Fatal().Msgf("The given path (%s) to the certificate does not exist!", certificatePath)
+			gologger.Fatal().Msgf("The given path (%s) to the certificate does not exist!", certificatePath)
 			break
 		}
 	}
@@ -450,7 +445,7 @@ func readEnvInputVars(options *types.Options) {
 			// Attempt to convert the repo ID to an integer
 			repoIDInt, err := strconv.Atoi(repoID)
 			if err != nil {
-				options.Logger.Warning().Msgf("Invalid GitLab template repository ID: %s", repoID)
+				gologger.Warning().Msgf("Invalid GitLab template repository ID: %s", repoID)
 				continue
 			}
 

internal/runner/proxy.go

@@ -7,8 +7,9 @@ import (
 	"os"
 	"strings"
 
+	"github.com/projectdiscovery/gologger"
 	"github.com/projectdiscovery/nuclei/v3/pkg/types"
-	"github.com/projectdiscovery/utils/errkit"
+	errorutil "github.com/projectdiscovery/utils/errors"
 	fileutil "github.com/projectdiscovery/utils/file"
 	proxyutils "github.com/projectdiscovery/utils/proxy"
 )
@@ -29,9 +30,7 @@ func loadProxyServers(options *types.Options) error {
 			if err != nil {
 				return fmt.Errorf("could not open proxy file: %w", err)
 			}
-			defer func() {
-				_ = file.Close()
-			}()
+			defer file.Close()
 			scanner := bufio.NewScanner(file)
 			for scanner.Scan() {
 				proxy := scanner.Text()
@@ -50,18 +49,17 @@ func loadProxyServers(options *types.Options) error {
 	}
 	proxyURL, err := url.Parse(aliveProxy)
 	if err != nil {
-		return errkit.Wrapf(err, "failed to parse proxy got %v", err)
+		return errorutil.WrapfWithNil(err, "failed to parse proxy got %v", err)
 	}
 	if options.ProxyInternal {
-		_ = os.Setenv(HTTP_PROXY_ENV, proxyURL.String())
+		os.Setenv(HTTP_PROXY_ENV, proxyURL.String())
 	}
-	switch proxyURL.Scheme {
-	case proxyutils.HTTP, proxyutils.HTTPS:
-		options.Logger.Verbose().Msgf("Using %s as proxy server", proxyURL.String())
+	if proxyURL.Scheme == proxyutils.HTTP || proxyURL.Scheme == proxyutils.HTTPS {
+		gologger.Verbose().Msgf("Using %s as proxy server", proxyURL.String())
 		options.AliveHttpProxy = proxyURL.String()
-	case proxyutils.SOCKS5:
+	} else if proxyURL.Scheme == proxyutils.SOCKS5 {
 		options.AliveSocksProxy = proxyURL.String()
-		options.Logger.Verbose().Msgf("Using %s as socket proxy server", proxyURL.String())
+		gologger.Verbose().Msgf("Using %s as socket proxy server", proxyURL.String())
 	}
 	return nil
 }

internal/runner/runner.go

@@ -10,7 +10,6 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/projectdiscovery/gologger"
 	"github.com/projectdiscovery/nuclei/v3/internal/pdcp"
 	"github.com/projectdiscovery/nuclei/v3/internal/server"
 	"github.com/projectdiscovery/nuclei/v3/pkg/authprovider"
@@ -33,6 +32,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/projectdiscovery/ratelimit"
 
+	"github.com/projectdiscovery/gologger"
 	"github.com/projectdiscovery/nuclei/v3/internal/colorizer"
 	"github.com/projectdiscovery/nuclei/v3/internal/httpapi"
 	"github.com/projectdiscovery/nuclei/v3/pkg/catalog"
@@ -95,7 +95,6 @@ type Runner struct {
 	inputProvider      provider.InputProvider
 	fuzzFrequencyCache *frequency.Tracker
 	httpStats          *outputstats.Tracker
-	Logger             *gologger.Logger
 
 	//general purpose temporary directory
 	tmpDir          string
@@ -109,11 +108,10 @@ type Runner struct {
 func New(options *types.Options) (*Runner, error) {
 	runner := &Runner{
 		options: options,
-		Logger:  options.Logger,
 	}
 
 	if options.HealthCheck {
-		runner.Logger.Print().Msgf("%s\n", DoHealthCheck(options))
+		gologger.Print().Msgf("%s\n", DoHealthCheck(options))
 		os.Exit(0)
 	}
 
@@ -121,22 +119,14 @@ func New(options *types.Options) (*Runner, error) {
 	if config.DefaultConfig.CanCheckForUpdates() {
 		if err := installer.NucleiVersionCheck(); err != nil {
 			if options.Verbose || options.Debug {
-				runner.Logger.Error().Msgf("nuclei version check failed got: %s\n", err)
+				gologger.Error().Msgf("nuclei version check failed got: %s\n", err)
 			}
 		}
 
-		// if template list or template display is enabled, enable all templates
-		if options.TemplateList || options.TemplateDisplay {
-			options.EnableCodeTemplates = true
-			options.EnableFileTemplates = true
-			options.EnableSelfContainedTemplates = true
-			options.EnableGlobalMatchersTemplates = true
-		}
-
 		// check for custom template updates and update if available
 		ctm, err := customtemplates.NewCustomTemplatesManager(options)
 		if err != nil {
-			runner.Logger.Error().Label("custom-templates").Msgf("Failed to create custom templates manager: %s\n", err)
+			gologger.Error().Label("custom-templates").Msgf("Failed to create custom templates manager: %s\n", err)
 		}
 
 		// Check for template updates and update if available.
@@ -146,15 +136,15 @@ func New(options *types.Options) (*Runner, error) {
 			DisablePublicTemplates: options.PublicTemplateDisableDownload,
 		}
 		if err := tm.FreshInstallIfNotExists(); err != nil {
-			runner.Logger.Warning().Msgf("failed to install nuclei templates: %s\n", err)
+			gologger.Warning().Msgf("failed to install nuclei templates: %s\n", err)
 		}
 		if err := tm.UpdateIfOutdated(); err != nil {
-			runner.Logger.Warning().Msgf("failed to update nuclei templates: %s\n", err)
+			gologger.Warning().Msgf("failed to update nuclei templates: %s\n", err)
 		}
 
 		if config.DefaultConfig.NeedsIgnoreFileUpdate() {
 			if err := installer.UpdateIgnoreFile(); err != nil {
-				runner.Logger.Warning().Msgf("failed to update nuclei ignore file: %s\n", err)
+				gologger.Warning().Msgf("failed to update nuclei ignore file: %s\n", err)
 			}
 		}
 
@@ -162,7 +152,7 @@ func New(options *types.Options) (*Runner, error) {
 			// we automatically check for updates unless explicitly disabled
 			// this print statement is only to inform the user that there are no updates
 			if !config.DefaultConfig.NeedsTemplateUpdate() {
-				runner.Logger.Info().Msgf("No new updates found for nuclei templates")
+				gologger.Info().Msgf("No new updates found for nuclei templates")
 			}
 			// manually trigger update of custom templates
 			if ctm != nil {
@@ -171,25 +161,20 @@ func New(options *types.Options) (*Runner, error) {
 		}
 	}
 
-	if op, ok := options.Parser.(*templates.Parser); ok {
-		// Enable passing in an existing parser instance
-		// This uses a type assertion to avoid an import loop
-		runner.parser = op
-	} else {
-		parser := templates.NewParser()
-		if options.Validate {
-			parser.ShouldValidate = true
-		}
-		// TODO: refactor to pass options reference globally without cycles
-		parser.NoStrictSyntax = options.NoStrictSyntax
-		runner.parser = parser
+	parser := templates.NewParser()
+
+	if options.Validate {
+		parser.ShouldValidate = true
 	}
+	// TODO: refactor to pass options reference globally without cycles
+	parser.NoStrictSyntax = options.NoStrictSyntax
+	runner.parser = parser
 
 	yaml.StrictSyntax = !options.NoStrictSyntax
 
 	if options.Headless {
 		if engine.MustDisableSandbox() {
-			runner.Logger.Warning().Msgf("The current platform and privileged user will run the browser without sandbox\n")
+			gologger.Warning().Msgf("The current platform and privileged user will run the browser without sandbox\n")
 		}
 		browser, err := engine.New(options)
 		if err != nil {
@@ -241,11 +226,11 @@ func New(options *types.Options) (*Runner, error) {
 
 	if options.HttpApiEndpoint != "" {
 		apiServer := httpapi.New(options.HttpApiEndpoint, options)
-		runner.Logger.Info().Msgf("Listening api endpoint on: %s", options.HttpApiEndpoint)
+		gologger.Info().Msgf("Listening api endpoint on: %s", options.HttpApiEndpoint)
 		runner.httpApiEndpoint = apiServer
 		go func() {
 			if err := apiServer.Start(); err != nil {
-				runner.Logger.Error().Msgf("Failed to start API server: %s", err)
+				gologger.Error().Msgf("Failed to start API server: %s", err)
 			}
 		}()
 	}
@@ -299,7 +284,7 @@ func New(options *types.Options) (*Runner, error) {
 	// create the resume configuration structure
 	resumeCfg := types.NewResumeCfg()
 	if runner.options.ShouldLoadResume() {
-		runner.Logger.Info().Msg("Resuming from save checkpoint")
+		gologger.Info().Msg("Resuming from save checkpoint")
 		file, err := os.ReadFile(runner.options.Resume)
 		if err != nil {
 			return nil, err
@@ -341,7 +326,6 @@ func New(options *types.Options) (*Runner, error) {
 	}
 
 	opts := interactsh.DefaultOptions(runner.output, runner.issuesClient, runner.progress)
-	opts.Logger = runner.Logger
 	opts.Debug = runner.options.Debug
 	opts.NoColor = runner.options.NoColor
 	if options.InteractshURL != "" {
@@ -371,20 +355,24 @@ func New(options *types.Options) (*Runner, error) {
 	}
 	interactshClient, err := interactsh.New(opts)
 	if err != nil {
-		runner.Logger.Error().Msgf("Could not create interactsh client: %s", err)
+		gologger.Error().Msgf("Could not create interactsh client: %s", err)
 	} else {
 		runner.interactsh = interactshClient
 	}
 
 	if options.RateLimitMinute > 0 {
-		runner.Logger.Print().Msgf("[%v] %v", aurora.BrightYellow("WRN"), "rate limit per minute is deprecated - use rate-limit-duration")
+		gologger.Print().Msgf("[%v] %v", aurora.BrightYellow("WRN"), "rate limit per minute is deprecated - use rate-limit-duration")
 		options.RateLimit = options.RateLimitMinute
 		options.RateLimitDuration = time.Minute
 	}
 	if options.RateLimit > 0 && options.RateLimitDuration == 0 {
 		options.RateLimitDuration = time.Second
 	}
-	runner.rateLimiter = utils.GetRateLimiter(context.Background(), options.RateLimit, options.RateLimitDuration)
+	if options.RateLimit == 0 && options.RateLimitDuration == 0 {
+		runner.rateLimiter = ratelimit.NewUnlimited(context.Background())
+	} else {
+		runner.rateLimiter = ratelimit.New(context.Background(), uint(options.RateLimit), options.RateLimitDuration)
+	}
 
 	if tmpDir, err := os.MkdirTemp("", "nuclei-tmp-*"); err == nil {
 		runner.tmpDir = tmpDir
@@ -394,7 +382,7 @@ func New(options *types.Options) (*Runner, error) {
 }
 
 // runStandardEnumeration runs standard enumeration
-func (r *Runner) runStandardEnumeration(executerOpts *protocols.ExecutorOptions, store *loader.Store, engine *core.Engine) (*atomic.Bool, error) {
+func (r *Runner) runStandardEnumeration(executerOpts protocols.ExecutorOptions, store *loader.Store, engine *core.Engine) (*atomic.Bool, error) {
 	if r.options.AutomaticScan {
 		return r.executeSmartWorkflowInput(executerOpts, store, engine)
 	}
@@ -425,7 +413,7 @@ func (r *Runner) Close() {
 	if r.inputProvider != nil {
 		r.inputProvider.Close()
 	}
-	protocolinit.Close(r.options.ExecutionId)
+	protocolinit.Close()
 	if r.pprofServer != nil {
 		r.pprofServer.Stop()
 	}
@@ -451,22 +439,23 @@ func (r *Runner) setupPDCPUpload(writer output.Writer) output.Writer {
 	if r.options.ScanID != "" {
 		r.options.EnableCloudUpload = true
 	}
-	if !r.options.EnableCloudUpload && !EnableCloudUpload {
-		r.pdcpUploadErrMsg = "Scan results upload to cloud is disabled."
+	if !(r.options.EnableCloudUpload || EnableCloudUpload) {
+		r.pdcpUploadErrMsg = fmt.Sprintf("[%v] Scan results upload to cloud is disabled.", r.colorizer.BrightYellow("WRN"))
 		return writer
 	}
+	color := aurora.NewAurora(!r.options.NoColor)
 	h := &pdcpauth.PDCPCredHandler{}
 	creds, err := h.GetCreds()
 	if err != nil {
 		if err != pdcpauth.ErrNoCreds && !HideAutoSaveMsg {
-			r.Logger.Verbose().Msgf("Could not get credentials for cloud upload: %s\n", err)
+			gologger.Verbose().Msgf("Could not get credentials for cloud upload: %s\n", err)
 		}
-		r.pdcpUploadErrMsg = fmt.Sprintf("To view results on Cloud Dashboard, configure API key from %v", pdcpauth.DashBoardURL)
+		r.pdcpUploadErrMsg = fmt.Sprintf("[%v] To view results on Cloud Dashboard, Configure API key from %v", color.BrightYellow("WRN"), pdcpauth.DashBoardURL)
 		return writer
 	}
-	uploadWriter, err := pdcp.NewUploadWriter(context.Background(), r.Logger, creds)
+	uploadWriter, err := pdcp.NewUploadWriter(context.Background(), creds)
 	if err != nil {
-		r.pdcpUploadErrMsg = fmt.Sprintf("PDCP (%v) Auto-Save Failed: %s\n", pdcpauth.DashBoardURL, err)
+		r.pdcpUploadErrMsg = fmt.Sprintf("[%v] PDCP (%v) Auto-Save Failed: %s\n", color.BrightYellow("WRN"), pdcpauth.DashBoardURL, err)
 		return writer
 	}
 	if r.options.ScanID != "" {
@@ -487,7 +476,7 @@ func (r *Runner) setupPDCPUpload(writer output.Writer) output.Writer {
 func (r *Runner) RunEnumeration() error {
 	// If the user has asked for DAST server mode, run the live
 	// DAST fuzzing server.
-	if r.options.DASTServer {
+	if r.options.DASTServer || r.options.PassiveServer {
 		execurOpts := &server.NucleiExecutorOptions{
 			Options:            r.options,
 			Output:             r.output,
@@ -502,7 +491,6 @@ func (r *Runner) RunEnumeration() error {
 			Parser:             r.parser,
 			TemporaryDirectory: r.tmpDir,
 			FuzzStatsDB:        r.fuzzStats,
-			Logger:             r.Logger,
 		}
 		dastServer, err := server.New(&server.Options{
 			Address:               r.options.DASTServerAddress,
@@ -513,6 +501,8 @@ func (r *Runner) RunEnumeration() error {
 			InScope:               r.options.Scope,
 			OutScope:              r.options.OutOfScope,
 			NucleiExecutorOptions: execurOpts,
+			ProxyServerPort:       r.options.ProxyServerPort,
+			ProxyCacheDirectory:   r.options.ProxyCacheDirectory,
 		})
 		if err != nil {
 			return err
@@ -544,7 +534,7 @@ func (r *Runner) RunEnumeration() error {
 
 	// Create the executor options which will be used throughout the execution
 	// stage by the nuclei engine modules.
-	executorOpts := &protocols.ExecutorOptions{
+	executorOpts := protocols.ExecutorOptions{
 		Output:              r.output,
 		Options:             r.options,
 		Progress:            r.progress,
@@ -562,8 +552,6 @@ func (r *Runner) RunEnumeration() error {
 		Parser:              r.parser,
 		FuzzParamsFrequency: fuzzFreqCache,
 		GlobalMatchers:      globalmatchers.New(),
-		DoNotCache:          r.options.DoNotCacheTemplates,
-		Logger:              r.Logger,
 	}
 
 	if config.DefaultConfig.IsDebugArgEnabled(config.DebugExportURLPattern) {
@@ -572,9 +560,7 @@ func (r *Runner) RunEnumeration() error {
 	}
 
 	if len(r.options.SecretsFile) > 0 && !r.options.Validate {
-		// Clone options so GetAuthTmplStore can modify them without affecting the original
-		authOptions := r.options.Copy()
-		authTmplStore, err := GetAuthTmplStore(authOptions, r.catalog, executorOpts)
+		authTmplStore, err := GetAuthTmplStore(*r.options, r.catalog, executorOpts)
 		if err != nil {
 			return errors.Wrap(err, "failed to load dynamic auth templates")
 		}
@@ -594,8 +580,8 @@ func (r *Runner) RunEnumeration() error {
 	if r.options.ShouldUseHostError() {
 		maxHostError := r.options.MaxHostError
 		if r.options.TemplateThreads > maxHostError {
-			r.Logger.Print().Msgf("[%v] The concurrency value is higher than max-host-error", r.colorizer.BrightYellow("WRN"))
-			r.Logger.Info().Msgf("Adjusting max-host-error to the concurrency value: %d", r.options.TemplateThreads)
+			gologger.Print().Msgf("[%v] The concurrency value is higher than max-host-error", r.colorizer.BrightYellow("WRN"))
+			gologger.Info().Msgf("Adjusting max-host-error to the concurrency value: %d", r.options.TemplateThreads)
 
 			maxHostError = r.options.TemplateThreads
 		}
@@ -610,7 +596,7 @@ func (r *Runner) RunEnumeration() error {
 	executorEngine := core.New(r.options)
 	executorEngine.SetExecuterOptions(executorOpts)
 
-	workflowLoader, err := parsers.NewLoader(executorOpts)
+	workflowLoader, err := parsers.NewLoader(&executorOpts)
 	if err != nil {
 		return errors.Wrap(err, "Could not create loader.")
 	}
@@ -649,7 +635,7 @@ func (r *Runner) RunEnumeration() error {
 			return err
 		}
 		if stats.GetValue(templates.SyntaxErrorStats) == 0 && stats.GetValue(templates.SyntaxWarningStats) == 0 && stats.GetValue(templates.RuntimeWarningsStats) == 0 {
-			r.Logger.Info().Msgf("All templates validated successfully")
+			gologger.Info().Msgf("All templates validated successfully\n")
 		} else {
 			return errors.New("encountered errors while performing template validation")
 		}
@@ -657,6 +643,7 @@ func (r *Runner) RunEnumeration() error {
 	}
 	store.Load()
 	// TODO: remove below functions after v3 or update warning messages
+	disk.PrintDeprecatedPathsMsgIfApplicable(r.options.Silent)
 	templates.PrintDeprecatedProtocolNameMsgIfApplicable(r.options.Silent, r.options.Verbose)
 
 	// add the hosts from the metadata queries of loaded templates into input provider
@@ -670,7 +657,7 @@ func (r *Runner) RunEnumeration() error {
 		}
 		ret := uncover.GetUncoverTargetsFromMetadata(context.TODO(), store.Templates(), r.options.UncoverField, uncoverOpts)
 		for host := range ret {
-			_ = r.inputProvider.SetWithExclusions(r.options.ExecutionId, host)
+			_ = r.inputProvider.SetWithExclusions(host)
 		}
 	}
 	// display execution info like version , templates used etc
@@ -678,7 +665,7 @@ func (r *Runner) RunEnumeration() error {
 
 	// prefetch secrets if enabled
 	if executorOpts.AuthProvider != nil && r.options.PreFetchSecrets {
-		r.Logger.Info().Msgf("Pre-fetching secrets from authprovider[s]")
+		gologger.Info().Msgf("Pre-fetching secrets from authprovider[s]")
 		if err := executorOpts.AuthProvider.PreFetchSecrets(); err != nil {
 			return errors.Wrap(err, "could not pre-fetch secrets")
 		}
@@ -712,12 +699,11 @@ func (r *Runner) RunEnumeration() error {
 	if r.dastServer != nil {
 		go func() {
 			if err := r.dastServer.Start(); err != nil {
-				r.Logger.Error().Msgf("could not start dast server: %v", err)
+				gologger.Error().Msgf("could not start dast server: %v", err)
 			}
 		}()
 	}
 
-	now := time.Now()
 	enumeration := false
 	var results *atomic.Bool
 	results, err = r.runStandardEnumeration(executorOpts, store, executorEngine)
@@ -741,17 +727,11 @@ func (r *Runner) RunEnumeration() error {
 	}
 	r.fuzzFrequencyCache.Close()
 
-	r.progress.Stop()
-	timeTaken := time.Since(now)
 	// todo: error propagation without canonical straight error check is required by cloud?
 	// use safe dereferencing to avoid potential panics in case of previous unchecked errors
 	if v := ptrutil.Safe(results); !v.Load() {
-		r.Logger.Info().Msgf("Scan completed in %s. No results found.", shortDur(timeTaken))
-	} else {
-		matchCount := r.output.ResultCount()
-		r.Logger.Info().Msgf("Scan completed in %s. %d matches found.", shortDur(timeTaken), matchCount)
+		gologger.Info().Msgf("No results found. Better luck next time!")
 	}
-
 	// check if a passive scan was requested but no target was provided
 	if r.options.OfflineHTTP && len(r.options.Targets) == 0 && r.options.TargetsFilePath == "" {
 		return errors.Wrap(err, "missing required input (http response) to run passive templates")
@@ -760,24 +740,6 @@ func (r *Runner) RunEnumeration() error {
 	return err
 }
 
-func shortDur(d time.Duration) string {
-	if d < time.Minute {
-		return d.String()
-	}
-
-	// Truncate to the nearest minute
-	d = d.Truncate(time.Minute)
-	s := d.String()
-
-	if strings.HasSuffix(s, "m0s") {
-		s = s[:len(s)-2]
-	}
-	if strings.HasSuffix(s, "h0m") {
-		s = s[:len(s)-2]
-	}
-	return s
-}
-
 func (r *Runner) isInputNonHTTP() bool {
 	var nonURLInput bool
 	r.inputProvider.Iterate(func(value *contextargs.MetaInput) bool {
@@ -790,7 +752,7 @@ func (r *Runner) isInputNonHTTP() bool {
 	return nonURLInput
 }
 
-func (r *Runner) executeSmartWorkflowInput(executorOpts *protocols.ExecutorOptions, store *loader.Store, engine *core.Engine) (*atomic.Bool, error) {
+func (r *Runner) executeSmartWorkflowInput(executorOpts protocols.ExecutorOptions, store *loader.Store, engine *core.Engine) (*atomic.Bool, error) {
 	r.progress.Init(r.inputProvider.Count(), 0, 0)
 
 	service, err := automaticscan.New(automaticscan.Options{
@@ -858,7 +820,7 @@ func (r *Runner) displayExecutionInfo(store *loader.Store) {
 	if tmplCount == 0 && workflowCount == 0 {
 		// if dast flag is used print explicit warning
 		if r.options.DAST {
-			r.Logger.Print().Msgf("[%v] No DAST templates found", aurora.BrightYellow("WRN"))
+			gologger.DefaultLogger.Print().Msgf("[%v] No DAST templates found", aurora.BrightYellow("WRN"))
 		}
 		stats.ForceDisplayWarning(templates.SkippedCodeTmplTamperedStats)
 	} else {
@@ -871,45 +833,38 @@ func (r *Runner) displayExecutionInfo(store *loader.Store) {
 	cfg := config.DefaultConfig
 
 	updateutils.Aurora = r.colorizer
-	versionInfo := func(version, latestVersion, versionType string) string {
-		if !cfg.CanCheckForUpdates() {
-			return fmt.Sprintf("Current %s version: %v (%s) - remove '-duc' flag to enable update checks", versionType, version, r.colorizer.BrightYellow("unknown"))
-		}
-		return fmt.Sprintf("Current %s version: %v %v", versionType, version, updateutils.GetVersionDescription(version, latestVersion))
-	}
-
-	gologger.Info().Msg(versionInfo(config.Version, cfg.LatestNucleiVersion, "nuclei"))
-	gologger.Info().Msg(versionInfo(cfg.TemplateVersion, cfg.LatestNucleiTemplatesVersion, "nuclei-templates"))
+	gologger.Info().Msgf("Current nuclei version: %v %v", config.Version, updateutils.GetVersionDescription(config.Version, cfg.LatestNucleiVersion))
+	gologger.Info().Msgf("Current nuclei-templates version: %v %v", cfg.TemplateVersion, updateutils.GetVersionDescription(cfg.TemplateVersion, cfg.LatestNucleiTemplatesVersion))
 	if !HideAutoSaveMsg {
 		if r.pdcpUploadErrMsg != "" {
-			r.Logger.Warning().Msgf("%s", r.pdcpUploadErrMsg)
+			gologger.Print().Msgf("%s", r.pdcpUploadErrMsg)
 		} else {
-			r.Logger.Info().Msgf("To view results on cloud dashboard, visit %v/scans upon scan completion.", pdcpauth.DashBoardURL)
+			gologger.Info().Msgf("To view results on cloud dashboard, visit %v/scans upon scan completion.", pdcpauth.DashBoardURL)
 		}
 	}
 
 	if tmplCount > 0 || workflowCount > 0 {
 		if len(store.Templates()) > 0 {
-			r.Logger.Info().Msgf("New templates added in latest release: %d", len(config.DefaultConfig.GetNewAdditions()))
-			r.Logger.Info().Msgf("Templates loaded for current scan: %d", len(store.Templates()))
+			gologger.Info().Msgf("New templates added in latest release: %d", len(config.DefaultConfig.GetNewAdditions()))
+			gologger.Info().Msgf("Templates loaded for current scan: %d", len(store.Templates()))
 		}
 		if len(store.Workflows()) > 0 {
-			r.Logger.Info().Msgf("Workflows loaded for current scan: %d", len(store.Workflows()))
+			gologger.Info().Msgf("Workflows loaded for current scan: %d", len(store.Workflows()))
 		}
 		for k, v := range templates.SignatureStats {
 			value := v.Load()
 			if value > 0 {
 				if k == templates.Unsigned && !r.options.Silent && !config.DefaultConfig.HideTemplateSigWarning {
-					r.Logger.Print().Msgf("[%v] Loading %d unsigned templates for scan. Use with caution.", r.colorizer.BrightYellow("WRN"), value)
+					gologger.Print().Msgf("[%v] Loading %d unsigned templates for scan. Use with caution.", r.colorizer.BrightYellow("WRN"), value)
 				} else {
-					r.Logger.Info().Msgf("Executing %d signed templates from %s", value, k)
+					gologger.Info().Msgf("Executing %d signed templates from %s", value, k)
 				}
 			}
 		}
 	}
 
 	if r.inputProvider.Count() > 0 {
-		r.Logger.Info().Msgf("Targets loaded for current scan: %d", r.inputProvider.Count())
+		gologger.Info().Msgf("Targets loaded for current scan: %d", r.inputProvider.Count())
 	}
 }
 
@@ -936,7 +891,7 @@ func UploadResultsToCloud(options *types.Options) error {
 		return errors.Wrap(err, "could not get credentials for cloud upload")
 	}
 	ctx := context.TODO()
-	uploadWriter, err := pdcp.NewUploadWriter(ctx, options.Logger, creds)
+	uploadWriter, err := pdcp.NewUploadWriter(ctx, creds)
 	if err != nil {
 		return errors.Wrap(err, "could not create upload writer")
 	}
@@ -955,21 +910,19 @@ func UploadResultsToCloud(options *types.Options) error {
 	if err != nil {
 		return errors.Wrap(err, "could not open scan upload file")
 	}
-	defer func() {
-		_ = file.Close()
-	}()
+	defer file.Close()
 
-	options.Logger.Info().Msgf("Uploading scan results to cloud dashboard from %s", options.ScanUploadFile)
+	gologger.Info().Msgf("Uploading scan results to cloud dashboard from %s", options.ScanUploadFile)
 	dec := json.NewDecoder(file)
 	for dec.More() {
 		var r output.ResultEvent
 		err := dec.Decode(&r)
 		if err != nil {
-			options.Logger.Warning().Msgf("Could not decode jsonl: %s\n", err)
+			gologger.Warning().Msgf("Could not decode jsonl: %s\n", err)
 			continue
 		}
 		if err = uploadWriter.Write(&r); err != nil {
-			options.Logger.Warning().Msgf("[%s] failed to upload: %s\n", r.TemplateID, err)
+			gologger.Warning().Msgf("[%s] failed to upload: %s\n", r.TemplateID, err)
 		}
 	}
 	uploadWriter.Close()

internal/runner/runner_test.go

@@ -64,8 +64,8 @@ func TestWalkReflectStructAssignsEnvVars(t *testing.T) {
 			B: "$VAR_TWO",
 		},
 	}
-	_ = os.Setenv("VAR_EXAMPLE", "value")
-	_ = os.Setenv("VAR_TWO", "value2")
+	os.Setenv("VAR_EXAMPLE", "value")
+	os.Setenv("VAR_TWO", "value2")
 
 	Walk(testStruct, expandEndVars)
 
@@ -79,9 +79,9 @@ func TestWalkReflectStructHandlesDifferentTypes(t *testing.T) {
 		B: "$VAR_TWO",
 		C: "$VAR_THREE",
 	}
-	_ = os.Setenv("VAR_EXAMPLE", "value")
-	_ = os.Setenv("VAR_TWO", "2")
-	_ = os.Setenv("VAR_THREE", "true")
+	os.Setenv("VAR_EXAMPLE", "value")
+	os.Setenv("VAR_TWO", "2")
+	os.Setenv("VAR_THREE", "true")
 
 	Walk(testStruct, expandEndVars)
 
@@ -96,9 +96,9 @@ func TestWalkReflectStructEmpty(t *testing.T) {
 		B: "",
 		C: "$VAR_THREE",
 	}
-	_ = os.Setenv("VAR_EXAMPLE", "value")
-	_ = os.Setenv("VAR_TWO", "2")
-	_ = os.Setenv("VAR_THREE", "true")
+	os.Setenv("VAR_EXAMPLE", "value")
+	os.Setenv("VAR_TWO", "2")
+	os.Setenv("VAR_THREE", "true")
 
 	Walk(testStruct, expandEndVars)
 
@@ -116,7 +116,7 @@ func TestWalkReflectStructWithNoYamlTag(t *testing.T) {
 		C: "$GITHUB_USER",
 	}
 
-	_ = os.Setenv("GITHUB_USER", "testuser")
+	os.Setenv("GITHUB_USER", "testuser")
 
 	Walk(test, expandEndVars)
 	require.Equal(t, "testuser", test.A)
@@ -132,9 +132,9 @@ func TestWalkReflectStructHandlesNestedStructs(t *testing.T) {
 			C: "$VAR_THREE",
 		},
 	}
-	_ = os.Setenv("VAR_EXAMPLE", "value")
-	_ = os.Setenv("VAR_TWO", "2")
-	_ = os.Setenv("VAR_THREE", "true")
+	os.Setenv("VAR_EXAMPLE", "value")
+	os.Setenv("VAR_TWO", "2")
+	os.Setenv("VAR_THREE", "true")
 
 	Walk(testStruct, expandEndVars)
 

internal/runner/templates.go

@@ -12,6 +12,7 @@ import (
 	"github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
 	"github.com/projectdiscovery/nuclei/v3/pkg/catalog/loader"
 
+	"github.com/projectdiscovery/gologger"
 	"github.com/projectdiscovery/nuclei/v3/pkg/templates"
 	"github.com/projectdiscovery/nuclei/v3/pkg/types"
 )
@@ -24,7 +25,7 @@ func (r *Runner) logAvailableTemplate(tplPath string) {
 		panic("not a template")
 	}
 	if err != nil {
-		r.Logger.Error().Msgf("Could not parse file '%s': %s\n", tplPath, err)
+		gologger.Error().Msgf("Could not parse file '%s': %s\n", tplPath, err)
 	} else {
 		r.verboseTemplate(tpl)
 	}
@@ -32,45 +33,39 @@ func (r *Runner) logAvailableTemplate(tplPath string) {
 
 // log available templates for verbose (-vv)
 func (r *Runner) verboseTemplate(tpl *templates.Template) {
-	r.Logger.Print().Msgf("%s\n", templates.TemplateLogMessage(tpl.ID,
+	gologger.Print().Msgf("%s\n", templates.TemplateLogMessage(tpl.ID,
 		types.ToString(tpl.Info.Name),
 		tpl.Info.Authors.ToSlice(),
 		tpl.Info.SeverityHolder.Severity))
 }
 
 func (r *Runner) listAvailableStoreTemplates(store *loader.Store) {
-	r.Logger.Print().Msgf(
+	gologger.Print().Msgf(
 		"\nListing available %v nuclei templates for %v",
 		config.DefaultConfig.TemplateVersion,
 		config.DefaultConfig.TemplatesDirectory,
 	)
-	// order templates alphabetically by path
-	templates := store.Templates()
-	sort.Slice(templates, func(i, j int) bool {
-		return templates[i].Path < templates[j].Path
-	})
-
-	for _, tpl := range templates {
+	for _, tpl := range store.Templates() {
 		if hasExtraFlags(r.options) {
 			if r.options.TemplateDisplay {
 				colorize := !r.options.NoColor
 				path := tpl.Path
 				tplBody, err := store.ReadTemplateFromURI(path, true)
 				if err != nil {
-					r.Logger.Error().Msgf("Could not read the template %s: %s", path, err)
+					gologger.Error().Msgf("Could not read the template %s: %s", path, err)
 					continue
 				}
 				if colorize {
 					path = aurora.Cyan(tpl.Path).String()
 					tplBody, err = r.highlightTemplate(&tplBody)
 					if err != nil {
-						r.Logger.Error().Msgf("Could not highlight the template %s: %s", tpl.Path, err)
+						gologger.Error().Msgf("Could not highlight the template %s: %s", tpl.Path, err)
 						continue
 					}
 				}
-				r.Logger.Print().Msgf("Template: %s\n\n%s", path, tplBody)
+				gologger.Silent().Msgf("Template: %s\n\n%s", path, tplBody)
 			} else {
-				r.Logger.Print().Msgf("%s\n", strings.TrimPrefix(tpl.Path, config.DefaultConfig.TemplatesDirectory+string(filepath.Separator)))
+				gologger.Silent().Msgf("%s\n", strings.TrimPrefix(tpl.Path, config.DefaultConfig.TemplatesDirectory+string(filepath.Separator)))
 			}
 		} else {
 			r.verboseTemplate(tpl)
@@ -79,7 +74,7 @@ func (r *Runner) listAvailableStoreTemplates(store *loader.Store) {
 }
 
 func (r *Runner) listAvailableStoreTags(store *loader.Store) {
-	r.Logger.Print().Msgf(
+	gologger.Print().Msgf(
 		"\nListing available %v nuclei tags for %v",
 		config.DefaultConfig.TemplateVersion,
 		config.DefaultConfig.TemplatesDirectory,
@@ -105,9 +100,9 @@ func (r *Runner) listAvailableStoreTags(store *loader.Store) {
 	for _, tag := range tagsList {
 		if r.options.JSONL {
 			marshalled, _ := jsoniter.Marshal(tag)
-			r.Logger.Debug().Msgf("%s", string(marshalled))
+			gologger.Silent().Msgf("%s\n", string(marshalled))
 		} else {
-			r.Logger.Debug().Msgf("%s (%d)", tag.Key, tag.Value)
+			gologger.Silent().Msgf("%s (%d)\n", tag.Key, tag.Value)
 		}
 	}
 }

internal/server/nuclei_sdk.go

@@ -41,7 +41,7 @@ type nucleiExecutor struct {
 	engine       *core.Engine
 	store        *loader.Store
 	options      *NucleiExecutorOptions
-	executorOpts *protocols.ExecutorOptions
+	executorOpts protocols.ExecutorOptions
 }
 
 type NucleiExecutorOptions struct {
@@ -58,7 +58,6 @@ type NucleiExecutorOptions struct {
 	Colorizer          aurora.Aurora
 	Parser             parser.Parser
 	TemporaryDirectory string
-	Logger             *gologger.Logger
 }
 
 func newNucleiExecutor(opts *NucleiExecutorOptions) (*nucleiExecutor, error) {
@@ -67,7 +66,7 @@ func newNucleiExecutor(opts *NucleiExecutorOptions) (*nucleiExecutor, error) {
 
 	// Create the executor options which will be used throughout the execution
 	// stage by the nuclei engine modules.
-	executorOpts := &protocols.ExecutorOptions{
+	executorOpts := protocols.ExecutorOptions{
 		Output:              opts.Output,
 		Options:             opts.Options,
 		Progress:            opts.Progress,
@@ -86,7 +85,6 @@ func newNucleiExecutor(opts *NucleiExecutorOptions) (*nucleiExecutor, error) {
 		FuzzParamsFrequency: fuzzFreqCache,
 		GlobalMatchers:      globalmatchers.New(),
 		FuzzStatsDB:         opts.FuzzStatsDB,
-		Logger:              opts.Logger,
 	}
 
 	if opts.Options.ShouldUseHostError() {
@@ -95,7 +93,7 @@ func newNucleiExecutor(opts *NucleiExecutorOptions) (*nucleiExecutor, error) {
 			maxHostError = 100 // auto adjust for fuzzings
 		}
 		if opts.Options.TemplateThreads > maxHostError {
-			opts.Logger.Info().Msgf("Adjusting max-host-error to the concurrency value: %d", opts.Options.TemplateThreads)
+			gologger.Info().Msgf("Adjusting max-host-error to the concurrency value: %d", opts.Options.TemplateThreads)
 
 			maxHostError = opts.Options.TemplateThreads
 		}
@@ -109,7 +107,7 @@ func newNucleiExecutor(opts *NucleiExecutorOptions) (*nucleiExecutor, error) {
 	executorEngine := core.New(opts.Options)
 	executorEngine.SetExecuterOptions(executorOpts)
 
-	workflowLoader, err := parsers.NewLoader(executorOpts)
+	workflowLoader, err := parsers.NewLoader(&executorOpts)
 	if err != nil {
 		return nil, errors.Wrap(err, "Could not create loader options.")
 	}
@@ -161,7 +159,7 @@ func (n *nucleiExecutor) ExecuteScan(target PostRequestsHandlerRequest) error {
 			Body   string            `json:"body"`
 			Raw    string            `json:"raw"`
 		}{
-			Raw: target.RawHTTP,
+			Raw: target.RawRequest,
 		},
 	}
 
@@ -197,5 +195,4 @@ func (n *nucleiExecutor) Close() {
 	if n.executorOpts.InputHelper != nil {
 		_ = n.executorOpts.InputHelper.Close()
 	}
-
 }

internal/server/passive_nuclei.go

@@ -0,0 +1,180 @@
+package server
+
+import (
+	"context"
+	"log/slog"
+	"net/url"
+	"strings"
+
+	"github.com/projectdiscovery/gologger"
+	"github.com/projectdiscovery/nuclei/v3/pkg/catalog/disk"
+	"github.com/projectdiscovery/nuclei/v3/pkg/catalog/loader"
+	"github.com/projectdiscovery/nuclei/v3/pkg/operators"
+	"github.com/projectdiscovery/nuclei/v3/pkg/output"
+	"github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolinit"
+	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/offlinehttp"
+	"github.com/projectdiscovery/nuclei/v3/pkg/scan"
+	"github.com/projectdiscovery/nuclei/v3/pkg/templates"
+	templateTypes "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
+	"github.com/projectdiscovery/nuclei/v3/pkg/tmplexec"
+	"github.com/projectdiscovery/nuclei/v3/pkg/types"
+)
+
+type PassiveNucleiExecutor struct {
+	defaultTemplates   []*templates.Template
+	pathBasedTemplates map[string][]*templates.Template
+}
+
+func NewPassiveNucleiExecutor(templatesDir string) (*PassiveNucleiExecutor, error) {
+	catalog := disk.NewCatalog(templatesDir)
+
+	opts := types.DefaultOptions()
+	opts.ExcludeTags = []string{"cve", "lfi", "xss", "rce", "ssrf", "cmdi", "oast", "ssti", "sqli"}
+	opts.ExcludedTemplates = []string{
+		"http/vulnerabilities/",
+		"http/cves",
+		"http/cnvd",
+		"http/fuzzing",
+	}
+	opts.ExcludeIds = []string{
+		"tech-detect", "fingerprinthub-web-fingerprints", "credentials-disclosure",
+		"aws-detect",
+	}
+	opts.Protocols = templateTypes.ProtocolTypes{templateTypes.HTTPProtocol}
+
+	executorOpts := protocols.ExecutorOptions{
+		Options: opts,
+		Catalog: catalog,
+		Parser:  templates.NewParser(),
+	}
+	if err := protocolinit.Init(opts); err != nil {
+		return nil, err
+	}
+
+	store, err := loader.New(loader.NewConfig(opts, catalog, executorOpts))
+	if err != nil {
+		return nil, err
+	}
+	store.Load()
+
+	loadedTemplates := store.Templates()
+	offlinehttp.RawInputMode = true
+
+	var defaultTemplates []*templates.Template
+	pathBasedTemplates := make(map[string][]*templates.Template)
+
+	for _, tpl := range loadedTemplates {
+		if len(tpl.RequestsWithHTTP) != 1 {
+			continue
+		}
+		if tpl.SelfContained || tpl.Flow != "" {
+			continue
+		}
+		for _, item := range tpl.RequestsWithHTTP {
+			if len(item.Path) == 0 {
+				continue
+			}
+			if err := compileOfflineHTTPRequest(tpl, &executorOpts); err != nil {
+				slog.Warn("Error compiling template", slog.String("id", tpl.ID), slog.String("error", err.Error()))
+				continue
+			}
+			for _, path := range item.Path {
+				// Default templates are not path based
+				if path == "{{BaseURL}}" || path == "{{BaseURL}}/" {
+					defaultTemplates = append(defaultTemplates, tpl)
+					continue
+				}
+				pathCleaned := strings.TrimPrefix(path, "{{BaseURL}}")
+				pathBasedTemplates[pathCleaned] = append(pathBasedTemplates[pathCleaned], tpl)
+			}
+		}
+	}
+	return &PassiveNucleiExecutor{
+		defaultTemplates:   defaultTemplates,
+		pathBasedTemplates: pathBasedTemplates,
+	}, nil
+}
+
+func (e *PassiveNucleiExecutor) Execute(ctx context.Context, input, URL string) ([]*output.ResultEvent, error) {
+	parsedURL, err := url.Parse(URL)
+	if err != nil {
+		return nil, err
+	}
+
+	var allResults []*output.ResultEvent
+	for _, tpl := range e.defaultTemplates {
+		results, err := executeTemplate(ctx, tpl, input, parsedURL)
+		if err != nil {
+			gologger.Warning().Msgf("Error executing template %s: %s\n", tpl.ID, err)
+			return nil, err
+		}
+		allResults = append(allResults, results...)
+	}
+
+	templates, ok := e.pathBasedTemplates[parsedURL.Path]
+	if !ok || len(templates) == 0 {
+		return allResults, nil
+	}
+
+	for _, tpl := range templates {
+		results, err := executeTemplate(ctx, tpl, input, parsedURL)
+		if err != nil {
+			gologger.Warning().Msgf("Error executing template %s: %s\n", tpl.ID, err)
+			continue
+		}
+		allResults = append(allResults, results...)
+	}
+	return allResults, nil
+}
+
+func executeTemplate(ctx context.Context, tpl *templates.Template, input string, parsedURL *url.URL) ([]*output.ResultEvent, error) {
+	results, err := tpl.Executer.ExecuteWithResults(scan.NewScanContext(ctx, contextargs.NewWithInput(ctx, input)))
+	if err != nil {
+		return nil, err
+	}
+	port := parsedURL.Port()
+	if port == "" {
+		if parsedURL.Scheme == "https" {
+			port = "443"
+		} else {
+			port = "80"
+		}
+	}
+	urlString := parsedURL.String()
+	for _, result := range results {
+		result.Info = tpl.Info
+		result.TemplateID = tpl.ID
+		result.TemplatePath = tpl.Path
+		result.URL = urlString
+		result.Host = parsedURL.Host
+		result.Path = parsedURL.Path
+		result.Scheme = parsedURL.Scheme
+		result.Path = parsedURL.Path
+		result.Port = port
+		result.Matched = urlString
+	}
+	return results, nil
+}
+
+// compileOfflineHTTPRequest iterates all requests if offline http mode is
+// specified and collects all matchers for all the base request templates
+// (those with URL {{BaseURL}} and it's slash variation.)
+func compileOfflineHTTPRequest(template *templates.Template, options *protocols.ExecutorOptions) error {
+	operatorsList := []*operators.Operators{}
+
+	for _, req := range template.RequestsHTTP {
+		operatorsList = append(operatorsList, &req.Operators)
+	}
+	if len(operatorsList) > 0 {
+		options.Operators = operatorsList
+		var err error
+
+		request := &offlinehttp.Request{}
+		_ = request.Compile(options)
+		template.Executer, err = tmplexec.NewTemplateExecuter([]protocols.Request{request}, options)
+		return err
+	}
+	return nil
+}

internal/server/proxy.go

@@ -0,0 +1,183 @@
+package server
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"log"
+	"math"
+	"net/http"
+	"net/http/httputil"
+	"os"
+
+	"github.com/projectdiscovery/gologger"
+	"github.com/projectdiscovery/martian/v3"
+	martianlog "github.com/projectdiscovery/martian/v3/log"
+	"github.com/projectdiscovery/proxify"
+	"github.com/projectdiscovery/proxify/pkg/certs"
+	"github.com/projectdiscovery/proxify/pkg/logger/elastic"
+	"github.com/projectdiscovery/proxify/pkg/logger/kafka"
+	"github.com/projectdiscovery/proxify/pkg/types"
+	httputils "github.com/projectdiscovery/utils/http"
+)
+
+// ProxyServer is an intercepting proxy launched through nuclei
+// using proxify for logging requests and responses.
+type ProxyServer struct {
+	ListenAddr string
+
+	proxy *proxify.Proxy
+}
+
+// RequestResponsePair is a pair of request and response
+type RequestResponsePair struct {
+	URL      string `json:"url" yaml:"url"`
+	Request  string `json:"request" yaml:"request"`
+	Response string `json:"response" yaml:"response"`
+	Protocol string `json:"protocol" yaml:"protocol"`
+}
+
+func responsePairFromResp(resp *http.Response) RequestResponsePair {
+	if resp.Request.Method == http.MethodConnect {
+		return RequestResponsePair{}
+	}
+
+	save := resp.Body
+	savecl := resp.ContentLength
+
+	var err error
+	if resp.Body != nil {
+		save, resp.Body, err = drainBody(resp.Body)
+		if err != nil {
+			return RequestResponsePair{}
+		}
+	}
+	chain := httputils.NewResponseChain(resp, -1)
+	defer chain.Close()
+
+	if err := chain.Fill(); err != nil {
+		log.Printf("[error] [proxy] Could not fill response chain: %s\n", err)
+		return RequestResponsePair{}
+	}
+	resp.Body = save
+	resp.ContentLength = savecl
+
+	if !chain.Has() {
+		return RequestResponsePair{}
+	}
+	respDump := chain.FullResponse()
+
+	return RequestResponsePair{
+		Response: respDump.String(),
+	}
+}
+
+type ProxyOptions struct {
+	Port           int
+	CacheDirectory string
+
+	OnIntercepted func(pair RequestResponsePair)
+}
+
+// NewProxyServer creates a new proxy server instance
+func NewProxyServer(opts *ProxyOptions) (*ProxyServer, error) {
+	ps := &ProxyServer{}
+
+	_ = os.MkdirAll(opts.CacheDirectory, 0755)
+	onRequestFunc := func(req *http.Request, ctx *martian.Context) error {
+		dumped, err := httputil.DumpRequestOut(req, true)
+		if err != nil {
+			return nil
+		}
+		ctx.Set(ctx.ID(), RequestResponsePair{
+			Request: string(dumped),
+			URL:     req.URL.String(),
+		})
+		ctx.Set("user-data", types.UserData{})
+		return nil
+	}
+
+	onResponseFunc := func(resp *http.Response, ctx *martian.Context) error {
+		pair := responsePairFromResp(resp)
+		if pair.Response == "" {
+			return nil
+		}
+		req, ok := ctx.Get(ctx.ID())
+		if !ok {
+			log.Printf("[error] [proxy] Could not get request from context\n")
+			return nil
+		}
+		valid, ok := req.(RequestResponsePair)
+		if !ok {
+			log.Printf("[error] [proxy] Could not validate request from context\n")
+			return nil
+		}
+		pair.Request = valid.Request
+		pair.Protocol = "http"
+		pair.URL = valid.URL
+		opts.OnIntercepted(pair)
+		return nil
+	}
+
+	err := certs.LoadCerts(opts.CacheDirectory)
+	if err != nil {
+		return nil, err
+	}
+
+	ps.ListenAddr = fmt.Sprintf("127.0.0.1:%d", opts.Port)
+
+	martianlog.SetLogger(&noopMartianLogger{})
+	proxifyOpts := &proxify.Options{
+		OutputJsonl:                 true,
+		MaxSize:                     math.MaxInt,
+		Verbosity:                   types.VerbosityDefault,
+		CertCacheSize:               256,
+		Directory:                   opts.CacheDirectory,
+		ListenAddrHTTP:              ps.ListenAddr,
+		OnRequestCallback:           onRequestFunc,
+		OnResponseCallback:          onResponseFunc,
+		UpstreamProxyRequestsNumber: 1,
+		Elastic:                     &elastic.Options{},
+		Kafka:                       &kafka.Options{},
+	}
+	proxy, err := proxify.NewProxy(proxifyOpts)
+	if err != nil {
+		return nil, err
+	}
+	ps.proxy = proxy
+
+	gologger.Info().Msgf("Starting proxy server on %s", ps.ListenAddr)
+	go func() {
+		err = proxy.Run()
+		if err != nil {
+			log.Printf("[error] [proxy] Could not run proxy: %s\n", err)
+		}
+	}()
+	return ps, nil
+}
+
+type noopMartianLogger struct{}
+
+func (l *noopMartianLogger) Infof(format string, args ...interface{})  {}
+func (l *noopMartianLogger) Debugf(format string, args ...interface{}) {}
+func (l *noopMartianLogger) Errorf(format string, args ...interface{}) {}
+
+func (p *ProxyServer) Close() {
+	p.proxy.Stop()
+}
+
+// from net/http/httputil.DumpResponse
+func drainBody(b io.ReadCloser) (r1, r2 io.ReadCloser, err error) {
+	if b == nil || b == http.NoBody {
+		// No copying needed. Preserve the magic sentinel meaning of NoBody.
+		return http.NoBody, http.NoBody, nil
+	}
+	var buf bytes.Buffer
+	if _, err = buf.ReadFrom(b); err != nil {
+		return nil, b, err
+	}
+	if err = b.Close(); err != nil {
+		return nil, b, err
+	}
+	return io.NopCloser(&buf), io.NopCloser(bytes.NewReader(buf.Bytes())), nil
+}

internal/server/requests_worker.go

@@ -1,7 +1,10 @@
 package server
 
 import (
+	"context"
+	"net/url"
 	"path"
+	"strings"
 
 	"github.com/projectdiscovery/gologger"
 	"github.com/projectdiscovery/nuclei/v3/internal/server/scope"
@@ -11,48 +14,72 @@ import (
 func (s *DASTServer) consumeTaskRequest(req PostRequestsHandlerRequest) {
 	defer s.endpointsInQueue.Add(-1)
 
-	parsedReq, err := types.ParseRawRequestWithURL(req.RawHTTP, req.URL)
+	parsedURL, err := url.Parse(req.URL)
 	if err != nil {
-		gologger.Warning().Msgf("Could not parse raw request: %s\n", err)
+		gologger.Warning().Msgf("Could not parse url: %s\n", err)
 		return
 	}
 
-	if parsedReq.URL.Scheme != "http" && parsedReq.URL.Scheme != "https" {
-		gologger.Warning().Msgf("Invalid scheme: %s\n", parsedReq.URL.Scheme)
+	if parsedURL.Scheme != "http" && parsedURL.Scheme != "https" {
+		gologger.Warning().Msgf("Invalid scheme: %s\n", parsedURL.Scheme)
 		return
 	}
 
 	// Check filenames and don't allow non-interesting files
-	extension := path.Base(parsedReq.URL.Path)
+	extension := path.Base(parsedURL.Path)
 	if extension != "/" && extension != "" && scope.IsUninterestingPath(extension) {
-		gologger.Warning().Msgf("Uninteresting path: %s\n", parsedReq.URL.Path)
+		gologger.Warning().Msgf("Uninteresting path: %s\n", parsedURL.Path)
 		return
 	}
 
-	inScope, err := s.scopeManager.Validate(parsedReq.URL.URL)
+	inScope, err := s.scopeManager.Validate(parsedURL)
 	if err != nil {
 		gologger.Warning().Msgf("Could not validate scope: %s\n", err)
 		return
 	}
 	if !inScope {
-		gologger.Warning().Msgf("Request is out of scope: %s %s\n", parsedReq.Request.Method, parsedReq.URL.String())
+		gologger.Warning().Msgf("Request is out of scope: %s\n", parsedURL.String())
 		return
 	}
 
-	if s.deduplicator.isDuplicate(parsedReq) {
-		gologger.Warning().Msgf("Duplicate request detected: %s %s\n", parsedReq.Request.Method, parsedReq.URL.String())
-		return
-	}
-
-	gologger.Verbose().Msgf("Fuzzing request: %s %s\n", parsedReq.Request.Method, parsedReq.URL.String())
+	gologger.Verbose().Msgf("Fuzzing request: %s\n", parsedURL.String())
 
 	s.endpointsBeingTested.Add(1)
 	defer s.endpointsBeingTested.Add(-1)
 
 	// Fuzz the request finally
-	err = s.nucleiExecutor.ExecuteScan(req)
-	if err != nil {
-		gologger.Warning().Msgf("Could not run nuclei: %s\n", err)
-		return
+	if s.nucleiExecutor != nil && req.RawRequest != "" {
+		parsedReq, err := types.ParseRawRequestWithURL(req.RawRequest, req.URL)
+		if err != nil {
+			gologger.Warning().Msgf("Could not parse raw request: %s\n", err)
+			return
+		}
+
+		if s.deduplicator.isDuplicate(parsedReq) {
+			gologger.Warning().Msgf("Duplicate request detected: %s %s\n", parsedReq.Request.Method, parsedReq.URL.String())
+			return
+		}
+
+		err = s.nucleiExecutor.ExecuteScan(req)
+		if err != nil {
+			gologger.Warning().Msgf("Could not run nuclei: %s\n", err)
+			return
+		}
+	} else if s.passiveNuclei != nil && req.RawResponse != "" {
+		var reqRespBuilder strings.Builder
+		reqRespBuilder.WriteString(req.RawRequest)
+		reqRespBuilder.WriteString("\n\n")
+		reqRespBuilder.WriteString(req.RawResponse)
+
+		results, err := s.passiveNuclei.Execute(context.Background(), reqRespBuilder.String(), req.URL)
+		if err != nil {
+			gologger.Warning().Msgf("Could not run nuclei: %s\n", err)
+			return
+		}
+		for _, result := range results {
+			if err := s.options.OutputWriter.Write(result); err != nil {
+				gologger.Warning().Msgf("Could not write result: %s\n", err)
+			}
+		}
 	}
 }

internal/server/server.go

@@ -37,6 +37,9 @@ type DASTServer struct {
 	endpointsBeingTested atomic.Int64
 
 	nucleiExecutor *nucleiExecutor
+	passiveNuclei  *PassiveNucleiExecutor
+
+	proxyServer *ProxyServer
 }
 
 // Options contains the configuration options for the server.
@@ -50,6 +53,11 @@ type Options struct {
 	// Verbose is a flag that controls verbose output
 	Verbose bool
 
+	// ProxyServerPort is the port to use for the proxy server
+	ProxyServerPort int
+	// ProxyCacheDirectory is the directory to use for the proxy server cache
+	ProxyCacheDirectory string
+
 	// Scope fields for fuzzer
 	InScope  []string
 	OutScope []string
@@ -59,8 +67,7 @@ type Options struct {
 	NucleiExecutorOptions *NucleiExecutorOptions
 }
 
-// New creates a new instance of the DAST server.
-func New(options *Options) (*DASTServer, error) {
+func setupDastDefaults(options *Options) {
 	// If the user has specified no templates, use the default ones
 	// for DAST only.
 	if len(options.Templates) == 0 {
@@ -72,8 +79,19 @@ func New(options *Options) (*DASTServer, error) {
 		options.NucleiExecutorOptions.Options.BulkSize = 1
 		options.NucleiExecutorOptions.Options.TemplateThreads = 1
 	}
-	maxWorkers := env.GetEnvOrDefault[int]("FUZZ_MAX_WORKERS", 1)
-	bufferSize := env.GetEnvOrDefault[int]("FUZZ_BUFFER_SIZE", 10000)
+}
+
+// New creates a new instance of the DAST server.
+func New(options *Options) (*DASTServer, error) {
+	dastServerMode := options.NucleiExecutorOptions.Options.DASTServer
+	passiveServerMode := options.NucleiExecutorOptions.Options.PassiveServer
+
+	if dastServerMode {
+		setupDastDefaults(options)
+	}
+
+	maxWorkers := env.GetEnvOrDefault("FUZZ_MAX_WORKERS", 25)
+	bufferSize := env.GetEnvOrDefault("FUZZ_BUFFER_SIZE", 10000)
 
 	server := &DASTServer{
 		options:      options,
@@ -83,11 +101,40 @@ func New(options *Options) (*DASTServer, error) {
 	}
 	server.setupHandlers(false)
 
-	executor, err := newNucleiExecutor(options.NucleiExecutorOptions)
-	if err != nil {
-		return nil, err
+	if dastServerMode {
+		executor, err := newNucleiExecutor(options.NucleiExecutorOptions)
+		if err != nil {
+			return nil, err
+		}
+		server.nucleiExecutor = executor
+	} else if passiveServerMode {
+		executor, err := NewPassiveNucleiExecutor(config.DefaultConfig.TemplatesDirectory)
+		if err != nil {
+			return nil, err
+		}
+		server.passiveNuclei = executor
+	}
+
+	if dastServerMode || passiveServerMode {
+		if options.ProxyCacheDirectory == "" {
+			options.ProxyCacheDirectory = "proxify-cache"
+		}
+		proxyServer, err := NewProxyServer(&ProxyOptions{
+			Port:           options.ProxyServerPort,
+			CacheDirectory: options.ProxyCacheDirectory,
+			OnIntercepted: func(pair RequestResponsePair) {
+				server.consumeTaskRequest(PostRequestsHandlerRequest{
+					RawRequest:  pair.Request,
+					RawResponse: pair.Response,
+					URL:         pair.URL,
+				})
+			},
+		})
+		if err != nil {
+			return nil, err
+		}
+		server.proxyServer = proxyServer
 	}
-	server.nucleiExecutor = executor
 
 	scopeManager, err := scope.NewManager(
 		options.InScope,
@@ -103,8 +150,8 @@ func New(options *Options) (*DASTServer, error) {
 	if options.Token != "" {
 		builder.WriteString(" (with token)")
 	}
-	gologger.Info().Msgf("DAST Server API: %s", server.buildURL("/fuzz"))
-	gologger.Info().Msgf("DAST Server Stats URL: %s", server.buildURL("/stats"))
+	gologger.Info().Msgf("Server API: %s", server.buildURL("/fuzz"))
+	gologger.Info().Msgf("Server Stats URL: %s", server.buildURL("/stats"))
 
 	return server, nil
 }
@@ -112,7 +159,7 @@ func New(options *Options) (*DASTServer, error) {
 func NewStatsServer(fuzzStatsDB *stats.Tracker) (*DASTServer, error) {
 	server := &DASTServer{
 		nucleiExecutor: &nucleiExecutor{
-			executorOpts: &protocols.ExecutorOptions{
+			executorOpts: protocols.ExecutorOptions{
 				FuzzStatsDB: fuzzStatsDB,
 			},
 		},
@@ -124,8 +171,13 @@ func NewStatsServer(fuzzStatsDB *stats.Tracker) (*DASTServer, error) {
 }
 
 func (s *DASTServer) Close() {
-	s.nucleiExecutor.Close()
-	_ = s.echo.Close()
+	if s.nucleiExecutor != nil {
+		s.nucleiExecutor.Close()
+	}
+	if s.proxyServer != nil {
+		s.proxyServer.Close()
+	}
+	s.echo.Close()
 	s.tasksPool.StopAndWaitFor(1 * time.Minute)
 }
 
@@ -160,7 +212,7 @@ func (s *DASTServer) setupHandlers(onlyStats bool) {
 
 	if s.options.Token != "" {
 		e.Use(middleware.KeyAuthWithConfig(middleware.KeyAuthConfig{
-			KeyLookup: "query:token",
+			KeyLookup: "header:X-DAST-Server-Token",
 			Validator: func(key string, c echo.Context) (bool, error) {
 				return key == s.options.Token, nil
 			},
@@ -187,8 +239,9 @@ func (s *DASTServer) Start() error {
 
 // PostReuestsHandlerRequest is the request body for the /fuzz POST handler.
 type PostRequestsHandlerRequest struct {
-	RawHTTP string `json:"raw_http"`
-	URL     string `json:"url"`
+	RawRequest  string `json:"raw_request"`
+	RawResponse string `json:"raw_response"`
+	URL         string `json:"url"`
 }
 
 func (s *DASTServer) handleRequest(c echo.Context) error {
@@ -199,7 +252,7 @@ func (s *DASTServer) handleRequest(c echo.Context) error {
 	}
 
 	// Validate the request
-	if req.RawHTTP == "" || req.URL == "" {
+	if (req.RawRequest == "" || req.URL == "") && req.RawResponse == "" {
 		fmt.Printf("Missing required fields\n")
 		return c.JSON(400, map[string]string{"error": "missing required fields"})
 	}
@@ -253,10 +306,15 @@ func (s *DASTServer) getStats() (StatsResponse, error) {
 		DASTScanStatistics: DASTScanStatistics{
 			EndpointsInQueue:     s.endpointsInQueue.Load(),
 			EndpointsBeingTested: s.endpointsBeingTested.Load(),
-			TotalTemplatesLoaded: int64(len(s.nucleiExecutor.store.Templates())),
 		},
 	}
-	if s.nucleiExecutor.executorOpts.FuzzStatsDB != nil {
+	totalTemplatesLoaded := 0
+	if s.nucleiExecutor != nil {
+		totalTemplatesLoaded = len(s.nucleiExecutor.store.Templates())
+	}
+	resp.DASTScanStatistics.TotalTemplatesLoaded = int64(totalTemplatesLoaded)
+
+	if s.nucleiExecutor != nil && s.nucleiExecutor.executorOpts.FuzzStatsDB != nil {
 		fuzzStats := s.nucleiExecutor.executorOpts.FuzzStatsDB.GetStats()
 		resp.DASTScanSeverityBreakdown = fuzzStats.SeverityCounts
 		resp.DASTScanStatusStatistics = fuzzStats.StatusCodes

lib/config.go

@@ -7,8 +7,7 @@ import (
 
 	"github.com/projectdiscovery/goflags"
 	"github.com/projectdiscovery/gologger"
-	"github.com/projectdiscovery/nuclei/v3/pkg/utils"
-	"github.com/projectdiscovery/utils/errkit"
+	"github.com/projectdiscovery/ratelimit"
 
 	"github.com/projectdiscovery/nuclei/v3/pkg/authprovider"
 	"github.com/projectdiscovery/nuclei/v3/pkg/catalog"
@@ -20,7 +19,6 @@ import (
 	"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/templates/types"
-	pkgtypes "github.com/projectdiscovery/nuclei/v3/pkg/types"
 )
 
 // TemplateSources contains template sources
@@ -103,7 +101,7 @@ type InteractshOpts interactsh.Options
 func WithInteractshOptions(opts InteractshOpts) NucleiSDKOptions {
 	return func(e *NucleiEngine) error {
 		if e.mode == threadSafe {
-			return errkit.Wrap(ErrOptionsNotSupported, "WithInteractshOptions")
+			return ErrOptionsNotSupported.Msgf("WithInteractshOptions")
 		}
 		optsPtr := &opts
 		e.interactshOpts = (*interactsh.Options)(optsPtr)
@@ -181,7 +179,7 @@ func WithGlobalRateLimitCtx(ctx context.Context, maxTokens int, duration time.Du
 	return func(e *NucleiEngine) error {
 		e.opts.RateLimit = maxTokens
 		e.opts.RateLimitDuration = duration
-		e.rateLimiter = utils.GetRateLimiter(ctx, e.opts.RateLimit, e.opts.RateLimitDuration)
+		e.rateLimiter = ratelimit.New(ctx, uint(e.opts.RateLimit), e.opts.RateLimitDuration)
 		return nil
 	}
 }
@@ -207,7 +205,7 @@ func EnableHeadlessWithOpts(hopts *HeadlessOpts) NucleiSDKOptions {
 			e.opts.UseInstalledChrome = hopts.UseChrome
 		}
 		if engine.MustDisableSandbox() {
-			e.Logger.Warning().Msgf("The current platform and privileged user will run the browser without sandbox")
+			gologger.Warning().Msgf("The current platform and privileged user will run the browser without sandbox\n")
 		}
 		browser, err := engine.New(e.opts)
 		if err != nil {
@@ -230,7 +228,7 @@ type StatsOptions struct {
 func EnableStatsWithOpts(opts StatsOptions) NucleiSDKOptions {
 	return func(e *NucleiEngine) error {
 		if e.mode == threadSafe {
-			return errkit.Wrap(ErrOptionsNotSupported, "EnableStatsWithOpts")
+			return ErrOptionsNotSupported.Msgf("EnableStatsWithOpts")
 		}
 		if opts.Interval == 0 {
 			opts.Interval = 5 //sec
@@ -258,7 +256,7 @@ type VerbosityOptions struct {
 func WithVerbosity(opts VerbosityOptions) NucleiSDKOptions {
 	return func(e *NucleiEngine) error {
 		if e.mode == threadSafe {
-			return errkit.Wrap(ErrOptionsNotSupported, "WithVerbosity")
+			return ErrOptionsNotSupported.Msgf("WithVerbosity")
 		}
 		e.opts.Verbose = opts.Verbose
 		e.opts.Silent = opts.Silent
@@ -291,15 +289,15 @@ type NetworkConfig struct {
 func WithNetworkConfig(opts NetworkConfig) NucleiSDKOptions {
 	return func(e *NucleiEngine) error {
 		if e.mode == threadSafe {
-			return errkit.Wrap(ErrOptionsNotSupported, "WithNetworkConfig")
+			return ErrOptionsNotSupported.Msgf("WithNetworkConfig")
 		}
 		e.opts.NoHostErrors = opts.DisableMaxHostErr
 		e.opts.MaxHostError = opts.MaxHostError
 		if e.opts.ShouldUseHostError() {
 			maxHostError := opts.MaxHostError
 			if e.opts.TemplateThreads > maxHostError {
-				e.Logger.Warning().Msg("The concurrency value is higher than max-host-error")
-				e.Logger.Info().Msgf("Adjusting max-host-error to the concurrency value: %d", e.opts.TemplateThreads)
+				gologger.Print().Msgf("[%v] The concurrency value is higher than max-host-error", e.executerOpts.Colorizer.BrightYellow("WRN"))
+				gologger.Info().Msgf("Adjusting max-host-error to the concurrency value: %d", e.opts.TemplateThreads)
 				maxHostError = e.opts.TemplateThreads
 				e.opts.MaxHostError = maxHostError
 			}
@@ -322,7 +320,7 @@ func WithNetworkConfig(opts NetworkConfig) NucleiSDKOptions {
 func WithProxy(proxy []string, proxyInternalRequests bool) NucleiSDKOptions {
 	return func(e *NucleiEngine) error {
 		if e.mode == threadSafe {
-			return errkit.Wrap(ErrOptionsNotSupported, "WithProxy")
+			return ErrOptionsNotSupported.Msgf("WithProxy")
 		}
 		e.opts.Proxy = proxy
 		e.opts.ProxyInternal = proxyInternalRequests
@@ -347,7 +345,7 @@ type OutputWriter output.Writer
 func UseOutputWriter(writer OutputWriter) NucleiSDKOptions {
 	return func(e *NucleiEngine) error {
 		if e.mode == threadSafe {
-			return errkit.Wrap(ErrOptionsNotSupported, "UseOutputWriter")
+			return ErrOptionsNotSupported.Msgf("UseOutputWriter")
 		}
 		e.customWriter = writer
 		return nil
@@ -362,7 +360,7 @@ type StatsWriter progress.Progress
 func UseStatsWriter(writer StatsWriter) NucleiSDKOptions {
 	return func(e *NucleiEngine) error {
 		if e.mode == threadSafe {
-			return errkit.Wrap(ErrOptionsNotSupported, "UseStatsWriter")
+			return ErrOptionsNotSupported.Msgf("UseStatsWriter")
 		}
 		e.customProgress = writer
 		return nil
@@ -376,7 +374,7 @@ func UseStatsWriter(writer StatsWriter) NucleiSDKOptions {
 func WithTemplateUpdateCallback(disableTemplatesAutoUpgrade bool, callback func(newVersion string)) NucleiSDKOptions {
 	return func(e *NucleiEngine) error {
 		if e.mode == threadSafe {
-			return errkit.Wrap(ErrOptionsNotSupported, "WithTemplateUpdateCallback")
+			return ErrOptionsNotSupported.Msgf("WithTemplateUpdateCallback")
 		}
 		e.disableTemplatesAutoUpgrade = disableTemplatesAutoUpgrade
 		e.onUpdateAvailableCallback = callback
@@ -388,7 +386,7 @@ func WithTemplateUpdateCallback(disableTemplatesAutoUpgrade bool, callback func(
 func WithSandboxOptions(allowLocalFileAccess bool, restrictLocalNetworkAccess bool) NucleiSDKOptions {
 	return func(e *NucleiEngine) error {
 		if e.mode == threadSafe {
-			return errkit.Wrap(ErrOptionsNotSupported, "WithSandboxOptions")
+			return ErrOptionsNotSupported.Msgf("WithSandboxOptions")
 		}
 		e.opts.AllowLocalFileAccess = allowLocalFileAccess
 		e.opts.RestrictLocalNetworkAccess = restrictLocalNetworkAccess
@@ -421,14 +419,6 @@ func EnableGlobalMatchersTemplates() NucleiSDKOptions {
 	}
 }
 
-// DisableTemplateCache disables template caching
-func DisableTemplateCache() NucleiSDKOptions {
-	return func(e *NucleiEngine) error {
-		e.opts.DoNotCacheTemplates = true
-		return nil
-	}
-}
-
 // EnableFileTemplates allows loading/executing file protocol templates
 func EnableFileTemplates() NucleiSDKOptions {
 	return func(e *NucleiEngine) error {
@@ -473,14 +463,6 @@ func EnablePassiveMode() NucleiSDKOptions {
 	}
 }
 
-// EnableMatcherStatus allows enabling matcher status
-func EnableMatcherStatus() NucleiSDKOptions {
-	return func(e *NucleiEngine) error {
-		e.opts.MatcherStatus = true
-		return nil
-	}
-}
-
 // WithAuthProvider allows setting a custom authprovider implementation
 func WithAuthProvider(provider authprovider.AuthProvider) NucleiSDKOptions {
 	return func(e *NucleiEngine) error {
@@ -537,25 +519,3 @@ func WithResumeFile(file string) NucleiSDKOptions {
 		return nil
 	}
 }
-
-// WithLogger allows setting a shared gologger instance
-func WithLogger(logger *gologger.Logger) NucleiSDKOptions {
-	return func(e *NucleiEngine) error {
-		e.Logger = logger
-		if e.opts != nil {
-			e.opts.Logger = logger
-		}
-		if e.executerOpts != nil {
-			e.executerOpts.Logger = logger
-		}
-		return nil
-	}
-}
-
-// WithOptions sets all options at once
-func WithOptions(opts *pkgtypes.Options) NucleiSDKOptions {
-	return func(e *NucleiEngine) error {
-		e.opts = opts
-		return nil
-	}
-}

lib/example_test.go

@@ -1,4 +1,5 @@
 //go:build !race
+// +build !race
 
 package nuclei_test
 

lib/multi.go

@@ -12,9 +12,8 @@ import (
 	"github.com/projectdiscovery/nuclei/v3/pkg/output"
 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols"
 	"github.com/projectdiscovery/nuclei/v3/pkg/types"
-	"github.com/projectdiscovery/nuclei/v3/pkg/utils"
-	"github.com/projectdiscovery/utils/errkit"
-	"github.com/rs/xid"
+	"github.com/projectdiscovery/ratelimit"
+	errorutil "github.com/projectdiscovery/utils/errors"
 )
 
 // unsafeOptions are those nuclei objects/instances/types
@@ -22,14 +21,14 @@ import (
 // hence they are ephemeral and are created on every ExecuteNucleiWithOpts invocation
 // in ThreadSafeNucleiEngine
 type unsafeOptions struct {
-	executerOpts *protocols.ExecutorOptions
+	executerOpts protocols.ExecutorOptions
 	engine       *core.Engine
 }
 
 // createEphemeralObjects creates ephemeral nuclei objects/instances/types
 func createEphemeralObjects(ctx context.Context, base *NucleiEngine, opts *types.Options) (*unsafeOptions, error) {
 	u := &unsafeOptions{}
-	u.executerOpts = &protocols.ExecutorOptions{
+	u.executerOpts = protocols.ExecutorOptions{
 		Output:          base.customWriter,
 		Options:         opts,
 		Progress:        base.customProgress,
@@ -53,7 +52,11 @@ func createEphemeralObjects(ctx context.Context, base *NucleiEngine, opts *types
 	if opts.RateLimit > 0 && opts.RateLimitDuration == 0 {
 		opts.RateLimitDuration = time.Second
 	}
-	u.executerOpts.RateLimiter = utils.GetRateLimiter(ctx, opts.RateLimit, opts.RateLimitDuration)
+	if opts.RateLimit == 0 && opts.RateLimitDuration == 0 {
+		u.executerOpts.RateLimiter = ratelimit.NewUnlimited(ctx)
+	} else {
+		u.executerOpts.RateLimiter = ratelimit.New(ctx, uint(opts.RateLimit), opts.RateLimitDuration)
+	}
 	u.engine = core.New(opts)
 	u.engine.SetExecuterOptions(u.executerOpts)
 	return u, nil
@@ -85,11 +88,9 @@ type ThreadSafeNucleiEngine struct {
 // whose methods are thread-safe and can be used concurrently
 // Note: Non-thread-safe methods start with Global prefix
 func NewThreadSafeNucleiEngineCtx(ctx context.Context, opts ...NucleiSDKOptions) (*ThreadSafeNucleiEngine, error) {
-	defaultOptions := types.DefaultOptions()
-	defaultOptions.ExecutionId = xid.New().String()
 	// default options
 	e := &NucleiEngine{
-		opts: defaultOptions,
+		opts: types.DefaultOptions(),
 		mode: threadSafe,
 	}
 	for _, option := range opts {
@@ -124,8 +125,8 @@ func (e *ThreadSafeNucleiEngine) GlobalResultCallback(callback func(event *outpu
 // by invoking this method with different options and targets
 // Note: Not all options are thread-safe. this method will throw error if you try to use non-thread-safe options
 func (e *ThreadSafeNucleiEngine) ExecuteNucleiWithOptsCtx(ctx context.Context, targets []string, opts ...NucleiSDKOptions) error {
-	baseOpts := e.eng.opts.Copy()
-	tmpEngine := &NucleiEngine{opts: baseOpts, mode: threadSafe}
+	baseOpts := *e.eng.opts
+	tmpEngine := &NucleiEngine{opts: &baseOpts, mode: threadSafe}
 	for _, option := range opts {
 		if err := option(tmpEngine); err != nil {
 			return err
@@ -141,19 +142,19 @@ func (e *ThreadSafeNucleiEngine) ExecuteNucleiWithOptsCtx(ctx context.Context, t
 	defer closeEphemeralObjects(unsafeOpts)
 
 	// load templates
-	workflowLoader, err := workflow.NewLoader(unsafeOpts.executerOpts)
+	workflowLoader, err := workflow.NewLoader(&unsafeOpts.executerOpts)
 	if err != nil {
-		return errkit.Wrapf(err, "Could not create workflow loader: %s", err)
+		return errorutil.New("Could not create workflow loader: %s\n", err)
 	}
 	unsafeOpts.executerOpts.WorkflowLoader = workflowLoader
 
 	store, err := loader.New(loader.NewConfig(tmpEngine.opts, e.eng.catalog, unsafeOpts.executerOpts))
 	if err != nil {
-		return errkit.Wrapf(err, "Could not create loader client: %s", err)
+		return errorutil.New("Could not create loader client: %s\n", err)
 	}
 	store.Load()
 
-	inputProvider := provider.NewSimpleInputProviderWithUrls(e.eng.opts.ExecutionId, targets...)
+	inputProvider := provider.NewSimpleInputProviderWithUrls(targets...)
 
 	if len(store.Templates()) == 0 && len(store.Workflows()) == 0 {
 		return ErrNoTemplatesAvailable

lib/sdk.go

@@ -5,9 +5,7 @@ import (
 	"bytes"
 	"context"
 	"io"
-	"sync"
 
-	"github.com/projectdiscovery/gologger"
 	"github.com/projectdiscovery/nuclei/v3/pkg/authprovider"
 	"github.com/projectdiscovery/nuclei/v3/pkg/catalog"
 	"github.com/projectdiscovery/nuclei/v3/pkg/catalog/loader"
@@ -28,8 +26,7 @@ import (
 	"github.com/projectdiscovery/nuclei/v3/pkg/types"
 	"github.com/projectdiscovery/ratelimit"
 	"github.com/projectdiscovery/retryablehttp-go"
-	"github.com/projectdiscovery/utils/errkit"
-	"github.com/rs/xid"
+	errorutil "github.com/projectdiscovery/utils/errors"
 )
 
 // NucleiSDKOptions contains options for nuclei SDK
@@ -37,13 +34,13 @@ type NucleiSDKOptions func(e *NucleiEngine) error
 
 var (
 	// ErrNotImplemented is returned when a feature is not implemented
-	ErrNotImplemented = errkit.New("Not implemented")
+	ErrNotImplemented = errorutil.New("Not implemented")
 	// ErrNoTemplatesAvailable is returned when no templates are available to execute
-	ErrNoTemplatesAvailable = errkit.New("No templates available")
+	ErrNoTemplatesAvailable = errorutil.New("No templates available")
 	// ErrNoTargetsAvailable is returned when no targets are available to scan
-	ErrNoTargetsAvailable = errkit.New("No targets available")
+	ErrNoTargetsAvailable = errorutil.New("No targets available")
 	// ErrOptionsNotSupported is returned when an option is not supported in thread safe mode
-	ErrOptionsNotSupported = errkit.New("Option not supported in thread safe mode")
+	ErrOptionsNotSupported = errorutil.NewWithFmt("Option %v not supported in thread safe mode")
 )
 
 type engineMode uint
@@ -67,7 +64,6 @@ type NucleiEngine struct {
 	templatesLoaded bool
 
 	// unexported core fields
-	ctx              context.Context
 	interactshClient *interactsh.Client
 	catalog          catalog.Catalog
 	rateLimiter      *ratelimit.Limiter
@@ -88,23 +84,20 @@ type NucleiEngine struct {
 	customWriter   output.Writer
 	customProgress progress.Progress
 	rc             reporting.Client
-	executerOpts   *protocols.ExecutorOptions
-
-	// Logger instance for the engine
-	Logger *gologger.Logger
+	executerOpts   protocols.ExecutorOptions
 }
 
 // LoadAllTemplates loads all nuclei template based on given options
 func (e *NucleiEngine) LoadAllTemplates() error {
-	workflowLoader, err := workflow.NewLoader(e.executerOpts)
+	workflowLoader, err := workflow.NewLoader(&e.executerOpts)
 	if err != nil {
-		return errkit.Wrapf(err, "Could not create workflow loader: %s", err)
+		return errorutil.New("Could not create workflow loader: %s\n", err)
 	}
 	e.executerOpts.WorkflowLoader = workflowLoader
 
 	e.store, err = loader.New(loader.NewConfig(e.opts, e.catalog, e.executerOpts))
 	if err != nil {
-		return errkit.Wrapf(err, "Could not create loader client: %s", err)
+		return errorutil.New("Could not create loader client: %s\n", err)
 	}
 	e.store.Load()
 	e.templatesLoaded = true
@@ -131,9 +124,9 @@ func (e *NucleiEngine) GetWorkflows() []*templates.Template {
 func (e *NucleiEngine) LoadTargets(targets []string, probeNonHttp bool) {
 	for _, target := range targets {
 		if probeNonHttp {
-			_ = e.inputProvider.SetWithProbe(e.opts.ExecutionId, target, e.httpxClient)
+			_ = e.inputProvider.SetWithProbe(target, e.httpxClient)
 		} else {
-			e.inputProvider.Set(e.opts.ExecutionId, target)
+			e.inputProvider.Set(target)
 		}
 	}
 }
@@ -143,9 +136,9 @@ func (e *NucleiEngine) LoadTargetsFromReader(reader io.Reader, probeNonHttp bool
 	buff := bufio.NewScanner(reader)
 	for buff.Scan() {
 		if probeNonHttp {
-			_ = e.inputProvider.SetWithProbe(e.opts.ExecutionId, buff.Text(), e.httpxClient)
+			_ = e.inputProvider.SetWithProbe(buff.Text(), e.httpxClient)
 		} else {
-			e.inputProvider.Set(e.opts.ExecutionId, buff.Text())
+			e.inputProvider.Set(buff.Text())
 		}
 	}
 }
@@ -168,7 +161,7 @@ func (e *NucleiEngine) LoadTargetsWithHttpData(filePath string, filemode string)
 
 // GetExecuterOptions returns the nuclei executor options
 func (e *NucleiEngine) GetExecuterOptions() *protocols.ExecutorOptions {
-	return e.executerOpts
+	return &e.executerOpts
 }
 
 // ParseTemplate parses a template from given data
@@ -236,7 +229,7 @@ func (e *NucleiEngine) closeInternal() {
 // Close all resources used by nuclei engine
 func (e *NucleiEngine) Close() {
 	e.closeInternal()
-	protocolinit.Close(e.opts.ExecutionId)
+	protocolinit.Close()
 }
 
 // ExecuteCallbackWithCtx executes templates on targets and calls callback on each result(only if results are found)
@@ -253,9 +246,9 @@ func (e *NucleiEngine) ExecuteCallbackWithCtx(ctx context.Context, callback ...f
 	}
 
 	filtered := []func(event *output.ResultEvent){}
-	for _, cb := range callback {
-		if cb != nil {
-			filtered = append(filtered, cb)
+	for _, callback := range callback {
+		if callback != nil {
+			filtered = append(filtered, callback)
 		}
 	}
 	e.resultCallbacks = append(e.resultCallbacks, filtered...)
@@ -265,32 +258,15 @@ func (e *NucleiEngine) ExecuteCallbackWithCtx(ctx context.Context, callback ...f
 		return ErrNoTemplatesAvailable
 	}
 
-	var wg sync.WaitGroup
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		_ = e.engine.ExecuteScanWithOpts(ctx, templatesAndWorkflows, e.inputProvider, false)
-	}()
-
-	// wait for context to be cancelled
-	select {
-	case <-ctx.Done():
-		<-wait(&wg) // wait for scan to finish
-		return ctx.Err()
-	case <-wait(&wg):
-		// scan finished
-	}
+	_ = e.engine.ExecuteScanWithOpts(ctx, templatesAndWorkflows, e.inputProvider, false)
+	defer e.engine.WorkPool().Wait()
 	return nil
 }
 
 // ExecuteWithCallback is same as ExecuteCallbackWithCtx but with default context
 // Note this is deprecated and will be removed in future major release
 func (e *NucleiEngine) ExecuteWithCallback(callback ...func(event *output.ResultEvent)) error {
-	ctx := context.Background()
-	if e.ctx != nil {
-		ctx = e.ctx
-	}
-	return e.ExecuteCallbackWithCtx(ctx, callback...)
+	return e.ExecuteCallbackWithCtx(context.Background(), callback...)
 }
 
 // Options return nuclei Type Options
@@ -311,12 +287,9 @@ func (e *NucleiEngine) Store() *loader.Store {
 // NewNucleiEngineCtx creates a new nuclei engine instance with given context
 func NewNucleiEngineCtx(ctx context.Context, options ...NucleiSDKOptions) (*NucleiEngine, error) {
 	// default options
-	defaultOptions := types.DefaultOptions()
-	defaultOptions.ExecutionId = xid.New().String()
 	e := &NucleiEngine{
-		opts: defaultOptions,
+		opts: types.DefaultOptions(),
 		mode: singleInstance,
-		ctx:  ctx,
 	}
 	for _, option := range options {
 		if err := option(e); err != nil {
@@ -333,18 +306,3 @@ func NewNucleiEngineCtx(ctx context.Context, options ...NucleiSDKOptions) (*Nucl
 func NewNucleiEngine(options ...NucleiSDKOptions) (*NucleiEngine, error) {
 	return NewNucleiEngineCtx(context.Background(), options...)
 }
-
-// GetParser returns the template parser with cache
-func (e *NucleiEngine) GetParser() *templates.Parser {
-	return e.parser
-}
-
-// wait for a waitgroup to finish
-func wait(wg *sync.WaitGroup) <-chan struct{} {
-	ch := make(chan struct{})
-	go func() {
-		defer close(ch)
-		wg.Wait()
-	}()
-	return ch
-}

lib/sdk_private.go

@@ -8,7 +8,6 @@ import (
 	"time"
 
 	"github.com/projectdiscovery/nuclei/v3/pkg/input"
-	"github.com/projectdiscovery/nuclei/v3/pkg/reporting"
 
 	"github.com/logrusorgru/aurora"
 	"github.com/pkg/errors"
@@ -30,6 +29,7 @@ import (
 	"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/http/httpclientpool"
+	"github.com/projectdiscovery/nuclei/v3/pkg/reporting"
 	"github.com/projectdiscovery/nuclei/v3/pkg/templates"
 	"github.com/projectdiscovery/nuclei/v3/pkg/testutils"
 	"github.com/projectdiscovery/nuclei/v3/pkg/types"
@@ -37,6 +37,8 @@ import (
 	"github.com/projectdiscovery/ratelimit"
 )
 
+var sharedInit *sync.Once
+
 // applyRequiredDefaults to options
 func (e *NucleiEngine) applyRequiredDefaults(ctx context.Context) {
 	mockoutput := testutils.NewMockOutputWriter(e.opts.OmitTemplate)
@@ -96,39 +98,27 @@ func (e *NucleiEngine) applyRequiredDefaults(ctx context.Context) {
 
 // init
 func (e *NucleiEngine) init(ctx context.Context) error {
-	// Set a default logger if one isn't provided in the options
-	if e.opts.Logger != nil {
-		e.Logger = e.opts.Logger
-	} else {
-		e.opts.Logger = &gologger.Logger{}
-	}
-	e.Logger = e.opts.Logger
-
 	if e.opts.Verbose {
-		e.Logger.SetMaxLevel(levels.LevelVerbose)
+		gologger.DefaultLogger.SetMaxLevel(levels.LevelVerbose)
 	} else if e.opts.Debug {
-		e.Logger.SetMaxLevel(levels.LevelDebug)
+		gologger.DefaultLogger.SetMaxLevel(levels.LevelDebug)
 	} else if e.opts.Silent {
-		e.Logger.SetMaxLevel(levels.LevelSilent)
+		gologger.DefaultLogger.SetMaxLevel(levels.LevelSilent)
 	}
 
 	if err := runner.ValidateOptions(e.opts); err != nil {
 		return err
 	}
 
-	if e.opts.Parser != nil {
-		if op, ok := e.opts.Parser.(*templates.Parser); ok {
-			e.parser = op
-		}
+	e.parser = templates.NewParser()
+
+	if sharedInit == nil || protocolstate.ShouldInit() {
+		sharedInit = &sync.Once{}
 	}
 
-	if e.parser == nil {
-		e.parser = templates.NewParser()
-	}
-
-	if protocolstate.ShouldInit(e.opts.ExecutionId) {
+	sharedInit.Do(func() {
 		_ = protocolinit.Init(e.opts)
-	}
+	})
 
 	if e.opts.ProxyInternal && e.opts.AliveHttpProxy != "" || e.opts.AliveSocksProxy != "" {
 		httpclient, err := httpclientpool.Get(e.opts, &httpclientpool.Configuration{})
@@ -170,7 +160,7 @@ func (e *NucleiEngine) init(ctx context.Context) error {
 		e.catalog = disk.NewCatalog(config.DefaultConfig.TemplatesDirectory)
 	}
 
-	e.executerOpts = &protocols.ExecutorOptions{
+	e.executerOpts = protocols.ExecutorOptions{
 		Output:       e.customWriter,
 		Options:      e.opts,
 		Progress:     e.customProgress,
@@ -183,13 +173,12 @@ func (e *NucleiEngine) init(ctx context.Context) error {
 		Browser:      e.browserInstance,
 		Parser:       e.parser,
 		InputHelper:  input.NewHelper(),
-		Logger:       e.opts.Logger,
 	}
 	if e.opts.ShouldUseHostError() && e.hostErrCache != nil {
 		e.executerOpts.HostErrorsCache = e.hostErrCache
 	}
 	if len(e.opts.SecretsFile) > 0 {
-		authTmplStore, err := runner.GetAuthTmplStore(e.opts, e.catalog, e.executerOpts)
+		authTmplStore, err := runner.GetAuthTmplStore(*e.opts, e.catalog, e.executerOpts)
 		if err != nil {
 			return errors.Wrap(err, "failed to load dynamic auth templates")
 		}
@@ -231,25 +220,6 @@ func (e *NucleiEngine) init(ctx context.Context) error {
 		}
 	}
 
-	// Handle the case where the user passed an existing parser that we can use as a cache
-	if e.opts.Parser != nil {
-		if cachedParser, ok := e.opts.Parser.(*templates.Parser); ok {
-			e.parser = cachedParser
-			e.opts.Parser = cachedParser
-			e.executerOpts.Parser = cachedParser
-			e.executerOpts.Options.Parser = cachedParser
-		}
-	}
-
-	// Create a new parser if necessary
-	if e.parser == nil {
-		op := templates.NewParser()
-		e.parser = op
-		e.opts.Parser = op
-		e.executerOpts.Parser = op
-		e.executerOpts.Options.Parser = op
-	}
-
 	e.engine = core.New(e.opts)
 	e.engine.SetExecuterOptions(e.executerOpts)
 

lib/sdk_test.go

@@ -1,37 +0,0 @@
-package nuclei_test
-
-import (
-	"context"
-	"log"
-	"testing"
-	"time"
-
-	nuclei "github.com/projectdiscovery/nuclei/v3/lib"
-	"github.com/stretchr/testify/require"
-)
-
-func TestContextCancelNucleiEngine(t *testing.T) {
-	// create nuclei engine with options
-	ctx, cancel := context.WithCancel(context.Background())
-	ne, err := nuclei.NewNucleiEngineCtx(ctx,
-		nuclei.WithTemplateFilters(nuclei.TemplateFilters{Tags: []string{"oast"}}),
-		nuclei.EnableStatsWithOpts(nuclei.StatsOptions{MetricServerPort: 0}),
-	)
-	require.NoError(t, err, "could not create nuclei engine")
-
-	go func() {
-		time.Sleep(time.Second * 2)
-		cancel()
-		log.Println("Test: context cancelled")
-	}()
-
-	// load targets and optionally probe non http/https targets
-	ne.LoadTargets([]string{"http://honey.scanme.sh"}, false)
-	// when callback is nil it nuclei will print JSON output to stdout
-	err = ne.ExecuteWithCallback(nil)
-	if err != nil {
-		// we expect a context cancellation error
-		require.ErrorIs(t, err, context.Canceled, "was expecting context cancellation error")
-	}
-	defer ne.Close()
-}

nuclei-jsonschema.json

@@ -59,11 +59,6 @@
           "title": "engine",
           "description": "Engine"
         },
-        "sandbox": {
-          "$ref": "#/$defs/code.Sandbox",
-          "title": "sandbox",
-          "description": "Sandbox"
-        },
         "pre-condition": {
           "type": "string",
           "title": "pre-condition for the request",
@@ -91,22 +86,6 @@
       "additionalProperties": false,
       "type": "object"
     },
-    "code.Sandbox": {
-      "properties": {
-        "working-dir": {
-          "type": "string",
-          "title": "working-dir",
-          "description": "Working directory"
-        },
-        "image": {
-          "type": "string",
-          "title": "image",
-          "description": "Image"
-        }
-      },
-      "additionalProperties": false,
-      "type": "object"
-    },
     "dns.DNSRequestTypeHolder": {
       "type": "string",
       "enum": [

pkg/authprovider/authx/dynamic.go

@@ -3,12 +3,12 @@ package authx
 import (
 	"fmt"
 	"strings"
-	"sync/atomic"
+	"sync"
 
 	"github.com/projectdiscovery/gologger"
 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/replacer"
 	"github.com/projectdiscovery/nuclei/v3/pkg/utils/json"
-	"github.com/projectdiscovery/utils/errkit"
+	errorutil "github.com/projectdiscovery/utils/errors"
 	sliceutil "github.com/projectdiscovery/utils/slice"
 )
 
@@ -30,8 +30,8 @@ type Dynamic struct {
 	Input         string                 `json:"input" yaml:"input"` // (optional) target for the dynamic secret
 	Extracted     map[string]interface{} `json:"-" yaml:"-"`         // extracted values from the dynamic secret
 	fetchCallback LazyFetchSecret        `json:"-" yaml:"-"`
-	fetched       *atomic.Bool           `json:"-" yaml:"-"` // atomic flag to check if the secret has been fetched
-	fetching      *atomic.Bool           `json:"-" yaml:"-"` // atomic flag to prevent recursive fetch calls
+	m             *sync.Mutex            `json:"-" yaml:"-"` // mutex for lazy fetch
+	fetched       bool                   `json:"-" yaml:"-"` // flag to check if the secret has been fetched
 	error         error                  `json:"-" yaml:"-"` // error if any
 }
 
@@ -43,8 +43,8 @@ func (d *Dynamic) GetDomainAndDomainRegex() ([]string, []string) {
 		domainRegex = append(domainRegex, secret.DomainsRegex...)
 	}
 	if d.Secret != nil {
-		domains = append(domains, d.Domains...)
-		domainRegex = append(domainRegex, d.DomainsRegex...)
+		domains = append(domains, d.Secret.Domains...)
+		domainRegex = append(domainRegex, d.Secret.DomainsRegex...)
 	}
 	uniqueDomains := sliceutil.Dedupe(domains)
 	uniqueDomainRegex := sliceutil.Dedupe(domainRegex)
@@ -52,35 +52,29 @@ func (d *Dynamic) GetDomainAndDomainRegex() ([]string, []string) {
 }
 
 func (d *Dynamic) UnmarshalJSON(data []byte) error {
-	if d == nil {
-		return errkit.New("cannot unmarshal into nil Dynamic struct")
-	}
-
-	// Use an alias type (auxiliary) to avoid a recursive call in this method.
-	type Alias Dynamic
-
-	// If d.Secret was nil, json.Unmarshal will allocate a new Secret object
-	// and populate it from the top level JSON fields.
-	if err := json.Unmarshal(data, (*Alias)(d)); err != nil {
+	if err := json.Unmarshal(data, &d); err != nil {
 		return err
 	}
-
+	var s Secret
+	if err := json.Unmarshal(data, &s); err != nil {
+		return err
+	}
+	d.Secret = &s
 	return nil
 }
 
 // Validate validates the dynamic secret
 func (d *Dynamic) Validate() error {
-	d.fetched = &atomic.Bool{}
-	d.fetching = &atomic.Bool{}
+	d.m = &sync.Mutex{}
 	if d.TemplatePath == "" {
-		return errkit.New(" template-path is required for dynamic secret")
+		return errorutil.New(" template-path is required for dynamic secret")
 	}
 	if len(d.Variables) == 0 {
-		return errkit.New("variables are required for dynamic secret")
+		return errorutil.New("variables are required for dynamic secret")
 	}
 
 	if d.Secret != nil {
-		d.skipCookieParse = true // skip cookie parsing in dynamic secrets during validation
+		d.Secret.skipCookieParse = true // skip cookie parsing in dynamic secrets during validation
 		if err := d.Secret.Validate(); err != nil {
 			return err
 		}
@@ -98,7 +92,9 @@ func (d *Dynamic) Validate() error {
 func (d *Dynamic) SetLazyFetchCallback(callback LazyFetchSecret) {
 	d.fetchCallback = func(d *Dynamic) error {
 		err := callback(d)
+		d.fetched = true
 		if err != nil {
+			d.error = err
 			return err
 		}
 		if len(d.Extracted) == 0 {
@@ -183,21 +179,15 @@ func (d *Dynamic) applyValuesToSecret(secret *Secret) error {
 
 // GetStrategy returns the auth strategies for the dynamic secret
 func (d *Dynamic) GetStrategies() []AuthStrategy {
-	if d.fetched.Load() {
-		if d.error != nil {
-			return nil
-		}
-	} else {
-		// Try to fetch if not already fetched
+	if !d.fetched {
 		_ = d.Fetch(true)
 	}
-
 	if d.error != nil {
 		return nil
 	}
 	var strategies []AuthStrategy
 	if d.Secret != nil {
-		strategies = append(strategies, d.GetStrategy())
+		strategies = append(strategies, d.Secret.GetStrategy())
 	}
 	for _, secret := range d.Secrets {
 		strategies = append(strategies, secret.GetStrategy())
@@ -208,23 +198,12 @@ func (d *Dynamic) GetStrategies() []AuthStrategy {
 // Fetch fetches the dynamic secret
 // if isFatal is true, it will stop the execution if the secret could not be fetched
 func (d *Dynamic) Fetch(isFatal bool) error {
-	if d.fetched.Load() {
-		return d.error
+	d.m.Lock()
+	defer d.m.Unlock()
+	if d.fetched {
+		return nil
 	}
-
-	// Try to set fetching flag atomically
-	if !d.fetching.CompareAndSwap(false, true) {
-		// Already fetching, return current error
-		return d.error
-	}
-
-	// We're the only one fetching, call the callback
 	d.error = d.fetchCallback(d)
-
-	// Mark as fetched and clear fetching flag
-	d.fetched.Store(true)
-	d.fetching.Store(false)
-
 	if d.error != nil && isFatal {
 		gologger.Fatal().Msgf("Could not fetch dynamic secret: %s\n", d.error)
 	}

pkg/authprovider/authx/dynamic_test.go

@@ -1,125 +0,0 @@
-package authx
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestDynamicUnmarshalJSON(t *testing.T) {
-	t.Run("basic-unmarshal", func(t *testing.T) {
-		data := []byte(`{
-			"template": "test-template.yaml",
-			"variables": [
-				{
-					"key": "username",
-					"value": "testuser"
-				}
-			],
-			"secrets": [
-				{
-					"type": "BasicAuth",
-					"domains": ["example.com"],
-					"username": "user1",
-					"password": "pass1"
-				}
-			],
-			"type": "BasicAuth",
-			"domains": ["test.com"],
-			"username": "testuser",
-			"password": "testpass"
-		}`)
-
-		var d Dynamic
-		err := d.UnmarshalJSON(data)
-		require.NoError(t, err)
-
-		// Secret
-		require.NotNil(t, d.Secret)
-		require.Equal(t, "BasicAuth", d.Type)
-		require.Equal(t, []string{"test.com"}, d.Domains)
-		require.Equal(t, "testuser", d.Username)
-		require.Equal(t, "testpass", d.Password)
-
-		// Dynamic fields
-		require.Equal(t, "test-template.yaml", d.TemplatePath)
-		require.Len(t, d.Variables, 1)
-		require.Equal(t, "username", d.Variables[0].Key)
-		require.Equal(t, "testuser", d.Variables[0].Value)
-		require.Len(t, d.Secrets, 1)
-		require.Equal(t, "BasicAuth", d.Secrets[0].Type)
-		require.Equal(t, []string{"example.com"}, d.Secrets[0].Domains)
-		require.Equal(t, "user1", d.Secrets[0].Username)
-		require.Equal(t, "pass1", d.Secrets[0].Password)
-	})
-
-	t.Run("complex-unmarshal", func(t *testing.T) {
-		data := []byte(`{
-			"template": "test-template.yaml",
-			"variables": [
-				{
-					"key": "token",
-					"value": "Bearer xyz"
-				}
-			],
-			"secrets": [
-				{
-					"type": "CookiesAuth",
-					"domains": ["example.com"],
-					"cookies": [
-						{
-							"key": "session",
-							"value": "abc123"
-						}
-					]
-				}
-			],
-			"type": "HeadersAuth",
-			"domains": ["api.test.com"],
-			"headers": [
-				{
-					"key": "X-API-Key",
-					"value": "secret-key"
-				}
-			]
-		}`)
-
-		var d Dynamic
-		err := d.UnmarshalJSON(data)
-		require.NoError(t, err)
-
-		// Secret
-		require.NotNil(t, d.Secret)
-		require.Equal(t, "HeadersAuth", d.Type)
-		require.Equal(t, []string{"api.test.com"}, d.Domains)
-		require.Len(t, d.Headers, 1)
-		require.Equal(t, "X-API-Key", d.Secret.Headers[0].Key)
-		require.Equal(t, "secret-key", d.Secret.Headers[0].Value)
-
-		// Dynamic fields
-		require.Equal(t, "test-template.yaml", d.TemplatePath)
-		require.Len(t, d.Variables, 1)
-		require.Equal(t, "token", d.Variables[0].Key)
-		require.Equal(t, "Bearer xyz", d.Variables[0].Value)
-		require.Len(t, d.Secrets, 1)
-		require.Equal(t, "CookiesAuth", d.Secrets[0].Type)
-		require.Equal(t, []string{"example.com"}, d.Secrets[0].Domains)
-		require.Len(t, d.Secrets[0].Cookies, 1)
-		require.Equal(t, "session", d.Secrets[0].Cookies[0].Key)
-		require.Equal(t, "abc123", d.Secrets[0].Cookies[0].Value)
-	})
-
-	t.Run("invalid-json", func(t *testing.T) {
-		data := []byte(`{invalid json}`)
-		var d Dynamic
-		err := d.UnmarshalJSON(data)
-		require.Error(t, err)
-	})
-
-	t.Run("empty-json", func(t *testing.T) {
-		data := []byte(`{}`)
-		var d Dynamic
-		err := d.UnmarshalJSON(data)
-		require.NoError(t, err)
-	})
-}

pkg/authprovider/authx/file.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"github.com/projectdiscovery/nuclei/v3/pkg/utils/json"
-	"github.com/projectdiscovery/utils/errkit"
+	errorutil "github.com/projectdiscovery/utils/errors"
 	"github.com/projectdiscovery/utils/generic"
 	stringsutil "github.com/projectdiscovery/utils/strings"
 	"gopkg.in/yaml.v3"
@@ -55,7 +55,7 @@ type Secret struct {
 	Type            string   `json:"type" yaml:"type"`
 	Domains         []string `json:"domains" yaml:"domains"`
 	DomainsRegex    []string `json:"domains-regex" yaml:"domains-regex"`
-	Headers         []KV     `json:"headers" yaml:"headers"` // Headers preserve exact casing (useful for case-sensitive APIs)
+	Headers         []KV     `json:"headers" yaml:"headers"`
 	Cookies         []Cookie `json:"cookies" yaml:"cookies"`
 	Params          []KV     `json:"params" yaml:"params"`
 	Username        string   `json:"username" yaml:"username"` // can be either email or username
@@ -148,7 +148,7 @@ func (s *Secret) Validate() error {
 }
 
 type KV struct {
-	Key   string `json:"key" yaml:"key"`   // Header key (preserves exact casing)
+	Key   string `json:"key" yaml:"key"`
 	Value string `json:"value" yaml:"value"`
 }
 
@@ -237,9 +237,7 @@ func GetAuthDataFromYAML(data []byte) (*Authx, error) {
 	var auth Authx
 	err := yaml.Unmarshal(data, &auth)
 	if err != nil {
-		errorErr := errkit.FromError(err)
-		errorErr.Msgf("could not unmarshal yaml")
-		return nil, errorErr
+		return nil, errorutil.NewWithErr(err).Msgf("could not unmarshal yaml")
 	}
 	return &auth, nil
 }
@@ -249,9 +247,7 @@ func GetAuthDataFromJSON(data []byte) (*Authx, error) {
 	var auth Authx
 	err := json.Unmarshal(data, &auth)
 	if err != nil {
-		errorErr := errkit.FromError(err)
-		errorErr.Msgf("could not unmarshal json")
-		return nil, errorErr
+		return nil, errorutil.NewWithErr(err).Msgf("could not unmarshal json")
 	}
 	return &auth, nil
 }

pkg/authprovider/authx/headers_auth.go

@@ -21,19 +21,15 @@ func NewHeadersAuthStrategy(data *Secret) *HeadersAuthStrategy {
 }
 
 // Apply applies the headers auth strategy to the request
-// NOTE: This preserves exact header casing (e.g., barAuthToken stays as barAuthToken)
-// This is useful for APIs that require case-sensitive header names
 func (s *HeadersAuthStrategy) Apply(req *http.Request) {
 	for _, header := range s.Data.Headers {
-		req.Header[header.Key] = []string{header.Value}
+		req.Header.Set(header.Key, header.Value)
 	}
 }
 
 // ApplyOnRR applies the headers auth strategy to the retryable request
-// NOTE: This preserves exact header casing (e.g., barAuthToken stays as barAuthToken)
-// This is useful for APIs that require case-sensitive header names
 func (s *HeadersAuthStrategy) ApplyOnRR(req *retryablehttp.Request) {
 	for _, header := range s.Data.Headers {
-		req.Header[header.Key] = []string{header.Value}
+		req.Header.Set(header.Key, header.Value)
 	}
 }

pkg/authprovider/authx/testData/example-auth.yaml

@@ -12,8 +12,6 @@ info:
 # static secrets
 static:
   # for header based auth session
-  # NOTE: Headers preserve exact casing (e.g., x-pdcp-key stays as x-pdcp-key)
-  # This is useful for APIs that require case-sensitive header names
   - type: header
     domains:
       - api.projectdiscovery.io
@@ -22,8 +20,6 @@ static:
     headers:
       - key: x-pdcp-key
         value: <api-key-here>
-      - key: barAuthToken
-        value: <auth-token-here>
 
   # for query based auth session
   - type: Query

pkg/authprovider/file.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/projectdiscovery/nuclei/v3/pkg/authprovider/authx"
-	"github.com/projectdiscovery/utils/errkit"
+	errorutil "github.com/projectdiscovery/utils/errors"
 	urlutil "github.com/projectdiscovery/utils/url"
 )
 
@@ -30,20 +30,16 @@ func NewFileAuthProvider(path string, callback authx.LazyFetchSecret) (AuthProvi
 		return nil, ErrNoSecrets
 	}
 	if len(store.Dynamic) > 0 && callback == nil {
-		return nil, errkit.New("lazy fetch callback is required for dynamic secrets")
+		return nil, errorutil.New("lazy fetch callback is required for dynamic secrets")
 	}
 	for _, secret := range store.Secrets {
 		if err := secret.Validate(); err != nil {
-			errorErr := errkit.FromError(err)
-			errorErr.Msgf("invalid secret in file: %s", path)
-			return nil, errorErr
+			return nil, errorutil.NewWithErr(err).Msgf("invalid secret in file: %s", path)
 		}
 	}
 	for i, dynamic := range store.Dynamic {
 		if err := dynamic.Validate(); err != nil {
-			errorErr := errkit.FromError(err)
-			errorErr.Msgf("invalid dynamic in file: %s", path)
-			return nil, errorErr
+			return nil, errorutil.NewWithErr(err).Msgf("invalid dynamic in file: %s", path)
 		}
 		dynamic.SetLazyFetchCallback(callback)
 		store.Dynamic[i] = dynamic

pkg/catalog/aws/catalog.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"io"
 	"path"
-	"slices"
 	"strings"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
@@ -141,8 +140,10 @@ func (c Catalog) ResolvePath(templateName, second string) (string, error) {
 	}
 
 	// check if templateName is already an absolute path to c key
-	if slices.Contains(keys, templateName) {
-		return templateName, nil
+	for _, key := range keys {
+		if key == templateName {
+			return templateName, nil
+		}
 	}
 
 	return "", fmt.Errorf("no such path found: %s%s for keys: %v", second, templateName, keys)

pkg/catalog/aws/catalog_test.go

@@ -3,7 +3,6 @@ package aws
 import (
 	"io"
 	"reflect"
-	"slices"
 	"strings"
 	"testing"
 
@@ -251,7 +250,13 @@ func (m mocks3svc) getAllKeys() ([]string, error) {
 }
 
 func (m mocks3svc) downloadKey(name string) (io.ReadCloser, error) {
-	found := slices.Contains(m.keys, name)
+	found := false
+	for _, key := range m.keys {
+		if key == name {
+			found = true
+			break
+		}
+	}
 	if !found {
 		return nil, errors.New("key not found")
 	}

pkg/catalog/config/constants.go

@@ -31,7 +31,7 @@ const (
 	CLIConfigFileName               = "config.yaml"
 	ReportingConfigFilename         = "reporting-config.yaml"
 	// Version is the current version of nuclei
-	Version = `v3.5.0`
+	Version = `v3.4.2`
 	// Directory Names of custom templates
 	CustomS3TemplatesDirName     = "s3"
 	CustomGitHubTemplatesDirName = "github"
@@ -40,28 +40,24 @@ const (
 	BinaryName                   = "nuclei"
 	FallbackConfigFolderName     = ".nuclei-config"
 	NucleiConfigDirEnv           = "NUCLEI_CONFIG_DIR"
-	NucleiTemplatesDirEnv        = "NUCLEI_TEMPLATES_DIR"
 )
 
 // IsOutdatedVersion compares two versions and returns true
 // if the current version is outdated
 func IsOutdatedVersion(current, latest string) bool {
 	if latest == "" {
-		// NOTE(dwisiswant0): if PDTM API call failed or returned empty, we
-		// cannot determine if templates are outdated w/o additional checks
-		// return false to avoid unnecessary updates.
-		return false
+		// if pdtm api call failed it's assumed that the current version is outdated
+		// and it will be confirmed while updating from GitHub
+		// this fixes `version string empty` errors
+		return true
 	}
-
 	current = trimDevIfExists(current)
 	currentVer, _ := semver.NewVersion(current)
 	newVer, _ := semver.NewVersion(latest)
-
 	if currentVer == nil || newVer == nil {
-		// fallback to naive comparison - return true only if they are different
-		return current != latest
+		// fallback to naive comparison
+		return current == latest
 	}
-
 	return newVer.GreaterThan(currentVer)
 }