Merge dev

Bound timeouts
Fix review
2026-11-08 02:08:33 -10:00 · 2026-10-26 13:48:11 +01:00 · 2026-10-26 07:54:40 +01:00 · 2026-10-26 07:50:51 +01:00 · 2026-10-26 07:46:56 +01:00 · 2026-08-26 12:56:54 +04:00
186 changed files with 2696 additions and 7413 deletions
@@ -36,7 +36,7 @@ It also specifies a `WorkflowLoader` interface that is used during workflow load

 ```go
 type WorkflowLoader interface {
-	GetTemplatePathsByTags(tags []string, noValidate bool) []string
+	GetTemplatePathsByTags(tags []string) []string
 	GetTemplatePaths(templatesList []string, noValidate bool) []string
 }
 ```
@@ -145,12 +145,12 @@ TARGET:
   -eh, -exclude-hosts string[]  hosts to exclude to scan from the input list (ip, cidr, hostname)
   -resume string                resume scan from and save to specified file (clustering will be disabled)
   -sa, -scan-all-ips            scan all the IP's associated with dns record
-   -iv, -ip-version string[]     IP version to scan of hostname (4,6); default uses dialer fallback, -sa scans all addresses
+   -iv, -ip-version string[]     IP version to scan of hostname (4,6) - (default 4)
   -dun, -disable-url-normalization  keep targets exactly as supplied instead of collapsing urls that address the same resource
   -mup, -max-urls-per-pattern int   scan at most this many urls sharing one structural shape, e.g. /user/1 and /user/2 (0 to scan all)

 TARGET-FORMAT:
-   -im, -input-mode string        mode of input file (list, burp, har, jsonl, yaml, openapi, swagger, http) (default "list")
+   -im, -input-mode string        mode of input file (list, burp, jsonl, yaml, openapi, swagger, http) (default "list")
   -ro, -required-only            use only required fields in input format when generating requests
   -sfv, -skip-format-validation  skip format validation (like missing vars) when parsing input file
   -vtt, -vars-text-templating    enable text templating for vars in input file (only for yaml input mode)
@@ -177,7 +177,7 @@ TEMPLATES:
   -egm, -enable-global-matchers          enable loading global matchers templates
   -file                                  enable loading file templates
   -llm                                   enable llm matchers and extractors (semantic matching)
-   -llm-provider string                   llm provider for semantic matching (openai, ollama, llamacpp, vllm, lmstudio, groq, openrouter, together, orcarouter, jev) (default "openai")
+   -llm-provider string                   llm provider for semantic matching (openai, ollama, llamacpp, vllm, lmstudio, groq, openrouter, together, orcarouter) (default "openai")
   -llm-base-url string                   openai-compatible endpoint for semantic matching (overrides -llm-provider, e.g. a local model)
   -llm-model string                      model used for semantic matching
   -llm-timeout int                       time in seconds to wait for a single llm call (default 30)
@@ -221,7 +221,6 @@ OUTPUT:
   -jle, -jsonl-export string    file to export results in JSONL(ine) format
   -pe, -pdf-export string       file to export results in PDF format
   -rd, -redact string[]         redact given list of keys from query parameter, request header and body
-   -nrd, -no-redact              disable the built-in redaction of credential headers (Authorization, Cookie, Set-Cookie, ...) in output; keys given with -redact are still redacted

 CONFIGURATIONS:
   -config string                        path to the nuclei configuration file
@@ -327,7 +326,6 @@ OPTIMIZATIONS:
   -nh, -no-httpx                   disable httpx probing for non-url input
   -preflight-portscan              run preflight resolve + TCP portscan and filter targets before scanning (disabled by default)
   -no-stdin                        disable stdin processing
-   -ac, -auto-calibrate             drop HTTP matches on a host's catch-all page (answers missing paths with 2xx/3xx)

 HEADLESS:
   -headless                        enable templates that require headless browser support (root user on Linux will disable sandbox)
@@ -148,7 +148,7 @@ TARGET:
   -iv, -ip-version string[]     IP version to scan of hostname (4,6) - (default 4)

 TARGET-FORMAT:
-   -im, -input-mode string        mode of input file (list, burp, har, jsonl, yaml, openapi, swagger, http) (default "list")
+   -im, -input-mode string        mode of input file (list, burp, jsonl, yaml, openapi, swagger, http) (default "list")
   -ro, -required-only            use only required fields in input format when generating requests
   -sfv, -skip-format-validation  skip format validation (like missing vars) when parsing input file
   -vtt, -vars-text-templating    enable text templating for vars in input file (only for yaml input mode)
@@ -175,7 +175,7 @@ TEMPLATES:
   -egm, -enable-global-matchers          enable loading global matchers templates
   -file                                  enable loading file templates
   -llm                                   enable llm matchers and extractors (semantic matching)
-   -llm-provider string                   llm provider for semantic matching (openai, ollama, llamacpp, vllm, lmstudio, groq, openrouter, together, orcarouter, jev) (default "openai")
+   -llm-provider string                   llm provider for semantic matching (openai, ollama, llamacpp, vllm, lmstudio, groq, openrouter, together, orcarouter) (default "openai")
   -llm-base-url string                   openai-compatible endpoint for semantic matching (overrides -llm-provider, e.g. a local model)
   -llm-model string                      model used for semantic matching
   -llm-timeout int                       time in seconds to wait for a single llm call (default 30)
@@ -219,7 +219,6 @@ OUTPUT:
   -jle, -jsonl-export string    file to export results in JSONL(ine) format
   -pe, -pdf-export string       file to export results in PDF format
   -rd, -redact string[]         redact given list of keys from query parameter, request header and body
-   -nrd, -no-redact              disable the built-in redaction of credential headers (Authorization, Cookie, Set-Cookie, ...) in output; keys given with -redact are still redacted

 CONFIGURATIONS:
   -config string                        path to the nuclei configuration file
@@ -148,7 +148,7 @@ TARGET:
   -iv, -ip-version string[]     IP version to scan of hostname (4,6) - (default 4)

 TARGET-FORMAT:
-   -im, -input-mode string        mode of input file (list, burp, har, jsonl, yaml, openapi, swagger, http) (default "list")
+   -im, -input-mode string        mode of input file (list, burp, jsonl, yaml, openapi, swagger, http) (default "list")
   -ro, -required-only            use only required fields in input format when generating requests
   -sfv, -skip-format-validation  skip format validation (like missing vars) when parsing input file
   -vtt, -vars-text-templating    enable text templating for vars in input file (only for yaml input mode)
@@ -175,7 +175,7 @@ TEMPLATES:
   -egm, -enable-global-matchers          enable loading global matchers templates
   -file                                  enable loading file templates
   -llm                                   enable llm matchers and extractors (semantic matching)
-   -llm-provider string                   llm provider for semantic matching (openai, ollama, llamacpp, vllm, lmstudio, groq, openrouter, together, orcarouter, jev) (default "openai")
+   -llm-provider string                   llm provider for semantic matching (openai, ollama, llamacpp, vllm, lmstudio, groq, openrouter, together, orcarouter) (default "openai")
   -llm-base-url string                   openai-compatible endpoint for semantic matching (overrides -llm-provider, e.g. a local model)
   -llm-model string                      model used for semantic matching
   -llm-timeout int                       time in seconds to wait for a single llm call (default 30)
@@ -219,7 +219,6 @@ OUTPUT:
   -jle, -jsonl-export string    file to export results in JSONL(ine) format
   -pe, -pdf-export string       file to export results in PDF format
   -rd, -redact string[]         redact given list of keys from query parameter, request header and body
-   -nrd, -no-redact              disable the built-in redaction of credential headers (Authorization, Cookie, Set-Cookie, ...) in output; keys given with -redact are still redacted

 CONFIGURATIONS:
   -config string                        path to the nuclei configuration file
@@ -165,7 +165,7 @@ TARGET:
   -mup, -max-urls-per-pattern int   scan at most this many urls sharing one structural shape, e.g. /user/1 and /user/2 (0 to scan all)

 TARGET-FORMAT:
-   -im, -input-mode string        mode of input file (list, burp, har, jsonl, yaml, openapi, swagger, http) (default "list")
+   -im, -input-mode string        mode of input file (list, burp, jsonl, yaml, openapi, swagger, http) (default "list")
   -ro, -required-only            use only required fields in input format when generating requests
   -sfv, -skip-format-validation  skip format validation (like missing vars) when parsing input file
   -vtt, -vars-text-templating    enable text templating for vars in input file (only for yaml input mode)
@@ -192,7 +192,7 @@ TEMPLATES:
   -egm, -enable-global-matchers          enable loading global matchers templates
   -file                                  enable loading file templates
   -llm                                   enable llm matchers and extractors (semantic matching)
-   -llm-provider string                   llm provider for semantic matching (openai, ollama, llamacpp, vllm, lmstudio, groq, openrouter, together, orcarouter, jev) (default "openai")
+   -llm-provider string                   llm provider for semantic matching (openai, ollama, llamacpp, vllm, lmstudio, groq, openrouter, together, orcarouter) (default "openai")
   -llm-base-url string                   openai-compatible endpoint for semantic matching (overrides -llm-provider, e.g. a local model)
   -llm-model string                      model used for semantic matching
   -llm-timeout int                       time in seconds to wait for a single llm call (default 30)
@@ -236,7 +236,6 @@ OUTPUT:
   -jle, -jsonl-export string    file to export results in JSONL(ine) format
   -pe, -pdf-export string       file to export results in PDF format
   -rd, -redact string[]         redact given list of keys from query parameter, request header and body
-   -nrd, -no-redact              disable the built-in redaction of credential headers (Authorization, Cookie, Set-Cookie, ...) in output; keys given with -redact are still redacted

 CONFIGURATIONS:
   -config string                        path to the nuclei configuration file
@@ -148,7 +148,7 @@ TARGET:
   -iv, -ip-version string[]     IP version to scan of hostname (4,6) - (default 4)

 TARGET-FORMAT:
-   -im, -input-mode string        mode of input file (list, burp, har, jsonl, yaml, openapi, swagger, http) (default "list")
+   -im, -input-mode string        mode of input file (list, burp, jsonl, yaml, openapi, swagger, http) (default "list")
   -ro, -required-only            use only required fields in input format when generating requests
   -sfv, -skip-format-validation  skip format validation (like missing vars) when parsing input file
   -vtt, -vars-text-templating    enable text templating for vars in input file (only for yaml input mode)
@@ -175,7 +175,7 @@ TEMPLATES:
   -egm, -enable-global-matchers          enable loading global matchers templates
   -file                                  enable loading file templates
   -llm                                   enable llm matchers and extractors (semantic matching)
-   -llm-provider string                   llm provider for semantic matching (openai, ollama, llamacpp, vllm, lmstudio, groq, openrouter, together, orcarouter, jev) (default "openai")
+   -llm-provider string                   llm provider for semantic matching (openai, ollama, llamacpp, vllm, lmstudio, groq, openrouter, together, orcarouter) (default "openai")
   -llm-base-url string                   openai-compatible endpoint for semantic matching (overrides -llm-provider, e.g. a local model)
   -llm-model string                      model used for semantic matching
   -llm-timeout int                       time in seconds to wait for a single llm call (default 30)
@@ -219,7 +219,6 @@ OUTPUT:
   -jle, -jsonl-export string    file to export results in JSONL(ine) format
   -pe, -pdf-export string       file to export results in PDF format
   -rd, -redact string[]         redact given list of keys from query parameter, request header and body
-   -nrd, -no-redact              disable the built-in redaction of credential headers (Authorization, Cookie, Set-Cookie, ...) in output; keys given with -redact are still redacted

 CONFIGURATIONS:
   -config string                        path to the nuclei configuration file
@@ -148,7 +148,7 @@ TARGET:
   -iv, -ip-version string[]     IP version to scan of hostname (4,6) - (default 4)

 TARGET-FORMAT:
-   -im, -input-mode string        mode of input file (list, burp, har, jsonl, yaml, openapi, swagger, http) (default "list")
+   -im, -input-mode string        mode of input file (list, burp, jsonl, yaml, openapi, swagger, http) (default "list")
   -ro, -required-only            use only required fields in input format when generating requests
   -sfv, -skip-format-validation  skip format validation (like missing vars) when parsing input file
   -vtt, -vars-text-templating    enable text templating for vars in input file (only for yaml input mode)
@@ -175,7 +175,7 @@ TEMPLATES:
   -egm, -enable-global-matchers          enable loading global matchers templates
   -file                                  enable loading file templates
   -llm                                   enable llm matchers and extractors (semantic matching)
-   -llm-provider string                   llm provider for semantic matching (openai, ollama, llamacpp, vllm, lmstudio, groq, openrouter, together, orcarouter, jev) (default "openai")
+   -llm-provider string                   llm provider for semantic matching (openai, ollama, llamacpp, vllm, lmstudio, groq, openrouter, together, orcarouter) (default "openai")
   -llm-base-url string                   openai-compatible endpoint for semantic matching (overrides -llm-provider, e.g. a local model)
   -llm-model string                      model used for semantic matching
   -llm-timeout int                       time in seconds to wait for a single llm call (default 30)
@@ -219,7 +219,6 @@ OUTPUT:
   -jle, -jsonl-export string    file to export results in JSONL(ine) format
   -pe, -pdf-export string       file to export results in PDF format
   -rd, -redact string[]         redact given list of keys from query parameter, request header and body
-   -nrd, -no-redact              disable the built-in redaction of credential headers (Authorization, Cookie, Set-Cookie, ...) in output; keys given with -redact are still redacted

 CONFIGURATIONS:
   -config string                        path to the nuclei configuration file
@@ -148,7 +148,7 @@ TARGET:
   -iv, -ip-version string[]     IP version to scan of hostname (4,6) - (default 4)

 TARGET-FORMAT:
-   -im, -input-mode string        mode of input file (list, burp, har, jsonl, yaml, openapi, swagger, http) (default "list")
+   -im, -input-mode string        mode of input file (list, burp, jsonl, yaml, openapi, swagger, http) (default "list")
   -ro, -required-only            use only required fields in input format when generating requests
   -sfv, -skip-format-validation  skip format validation (like missing vars) when parsing input file
   -vtt, -vars-text-templating    enable text templating for vars in input file (only for yaml input mode)
@@ -175,7 +175,7 @@ TEMPLATES:
   -egm, -enable-global-matchers          enable loading global matchers templates
   -file                                  enable loading file templates
   -llm                                   enable llm matchers and extractors (semantic matching)
-   -llm-provider string                   llm provider for semantic matching (openai, ollama, llamacpp, vllm, lmstudio, groq, openrouter, together, orcarouter, jev) (default "openai")
+   -llm-provider string                   llm provider for semantic matching (openai, ollama, llamacpp, vllm, lmstudio, groq, openrouter, together, orcarouter) (default "openai")
   -llm-base-url string                   openai-compatible endpoint for semantic matching (overrides -llm-provider, e.g. a local model)
   -llm-model string                      model used for semantic matching
   -llm-timeout int                       time in seconds to wait for a single llm call (default 30)
@@ -219,7 +219,6 @@ OUTPUT:
   -jle, -jsonl-export string    file to export results in JSONL(ine) format
   -pe, -pdf-export string       file to export results in PDF format
   -rd, -redact string[]         redact given list of keys from query parameter, request header and body
-   -nrd, -no-redact              disable the built-in redaction of credential headers (Authorization, Cookie, Set-Cookie, ...) in output; keys given with -redact are still redacted

 CONFIGURATIONS:
   -config string                        path to the nuclei configuration file
@@ -148,7 +148,7 @@ TARGET:
   -iv, -ip-version string[]     IP version to scan of hostname (4,6) - (default 4)

 TARGET-FORMAT:
-   -im, -input-mode string        mode of input file (list, burp, har, jsonl, yaml, openapi, swagger, http) (default "list")
+   -im, -input-mode string        mode of input file (list, burp, jsonl, yaml, openapi, swagger, http) (default "list")
   -ro, -required-only            use only required fields in input format when generating requests
   -sfv, -skip-format-validation  skip format validation (like missing vars) when parsing input file
   -vtt, -vars-text-templating    enable text templating for vars in input file (only for yaml input mode)
@@ -175,7 +175,7 @@ TEMPLATES:
   -egm, -enable-global-matchers          enable loading global matchers templates
   -file                                  enable loading file templates
   -llm                                   enable llm matchers and extractors (semantic matching)
-   -llm-provider string                   llm provider for semantic matching (openai, ollama, llamacpp, vllm, lmstudio, groq, openrouter, together, orcarouter, jev) (default "openai")
+   -llm-provider string                   llm provider for semantic matching (openai, ollama, llamacpp, vllm, lmstudio, groq, openrouter, together, orcarouter) (default "openai")
   -llm-base-url string                   openai-compatible endpoint for semantic matching (overrides -llm-provider, e.g. a local model)
   -llm-model string                      model used for semantic matching
   -llm-timeout int                       time in seconds to wait for a single llm call (default 30)
@@ -219,7 +219,6 @@ OUTPUT:
   -jle, -jsonl-export string    file to export results in JSONL(ine) format
   -pe, -pdf-export string       file to export results in PDF format
   -rd, -redact string[]         redact given list of keys from query parameter, request header and body
-   -nrd, -no-redact              disable the built-in redaction of credential headers (Authorization, Cookie, Set-Cookie, ...) in output; keys given with -redact are still redacted

 CONFIGURATIONS:
   -config string                        path to the nuclei configuration file
@@ -148,7 +148,7 @@ TARGET:
   -iv, -ip-version string[]     IP version to scan of hostname (4,6) - (default 4)

 TARGET-FORMAT:
-   -im, -input-mode string        mode of input file (list, burp, har, jsonl, yaml, openapi, swagger, http) (default "list")
+   -im, -input-mode string        mode of input file (list, burp, jsonl, yaml, openapi, swagger, http) (default "list")
   -ro, -required-only            use only required fields in input format when generating requests
   -sfv, -skip-format-validation  skip format validation (like missing vars) when parsing input file
   -vtt, -vars-text-templating    enable text templating for vars in input file (only for yaml input mode)
@@ -175,7 +175,7 @@ TEMPLATES:
   -egm, -enable-global-matchers          enable loading global matchers templates
   -file                                  enable loading file templates
   -llm                                   enable llm matchers and extractors (semantic matching)
-   -llm-provider string                   llm provider for semantic matching (openai, ollama, llamacpp, vllm, lmstudio, groq, openrouter, together, orcarouter, jev) (default "openai")
+   -llm-provider string                   llm provider for semantic matching (openai, ollama, llamacpp, vllm, lmstudio, groq, openrouter, together, orcarouter) (default "openai")
   -llm-base-url string                   openai-compatible endpoint for semantic matching (overrides -llm-provider, e.g. a local model)
   -llm-model string                      model used for semantic matching
   -llm-timeout int                       time in seconds to wait for a single llm call (default 30)
@@ -219,7 +219,6 @@ OUTPUT:
   -jle, -jsonl-export string    file to export results in JSONL(ine) format
   -pe, -pdf-export string       file to export results in PDF format
   -rd, -redact string[]         redact given list of keys from query parameter, request header and body
-   -nrd, -no-redact              disable the built-in redaction of credential headers (Authorization, Cookie, Set-Cookie, ...) in output; keys given with -redact are still redacted

 CONFIGURATIONS:
   -config string                        path to the nuclei configuration file
@@ -1,120 +1,255 @@
-<!-- Generated by securitycontext.dev. Source HEAD: df57ae6d2955864fd92a1bd2565fe9e4e9a7592b. -->
+<!-- Generated by securitycontext.dev. Source HEAD: 3e1e0e81f091c7817bbf7af64bb8eec6e8c2bac1. -->
 # Security Context: projectdiscovery/nuclei @ dev

 > Reference context for editing projectdiscovery/nuclei. Before changing any component below, **preserve the listed guards and do not reintroduce these fixed issues**. Each fingerprint is a regression check, and each shared attack surface is a guard that must keep holding on every path.

-_Analyzed [df57ae6d29][c-df57ae6d29] on `dev` · 5174 commits, 548 security-relevant examined · generated 2026-11-02_
+_Generated 2026-09-01 16:22 UTC by secc_
+
+_Analyzed commit: 3e1e0e81f091c7817bbf7af64bb8eec6e8c2bac1_
+
+**Remediation coverage: 56.7%**
+_17 of 30 historical fixes have no remaining unguarded variant; 368 open remediation leads to verify. Measures fix consistency, not a vulnerability verdict._
+
+- Commits analyzed: **4814**
+- Commits flagged for review: **235**
+- Confirmed historical security fixes: **32**
+- Known published CVEs: **0**
+
+## Summary
+
+Nuclei's historical security posture is dominated by sandbox escapes and code execution via unsigned or unverified templates, with recurring SSRF, path traversal, and auth bypass issues across JS libraries, loaders, and workflow paths. The most critical theme is inconsistent enforcement of signature verification and local-file-access (-lfa) guards across direct, workflow, DAST, and JS-sandbox entry points, enabling variant attacks. A second theme is network policy (host allowlist) gaps in LDAP dialing and proxy handling. The security context also includes dependency upgrades (Alpine, go-git) and output file permission hardening, but the highest-value focus is on template trust boundaries and sandbox enforcement parity.

 ## Recurring Security Patterns

-**7.1% of classified fixes repeat a previously fixed pattern** (1 recurring, 13 first-seen). A recurring pattern means this repository fixed a similar issue before — not that the code is currently vulnerable.
+**15.6% of classified fixes repeat a previously fixed pattern** (5 recurring, 27 first-seen). A recurring pattern means this repository fixed a similar issue before — not that the code is currently vulnerable.
+
+- **Code Execution:** [1c440e755a](https://github.com/projectdiscovery/nuclei/commit/1c440e755a97471c56fb0276ee8a8c4132974645) → [9de96e4dda](https://github.com/projectdiscovery/nuclei/commit/9de96e4dda5a03da963b9ae6582f03ea55791a76) — matched on `class:code execution`, `component:pkg/catalog/loader/loader.go`
+- **Code Execution via Unsigned Template:** [fa56800fcc](https://github.com/projectdiscovery/nuclei/commit/fa56800fcca3c8c8fe8e8dec28584210ca1527de) → [fac0b7196d](https://github.com/projectdiscovery/nuclei/commit/fac0b7196d2fbca56c8af8ff8e1899c111041a37) — matched on `class:code execution via unsigned template`, `CWE-347`, `sink:loadtemplates`
+- **SSRF:** [a167e6c57b](https://github.com/projectdiscovery/nuclei/commit/a167e6c57b80f5dc7be231231b62d7c594ee2770) → [9def9af7e3](https://github.com/projectdiscovery/nuclei/commit/9def9af7e3f7ebcf5cd561c37b623b9999ee7572) — matched on `class:ssrf`, `CWE-918`, `component:pkg/js/libs/ldap/ldap.go`
+- **Dependency Vulnerability:** [d93b4a01df](https://github.com/projectdiscovery/nuclei/commit/d93b4a01df9c218a36dd2fccfb1c2c1f96b181fe) → [fcd5c6b111](https://github.com/projectdiscovery/nuclei/commit/fcd5c6b111ddcb746525f88b7d0bf4b4abbc2529) — matched on `class:dependency vulnerability`, `CWE-1104`, `component:dockerfile`
+- **Sandbox Escape:** [96049a32fa](https://github.com/projectdiscovery/nuclei/commit/96049a32fa70aef0483d4180d386a57b3c2d973a) → [cf2a98b03d](https://github.com/projectdiscovery/nuclei/commit/cf2a98b03d76327c20fb0183b7f1c849eb692c91) — matched on `class:sandbox escape`, `CWE-284`, `component:v2/internal/runner/processor.go`, `sink:stdlib allmodulenames`, `sink:stdlib getmodulemap`

 ## Top Risks

-Components with the strongest concentration of past fixes for one class.
+### 1. Sandbox Escape: `pkg/js/compiler/pool.go, v2/pkg/protocols/javascript/js.go, v2/pkg/protocols/headless/engine/engine.go, v2/internal/runner/processor.go` (high)

-| # | Class | Component | Severity | Fixes | Evidence |
-|---|---|---|---|---|---|
-| 1 | SSRF | `pkg/protocols/common/protocolstate/headless.go` | high | 2 | [d43c1f547f][c-d43c1f547f], [d9dabbb4a1][c-d9dabbb4a1] |
-| 2 | Arbitrary File Access | `v2/pkg/protocols/common/generators/load.go` | high | 0 (1 component gone, not counted) | [e5154d362a][c-e5154d362a] |
-| 3 | Arbitrary File Access | `pkg/js/libs/mysql/mysql.go` | high | 1 | [634cecbb28][c-634cecbb28] |
-| 4 | Code Execution | `pkg/fuzz/execute.go` | high | 1 | [ccbfb12bd0][c-ccbfb12bd0] |
-| 5 | Code Execution | `pkg/protocols/common/expressions/expressions.go` | high | 1 | [d221732016][c-d221732016] |
-| 6 | Information Disclosure | `internal/httpapi/apiendpoint.go` | high | 1 | [a20aa26024][c-a20aa26024] |
+Multiple sandbox escapes across JS require(), eval/ReadFile, headless browser flags, and tengo imports, indicating weak default sandbox boundaries that require consistent -lfa and safe-module enforcement.

-## Fixed-Issue Fingerprints
+Evidence: 6f2ade6a9b427c284c15a43445f9c7f055e60e5d, c35162c8ef061a96dd74b54c8f022c1a41cf5833, df55f7a2eb591a7949b5c66a9c54db54aa28f450, cf2a98b03d76327c20fb0183b7f1c849eb692c91, 96049a32fa70aef0483d4180d386a57b3c2d973a

-Real security fixes mined from git history; use them as regression checks. `verified` fixes are linked to a published advisory, `inferred` fixes were confirmed from the diff evidence alone. Each is identified by its short commit SHA, which the variant-leads report uses to reference it back to this history.
+### 2. Code Execution via Unsigned Template: `pkg/catalog/loader/loader.go, pkg/templates/workflows.go, pkg/templates/templates.go` (critical)

-**By component** (directories with the most fixes):
+Unsigned templates can execute code through direct loading, workflows, and DAST branches; signature verification was bypassed via cache poisoning and missing guards on specific paths.

- `pkg/protocols/common/protocolstate` — 2 fixes: SSRF (2)
+Evidence: 9de96e4dda5a03da963b9ae6582f03ea55791a76, 1c440e755a97471c56fb0276ee8a8c4132974645, fac0b7196d2fbca56c8af8ff8e1899c111041a37, e86f38299765b82ad724fdb701557e0eaff3884d, fa56800fcca3c8c8fe8e8dec28584210ca1527de

- [1c0f77d28e][c-1c0f77d28e] **fix(js/net): enforce network policy on proxied target in JS net dial** — SSRF, high [CWE-918] · inferred · 2026-10-18
-  `pkg/js/libs/net/net.go` · sink `dialHTTPProxy` · fix: input validation
- [d43c1f547f][c-d43c1f547f] **fix(headless): canonicalize IPv4-mapped IPv6 literals and re-validate dial targets** — SSRF, high [CWE-918] · inferred · 2026-10-13
-  `pkg/protocols/common/protocolstate/headless.go` · sink `net.DialTimeout` · fix: canonicalization before validation
- [d9dabbb4a1][c-d9dabbb4a1] **fix(headless): enforce network policy on ws and wss schemes (#7867)** — SSRF, high [CWE-918] · inferred · 2026-10-12
-  `pkg/protocols/common/protocolstate/headless.go` · sink `isValidHost` · fix: canonicalization before validation
- [a20aa26024][c-a20aa26024] **Fix pprof/auth exposure on http-api-endpoint and harden file permissions** — Information Disclosure, high [CWE-200] · inferred · 2026-08-03
-  `internal/httpapi/apiendpoint.go` · sink `http.ListenAndServe` · fix: authentication verification
- [fac0b7196d][c-fac0b7196d] **feat(templates): require signatures for javascript templates (#7514)** — Signature Verification Bypass, high [CWE-347] · verified (CVE-2026-76819, GHSA-vxg7-f2jj-jmqm) · 2026-07-03
-  `pkg/catalog/loader/loader.go` · sink `t.HasJavascriptRequest` · fix: cryptographic verification
- [ccbfb12bd0][c-ccbfb12bd0] **refactor(protocols): template rendering boundary (#7499)** — Code Execution, high [CWE-94] · verified (CVE-2026-76805, GHSA-jpvm-9frm-hjcq) · 2026-06-30
-  `pkg/fuzz/execute.go` · sink `expressions.Evaluate` · fix: sandbox isolation
- [3a8b65cb45][c-3a8b65cb45] **fix(js): reject unsandboxed ccache writes in krbforge (#7482)** — Sandbox Escape, high [CWE-693] · inferred · 2026-06-24
-  `pkg/js/libs/krbforge/krbforge.go` · sink `OutputFile` · fix: sandbox isolation
- [68daef44a7][c-68daef44a7] **fix(js): escape dbname in lib/pq URL (#7479)** — SQL Injection, high [CWE-89] · inferred · 2026-06-23
-  `pkg/js/libs/postgres/postgres.go` · sink `fmt.Sprintf` (library call — the operation around it is the sink) · fix: context-aware output escaping
- [634cecbb28][c-634cecbb28] **gate mysql allowAllFiles behind -lfa** — Arbitrary File Access, high [CWE-22] · verified (CVE-2026-76803, GHSA-xhmx-w2j4-rw3q) · 2026-06-19
-  `pkg/js/libs/mysql/mysql.go` · sink `sql.Open` · fix: sandbox isolation
- [20cbf0bd73][c-20cbf0bd73] **refactor: use path-aware filesystem containment checks (#7420)** — Path Traversal, high [CWE-22] · inferred · 2026-06-04
-  `pkg/installer/template.go` · sink `filepath.Join` · fix: canonicalization before validation
- [6f2ade6a9b][c-6f2ade6a9b] **fix(js): respect \`allow-local-file-access\` in \`require\` (#7332)** — Sandbox Escape, high [CWE-693] · inferred · 2026-04-10
-  `pkg/js/compiler/pool.go` · sink `require.DefaultSourceLoader` · fix: sandbox isolation
- [d221732016][c-d221732016] **fix(expressions): only eval template-authored expressions (#7221)** — Code Execution, high [CWE-94] · verified (CVE-2026-76805, GHSA-jpvm-9frm-hjcq) · 2026-03-16
-  `pkg/protocols/common/expressions/expressions.go` · sink `FindExpressions` · fix: allowlist enforcement
- [0da993afe6][c-0da993afe6] **Merge commit from fork** — Signature Verification Bypass, medium [CWE-347] · verified (CVE-2024-43405, GHSA-7h5p-mmpp-hgmm) · 2024-08-19
-  `pkg/templates/signer/tmpl_signer.go` · sink `os.ReadFile` · fix: cryptographic verification
- [e5154d362a][c-e5154d362a] **fixing payload load (#3927)** — Arbitrary File Access, high [CWE-22] · verified (CVE-2023-37896, GHSA-2xx4-jj5v-6mff) · 2023-07-14
-  `v2/pkg/protocols/common/generators/load.go` · sink `loadPayloads` · fix: sandbox isolation
+### 3. Auth Bypass: `pkg/templates/compile.go, pkg/templates/signer/tmpl_signer.go, pkg/catalog/loader/loader.go, pkg/protocols/http/request.go` (high)
+
+Signature verification can be bypassed via cached metadata, improper signature extraction, or missing checks on specific load paths, and cookie jar bypass via disabled cookie handling.
+
+Evidence: 4534e9cb3034ebe5cc7b0cecabe399b6fb9ce0e4, 0da993afe6d41b4b1b814e8fad23a2acba13c60a, 9bd4db3f74aedd067af568df4f9198a8a090f68b, a976ca8d3f6a18c9ca746c8ce73f28fdcd518642
+
+### 4. SSRF: `pkg/js/libs/ldap/ldap.go, v2/internal/runner/proxy.go` (high)
+
+SSRF via LDAP dialing to internal hosts and via proxy configuration; host allowlist checks were missing or applied to the wrong target (domain vs controller).
+
+Evidence: 9def9af7e3f7ebcf5cd561c37b623b9999ee7572, a167e6c57b80f5dc7be231231b62d7c594ee2770, 0e46d3e0410f89e4af41099f5cd38fa7f54ae54f
+
+### 5. Path Traversal: `pkg/catalog/config/nucleiconfig.go, v2/internal/runner/update.go, v2/pkg/protocols/common/protocolstate/headless.go` (high)
+
+Path traversal via lexical prefix checks, zip-slip in template extraction, and file:// scheme in headless mode; canonicalization and containment checks are required.
+
+Evidence: 20cbf0bd73893c1270582c9778b6b26a5cb11206, f9c214a66f37a00fc29fe64232b690e6285ec59c, d3928e080d819f25306bfbaecc399f03516db5aa
+
+### 6. Code Execution: `pkg/catalog/loader/loader.go, pkg/templates/workflows.go` (high)
+
+Code execution via cache poisoning and unverified code templates in workflows; requires -code flag and verified templates.
+
+Evidence: 9de96e4dda5a03da963b9ae6582f03ea55791a76, e86f38299765b82ad724fdb701557e0eaff3884d
+
+## Shared Attack Surfaces
+
+Capabilities guarded by more than one past fix on different code paths. A guard enforced on one entry point is often missing on a sibling; verify each alternate path before assuming it's covered.
+
+### 1. Template signature verification and unsigned-template opt-in enforcement across all load paths
+
+- Guard that should hold everywhere: signature verification (template.Verified, Verify), DisableUnsignedTemplates flag, -code flag for code templates, cache invalidation on verification status/fingerprint/digest
+- Entry points: `pkg/catalog/loader/loader.go (LoadTemplatesWithTags, DAST branch)`, `pkg/templates/workflows.go (loadTemplates, workflowExecutor)`, `pkg/templates/templates.go (loadTemplates)`, `pkg/templates/compile.go (template.Verified)`, `pkg/templates/signer/tmpl_signer.go (Verify)`
+- Check: Inspect the DAST and workflow sub-loaders: they must enforce the same DisableUnsignedTemplates and -code checks as the direct loader, and must not rely on cached verification results without re-checking signatures.
+- Evidence: 9de96e4dda5a03da963b9ae6582f03ea55791a76, 1c440e755a97471c56fb0276ee8a8c4132974645, fac0b7196d2fbca56c8af8ff8e1899c111041a37, e86f38299765b82ad724fdb701557e0eaff3884d, fa56800fcca3c8c8fe8e8dec28584210ca1527de, 4534e9cb3034ebe5cc7b0cecabe399b6fb9ce0e4, 0da993afe6d41b4b1b814e8fad23a2acba13c60a, 9bd4db3f74aedd067af568df4f9198a8a090f68b
+
+### 2. Local file access (read/write) outside the sandbox, gated by -lfa flag
+
+- Guard that should hold everywhere: -lfa flag enforcement, path canonicalization and containment (sandbox directory), file:// scheme blocking, allowAllFiles stripping, require() registry rebuild
+- Entry points: `pkg/js/libs/krbforge/krbforge.go (CreateTicket)`, `pkg/js/libs/mysql/mysql_private.go (sql.Open)`, `pkg/js/compiler/pool.go (require)`, `v2/pkg/protocols/javascript/js.go (ReadFile, eval)`, `v2/pkg/protocols/common/protocolstate/headless.go (file:)`, `v2/pkg/protocols/common/generators/load.go (loadPayloadsFromFile)`
+- Check: Verify that every JS library and protocol helper (krbforge, mysql, require, headless file://, payload loaders) enforces the -lfa flag and path containment; a sibling path that skips the -lfa check is a sandbox escape.
+- Evidence: 3a8b65cb45f121fcdf418f60e5177ed9f250c122, 9611926a9a1ca99e8ed554d1b26fbeff60e06368, 6f2ade6a9b427c284c15a43445f9c7f055e60e5d, c35162c8ef061a96dd74b54c8f022c1a41cf5833, d3928e080d819f25306bfbaecc399f03516db5aa, e7fb40a41308f6c41267e858d1781eb67f7e0572
+
+### 3. Network policy (host allowlist) enforcement before outbound connections
+
+- Guard that should hold everywhere: IsHostAllowed check on the actual target host (controller, not domain), proxy validation and connectivity check, ProxyInternal gate for HTTP_PROXY env
+- Entry points: `pkg/js/libs/ldap/ldap.go (Dial, newLdapSession)`, `v2/internal/runner/proxy.go (loadProxyServers, os.Setenv HTTP_PROXY)`
+- Check: Inspect other dialing paths (e.g., HTTP, headless) to ensure they apply the same host allowlist check on the resolved IP/host, not just a user-supplied domain, and that proxy settings cannot redirect traffic to internal hosts.
+- Evidence: 9def9af7e3f7ebcf5cd561c37b623b9999ee7572, a167e6c57b80f5dc7be231231b62d7c594ee2770, 0e46d3e0410f89e4af41099f5cd38fa7f54ae54f, 3f5c055aca1499642caf4f40e8cf55ad32bd4da9
+
+### 4. Path traversal in file extraction and template path trust boundaries
+
+- Guard that should hold everywhere: canonical path containment check (filepath.Rel, prefix), zip-slip validation against template directory, sandbox path prefix validation
+- Entry points: `pkg/catalog/config/nucleiconfig.go (IsCustomTemplate)`, `v2/internal/runner/update.go (os.OpenFile)`, `v2/pkg/protocols/common/generators/load.go (loadPayloadsFromFile)`
+- Check: Audit all file-write and file-read paths that accept template-controlled paths (e.g., template extraction, payload loading) to ensure they use canonical containment, not lexical prefix checks, and apply the same sandbox directory restriction.
+- Evidence: 20cbf0bd73893c1270582c9778b6b26a5cb11206, f9c214a66f37a00fc29fe64232b690e6285ec59c, e7fb40a41308f6c41267e858d1781eb67f7e0572

 ## Historical Vulnerability Classes

-| Class | Fixes | Verified | Most recent fix |
-|---|---|---|---|
-| SSRF | 3 | 0 | [2026-10-18][c-1c0f77d28e] 1c0f77d28e |
-| Arbitrary File Access | 1 (1 component gone, not counted) | 2 | [2026-06-19][c-634cecbb28] 634cecbb28 |
-| Code Execution | 2 | 2 | [2026-06-30][c-ccbfb12bd0] ccbfb12bd0 |
-| Sandbox Escape | 2 | 0 | [2026-06-24][c-3a8b65cb45] 3a8b65cb45 |
-| Signature Verification Bypass | 2 | 2 | [2026-07-03][c-fac0b7196d] fac0b7196d |
-| Information Disclosure | 1 | 0 | [2026-08-03][c-a20aa26024] a20aa26024 |
-| Path Traversal | 1 | 0 | [2026-06-04][c-20cbf0bd73] 20cbf0bd73 |
-| SQL Injection | 1 | 0 | [2026-06-23][c-68daef44a7] 68daef44a7 |
+| Class | Count |
+|---|---|
+| Sandbox Escape | 7 |
+| Auth Bypass | 4 |
+| Code Execution | 3 |
+| Dependency Vulnerability | 3 |
+| Path Traversal | 3 |
+| SSRF | 3 |
+| Code Execution via Unsigned Template | 2 |
+| Arbitrary File Read | 1 |
+| Cryptographic Weakness | 1 |
+| Deserialization of Untrusted Data | 1 |
+| Information Disclosure | 1 |
+| Insecure File Permissions | 1 |
+| Race Condition | 1 |
+| Security Misconfiguration | 1 |

-## Known Advisories
+## Fixed-Issue Fingerprints

-### Linked to a fix commit in this history (5)
+These are real security fixes mined from git history. Use them as regression checks.

- **CVE-2026-76805** / GHSA-jpvm-9frm-hjcq (medium 5.3) CWE-200 — fixed in [ccbfb12bd0][c-ccbfb12bd0], [d221732016][c-d221732016]
-  - Environment Variable Disclosure via Response-Derived Data in DAST/Fuzz Mode. A vulnerability in Nuclei's DAST/fuzz expression evaluation path allows a malicious target server to trigger disclosure of ...
- **CVE-2026-76803** / GHSA-xhmx-w2j4-rw3q (medium 5.3) CWE-284 — fixed in [634cecbb28][c-634cecbb28]
-  - Local File Read via MySQL Client Sandbox Bypass. A vulnerability in Nuclei's JavaScript MySQL client library allows arbitrary local file reads that bypass the `-allow-local-file-access` (`-lfa`) sandb...
- **CVE-2026-76819** / GHSA-vxg7-f2jj-jmqm (high 8.6) CWE-94,CWE-787 — fixed in [fac0b7196d][c-fac0b7196d]
-  - Arbitrary Code Execution via Goja JavaScript Engine Vulnerability. A vulnerability in the Goja JavaScript engine used by Nuclei's `javascript:` protocol allows arbitrary native code execution on the s...
- **CVE-2024-43405** / GHSA-7h5p-mmpp-hgmm (high 7.4) CWE-78 — fixed in [0da993afe6][c-0da993afe6]
-  - Nuclei Template Signature Verification Bypass. ## Summary A vulnerability has been identified in Nuclei's template signature verification system that could allow an attacker to bypass the signature ch...
- **CVE-2023-37896** / GHSA-2xx4-jj5v-6mff (medium 5.9) CWE-22 — fixed in [e5154d362a][c-e5154d362a]
-  - Nuclei < 2.9.9 - Sandbox restriction bypass. ## Overview Affected: < 2.9.9 (patched 2.9.9).
-
-### Without a linked fix commit (6)
-
-Published elsewhere, fixed before the history window, or not yet linked; full descriptions are in the JSON context.
-
-| Advisory | Severity | Published | CWE | Summary |
-|---|---|---|---|---|
-| CVE-2026-76804 / GHSA-qgw5-7j4f-fg97 | medium 5.5 | 2026-07-16 | CWE-284 | Local File Read via Workflow File-Protocol Gate Bypass. A vulnerability in Nuclei's workfl... |
-| CVE-2026-76802 / GHSA-jpf4-98qj-qr67 | medium 4.7 | 2026-07-16 | CWE-78 | Arbitrary Command Execution via DAST Code Signature Bypass. A vulnerability in Nuclei's DA... |
-| CVE-2026-41645 / GHSA-jm34-66cf-qpvr | medium 5.3 | 2026-04-18 | CWE-94 | Environment variable disclosure via Response-Derived DSL Expressions. A vulnerability in N... |
-| CVE-2026-41646 / GHSA-29rg-wmcw-hpf4 | medium 5.5 | 2026-04-18 | CWE-284 | Local File Read via require() Module Loader Bypass. A vulnerability in Nuclei's JavaScript... |
-| CVE-2024-40641 / GHSA-c3q9-c27p-cw9h | high 7.4 | 2024-07-17 | CWE-78 | Unsigned code template execution through workflows in projectdiscovery/nuclei. ### Summary... |
-| CVE-2024-27920 / GHSA-w5wx-6g2r-r78q | high 7.4 | 2024-03-15 | CWE-78 | Unsigned code template execution through workflows in projectdiscovery/nuclei. ### Overvie... |
-
-[c-df57ae6d29]: https://github.com/projectdiscovery/nuclei/commit/df57ae6d2955864fd92a1bd2565fe9e4e9a7592b
-[c-d43c1f547f]: https://github.com/projectdiscovery/nuclei/commit/d43c1f547f98ac56654f4335ad20af0cca4c229c
-[c-d9dabbb4a1]: https://github.com/projectdiscovery/nuclei/commit/d9dabbb4a19e897a6bc12334a030a43035b27b73
-[c-e5154d362a]: https://github.com/projectdiscovery/nuclei/commit/e5154d362af900e83b30fb79028bfab1a7f0c648
-[c-634cecbb28]: https://github.com/projectdiscovery/nuclei/commit/634cecbb289db494247c04a9c4ec6a113aef3cc0
-[c-ccbfb12bd0]: https://github.com/projectdiscovery/nuclei/commit/ccbfb12bd01447ba25f6e755dfb2bee677736da6
-[c-d221732016]: https://github.com/projectdiscovery/nuclei/commit/d2217320162d5782ca7cb95bef9dda17063818f3
-[c-a20aa26024]: https://github.com/projectdiscovery/nuclei/commit/a20aa260245e5db889c5a421d4a65aeb2a64bf46
-[c-1c0f77d28e]: https://github.com/projectdiscovery/nuclei/commit/1c0f77d28ed639a34c2036fa23c7503ffac0bf27
-[c-fac0b7196d]: https://github.com/projectdiscovery/nuclei/commit/fac0b7196d2fbca56c8af8ff8e1899c111041a37
-[c-3a8b65cb45]: https://github.com/projectdiscovery/nuclei/commit/3a8b65cb45f121fcdf418f60e5177ed9f250c122
-[c-68daef44a7]: https://github.com/projectdiscovery/nuclei/commit/68daef44a7eafd41c39690924620e418762909ef
-[c-20cbf0bd73]: https://github.com/projectdiscovery/nuclei/commit/20cbf0bd73893c1270582c9778b6b26a5cb11206
-[c-6f2ade6a9b]: https://github.com/projectdiscovery/nuclei/commit/6f2ade6a9b427c284c15a43445f9c7f055e60e5d
-[c-0da993afe6]: https://github.com/projectdiscovery/nuclei/commit/0da993afe6d41b4b1b814e8fad23a2acba13c60a
+- **Auth Bypass** (high) [CWE-287]: Honors disable-cookie by preventing the shared cookie jar from being applied when cookie handling is disabled, closing a path where cookies could be reused across requests.
+  - sink: `SetCookieJar(input.CookieJar)`
+  - fix: Adds !request.DisableCookie check before applying shared cookie jar
+  - commit: https://github.com/projectdiscovery/nuclei/commit/a976ca8d3f6a18c9ca746c8ce73f28fdcd518642 (2026-08-25)
+- **Code Execution** (high) [CWE-347]: This commit fixes a cache poisoning vulnerability where unsigned templates could bypass signature verification and execute malicious code during compilation or request execution.
+  - sink: `template compilation and execution of JavaScript`
+  - fix: cache invalidation based on verification status, verifier fingerprint, and content digest
+  - commit: https://github.com/projectdiscovery/nuclei/commit/9de96e4dda5a03da963b9ae6582f03ea55791a76 (2026-08-04)
+- **Code Execution via Unsigned Template** (high) [CWE-347]: Enforces signature verification on JavaScript templates, preventing execution of unsigned templates that could lead to arbitrary code execution.
+  - sink: `loading unsigned javascript templates into execution paths`
+  - fix: Require signature verification for javascript templates in direct loading and workflows when signing is enforced
+  - commit: https://github.com/projectdiscovery/nuclei/commit/fac0b7196d2fbca56c8af8ff8e1899c111041a37 (2026-07-03)
+- **Sandbox Escape** (high) [CWE-22]: Enforces nuclei's local file access policy on krbforge output paths, preventing arbitrary file writes outside the sandbox.
+  - sink: `gpkrb.CreateTicket(cfg) with cfg.OutputFile`
+  - fix: Path normalization into sandbox and denial of outside paths unless -lfa
+  - commit: https://github.com/projectdiscovery/nuclei/commit/3a8b65cb45f121fcdf418f60e5177ed9f250c122 (2026-06-24)
+- **SSRF** (high) [CWE-918]: Adds network policy host allowlist checks before LDAP dialing, preventing SSRF to restricted internal hosts.
+  - sink: `dialers.Fastdialer.Dial`
+  - fix: host allowlist check via IsHostAllowed before dialing
+  - commit: https://github.com/projectdiscovery/nuclei/commit/9def9af7e3f7ebcf5cd561c37b623b9999ee7572 (2026-06-24)
+- **Arbitrary File Read** (high) [CWE-22]: Gates MySQL's allowAllFiles option behind the -lfa flag, preventing arbitrary local file reads via LOAD DATA LOCAL INFILE.
+  - sink: `sql.Open("mysql", dsn) with AllowAllFiles=true`
+  - fix: DSN sandbox that strips allowAllFiles unless -lfa is set
+  - commit: https://github.com/projectdiscovery/nuclei/commit/9611926a9a1ca99e8ed554d1b26fbeff60e06368 (2026-06-19)
+- **Code Execution** (critical) [CWE-94]: Moves the unsigned code-template guard ahead of the DAST branch, preventing unsigned code templates from being loaded and executed under DAST, which previously bypassed the signature check.
+  - sink: `Template loading and execution`
+  - fix: Hoisting unsigned code-template guard before DAST branch to ensure it applies on all load paths
+  - commit: https://github.com/projectdiscovery/nuclei/commit/1c440e755a97471c56fb0276ee8a8c4132974645 (2026-06-19)
+- **Path Traversal** (high) [CWE-22]: This commit replaces lexical prefix checks with canonical path containment checks across multiple filesystem trust boundaries, preventing path traversal where sibling paths were incorrectly treated as trusted.
+  - sink: `IsCustomTemplate`
+  - fix: path canonicalization and containment check
+  - commit: https://github.com/projectdiscovery/nuclei/commit/20cbf0bd73893c1270582c9778b6b26a5cb11206 (2026-06-04)
+- **Information Disclosure** (medium) [CWE-200]: This commit fixes a data leakage issue in workflows where sibling state could leak across concurrent executions, and race requests ignored dynamic values, by syncing context and cloning inputs.
+  - sink: `syncWorkflowInputToTemplateCtx`
+  - fix: context synchronization and input cloning
+  - commit: https://github.com/projectdiscovery/nuclei/commit/805bcfe76f3629dbe71021795d4ce865406c1555 (2026-05-08)
+- **Sandbox Escape** (high) [CWE-284]: Fixes sandbox escape where require() bypassed local file access restrictions and reused privileged module cache across executions.
+  - sink: `require() using default host filesystem loader`
+  - fix: Rebuild require registry per execution and enforce allow-local-file-access sandbox rules
+  - commit: https://github.com/projectdiscovery/nuclei/commit/6f2ade6a9b427c284c15a43445f9c7f055e60e5d (2026-04-10)
+- **Cryptographic Weakness** (medium) [CWE-338]: Replaces predictable math/rand PRNG with cryptographically secure crypto/rand in JS helper functions.
+  - sink: `rand.Intn(255) / rand.Int63()`
+  - fix: Replace predictable math/rand with crypto/rand
+  - commit: https://github.com/projectdiscovery/nuclei/commit/44ef9ce34ffcfdfca3a96626abc73d99dd0e83ab (2026-03-15)
+- **Auth Bypass** (high) [CWE-347]: Caching signature verification results without cryptographic re-check allows a metadata index compromise to bypass template signature verification.
+  - sink: `template.Verified, template.TemplateVerifier`
+  - fix: cached verification data reuse
+  - commit: https://github.com/projectdiscovery/nuclei/commit/4534e9cb3034ebe5cc7b0cecabe399b6fb9ce0e4 (2026-01-21)
+- **Race Condition** (medium) [CWE-362]: Fixes a race condition in workflow execution caused by shared context callbacks, which could lead to data corruption or crashes; the primary impact is reliability, not a direct security breach.
+  - sink: `shared context callbacks in workflow execution`
+  - fix: fix race condition by making workflow execution sequential
+  - commit: https://github.com/projectdiscovery/nuclei/commit/24d1f58682027e23cb21a299a170abd2bdf20dc2 (2025-12-05)
+- **Auth Bypass** (high) [CWE-347]: Fixes template signature verification by centralizing signature extraction and requiring the signature to be at the end of the template, preventing bypass.
+  - sink: `Verify`
+  - fix: signature extraction and verification
+  - commit: https://github.com/projectdiscovery/nuclei/commit/0da993afe6d41b4b1b814e8fad23a2acba13c60a (2024-08-19)
+- **Dependency Vulnerability** (medium) [CWE-1104]: Upgrades Alpine base image from 3.18.5 to 3.18.6 to fix known security vulnerabilities in bundled packages.
+  - sink: `FROM alpine:3.18.5`
+  - fix: Upgrade base image to patched version
+  - commit: https://github.com/projectdiscovery/nuclei/commit/fcd5c6b111ddcb746525f88b7d0bf4b4abbc2529 (2024-03-15)
+- **Dependency Vulnerability** (medium) [CWE-1104]: Upgrades Alpine base image from 3.18.2 to 3.18.5 to fix known security vulnerabilities in bundled packages.
+  - sink: `FROM alpine:3.18.2`
+  - fix: Upgrade base image to patched version
+  - commit: https://github.com/projectdiscovery/nuclei/commit/d93b4a01df9c218a36dd2fccfb1c2c1f96b181fe (2024-03-15)
+- **Dependency Vulnerability** (high) [CWE-1035]: Updates go-git to fix known vulnerabilities (CVE-2023-49569, CVE-2023-49568), which could be exploited when processing untrusted git data.
+  - sink: `go-git library usage`
+  - fix: dependency upgrade to patched version
+  - commit: https://github.com/projectdiscovery/nuclei/commit/1700cdf4e23128a358066364062246b58c1c013f (2024-03-14)
+- **Code Execution via Unsigned Template** (high) [CWE-347]: Introduces a flag to disable unsigned templates, preventing execution of unverified templates that could lead to arbitrary code execution.
+  - sink: `loading unsigned templates when -dut flag is set`
+  - fix: Adds -disable-unsigned-templates flag to skip unsigned templates and report them separately
+  - commit: https://github.com/projectdiscovery/nuclei/commit/fa56800fcca3c8c8fe8e8dec28584210ca1527de (2024-03-14)
+- **Auth Bypass** (medium) [CWE-347]: This commit introduces a flag to skip unsigned templates, closing a path where an attacker could execute untrusted templates by bypassing signature verification.
+  - sink: `parsed.Verified`
+  - fix: skip unverified templates when DisableUnsignedTemplates is set
+  - commit: https://github.com/projectdiscovery/nuclei/commit/9bd4db3f74aedd067af568df4f9198a8a090f68b (2024-03-10)
+- **Code Execution** (high) [CWE-94]: Prevents execution of unverified code templates in workflows, mitigating code execution risk.
+  - sink: `template.RequestsCode`
+  - fix: require -code flag and verified templates for code templates in workflows
+  - commit: https://github.com/projectdiscovery/nuclei/commit/e86f38299765b82ad724fdb701557e0eaff3884d (2024-03-01)
+- **SSRF** (high) [CWE-918]: Fixes SSRF by validating the actual LDAP controller host against the network policy instead of the domain name.
+  - sink: `newLdapSession`
+  - fix: host allowlist check on controller instead of domain
+  - commit: https://github.com/projectdiscovery/nuclei/commit/a167e6c57b80f5dc7be231231b62d7c594ee2770 (2024-01-20)
+- **Sandbox Escape** (high) [CWE-94]: Disables eval and tightens file read validation in the JavaScript sandbox, preventing template-driven code execution and file access outside the sandbox.
+  - sink: `eval function and file read in sandbox mode`
+  - fix: Disable eval function and rewrite file validation in sandbox mode
+  - commit: https://github.com/projectdiscovery/nuclei/commit/c35162c8ef061a96dd74b54c8f022c1a41cf5833 (2023-10-13)
+- **Path Traversal** (high) [CWE-22]: Adds network policy and blocks file:// protocol in headless mode unless -lfa is set, preventing local file disclosure.
+  - sink: `file:// protocol access in headless browser`
+  - fix: Network policy validation and file:// scheme blocking when local file access is disabled
+  - commit: https://github.com/projectdiscovery/nuclei/commit/d3928e080d819f25306bfbaecc399f03516db5aa (2023-08-25)
+- **Deserialization of Untrusted Data** (medium) [CWE-502]: Fixes JSON deserialization by adding explicit UnmarshalJSON methods and correcting tags, preventing type confusion and potential logic bypasses.
+  - sink: `UnmarshalJSON on user-controlled fields like Type and Name`
+  - fix: Adds proper UnmarshalJSON implementations and corrects json tags to prevent type confusion
+  - commit: https://github.com/projectdiscovery/nuclei/commit/85090b75317977bb9301444c9dfd8e4c2dba667a (2023-02-07)
+- **Sandbox Escape** (medium) [CWE-22]: The commit adds sandbox mode that restricts payload file paths to the template directory, preventing arbitrary file reads when sandbox is enabled.
+  - sink: `loadPayloadsFromFile`
+  - fix: path prefix validation against template directory and template path directory
+  - commit: https://github.com/projectdiscovery/nuclei/commit/e7fb40a41308f6c41267e858d1781eb67f7e0572 (2022-11-16)
+- **Insecure File Permissions** (low) [CWE-732]: Fixes overly permissive file permissions on debug output files by changing from os.ModePerm (0777) to 0644.
+  - sink: `os.OpenFile`
+  - fix: restrict file mode to 0644
+  - commit: https://github.com/projectdiscovery/nuclei/commit/af4854f90de728bb08689d5cae3dec4acfdb6b9a (2022-06-20)
+- **Security Misconfiguration** (medium) [CWE-16]: Prevents setting HTTP_PROXY environment variable unless explicitly enabled, avoiding potential proxy hijacking.
+  - sink: `os.Setenv(types.HTTP_PROXY_ENV, proxyURL.String())`
+  - fix: Added check for options.ProxyInternal before setting HTTP_PROXY environment variable
+  - commit: https://github.com/projectdiscovery/nuclei/commit/3f5c055aca1499642caf4f40e8cf55ad32bd4da9 (2022-03-09)
+- **Sandbox Escape** (high) [CWE-250]: The commit restricts the use of the --no-sandbox flag to Linux root users, preventing sandbox escape vulnerabilities in other environments.
+  - sink: `NoSandbox(true)`
+  - fix: Conditionally disable sandbox only on Linux as root
+  - commit: https://github.com/projectdiscovery/nuclei/commit/df55f7a2eb591a7949b5c66a9c54db54aa28f450 (2021-12-05)
+- **Path Traversal** (high) [CWE-22]: This commit fixes a zip-slip path traversal vulnerability by validating the extracted file path against the configured template directory.
+  - sink: `os.OpenFile`
+  - fix: path canonicalization and prefix check
+  - commit: https://github.com/projectdiscovery/nuclei/commit/f9c214a66f37a00fc29fe64232b690e6285ec59c (2021-11-25)
+- **SSRF** (high) [CWE-918]: Adds validation and connectivity checks for SOCKS5 proxies before launching a scan, preventing SSRF through proxy configuration.
+  - sink: `Proxy connection validation and loading`
+  - fix: Proxy server validation and connectivity check before scan launch
+  - commit: https://github.com/projectdiscovery/nuclei/commit/0e46d3e0410f89e4af41099f5cd38fa7f54ae54f (2021-11-10)
+- **Sandbox Escape** (high) [CWE-284]: This commit adds a sandbox flag that, when enabled, restricts the tengo scripting engine to safe modules, preventing sandbox escape and arbitrary command execution.
+  - sink: `stdlib.GetModuleMap(stdlib.AllModuleNames()...)`
+  - fix: Added sandbox flag to restrict imports to safe modules when sandbox is enabled
+  - commit: https://github.com/projectdiscovery/nuclei/commit/cf2a98b03d76327c20fb0183b7f1c849eb692c91 (2020-12-13)
+- **Sandbox Escape** (high) [CWE-284]: This commit restricts the tengo scripting engine to a safe module list, preventing sandbox escape and arbitrary command execution via workflow templates.
+  - sink: `stdlib.GetModuleMap(stdlib.AllModuleNames()...)`
+  - fix: Restricted tengo script imports to a safe module list
+  - commit: https://github.com/projectdiscovery/nuclei/commit/96049a32fa70aef0483d4180d386a57b3c2d973a (2020-12-13)

 ---
-_Fixed-issue fingerprints and advisory matches are derived from git history and published advisories; the risk tables and pattern descriptions above are derived from them and should be verified against the cited commits._
+_Fixed-issue fingerprints and CVE matches are derived from real data; LLM-written prose is advisory and should be verified against the cited commits._
@@ -530,16 +530,6 @@ Description of the template.

 You can go in-depth here on what the template actually does.

-Description, impact and remediation may hold {{placeholders}} filled for
-each finding: named extractors, payloads, variables and DSL helpers
-(network helpers excluded), and the result fields host, port, ip, url,
-scheme, path, matched-at, matcher-name and extractor-name, which win over
-values of the same name. Use join(", ", name) for an extractor with
-several values, and brackets for a hyphenated name inside a helper:
-to_upper([matcher-name]). Unknown placeholders stay as written, and so
-does a field whose expression fails. Global matcher templates match on
-other templates' responses, so only the result fields fill their text.
-


 Examples:
@@ -553,10 +543,6 @@ description: Bower is a package manager which stores package information in the
 description: Subversion ALM for the enterprise before 8.8.2 allows reflected XSS at multiple locations
 ```

-```yaml
-description: Redis {{version}} on {{host}}:{{port}} accepts the default password
-```
-

 </div>

@@ -573,8 +559,6 @@ Impact of the template.

 You can go in-depth here on impact of the template.

-Supports the same placeholders as description.
-


 Examples:
@@ -681,8 +665,6 @@ Remediation steps for the template.

 You can go in-depth here on how to mitigate the problem found by this template.

-Supports the same placeholders as description.
-


 Examples:
@@ -3775,8 +3757,6 @@ Part Definitions:
 - <code>req</code> - Headless request made from the client
 - <code>duration</code> - Latest measured operation duration in seconds
 - <code>resp,body,data</code> - Headless response received from client (default)
- <code>header,all_headers</code> - Headless response headers
- <code>status_code</code> - Status code received from the server

 <hr />

@@ -20,8 +20,6 @@ extend-exclude = [
    "vendor/",
    # Go checksum file
    "go.sum",
-    # Generated history. Commit SHAs are not words.
-    "SECURITY_CONTEXT.md",
 ]

 [default.extend-identifiers]
@@ -57,8 +57,7 @@
 #    severity: low
 #  # duplicate-issue-check (optional) flag to enable duplicate tracking issue check
 #  duplicate-issue-check: false
-#  # duplicate-issue-page-size (optional) sets the number of issues to request per page when searching for duplicates
-#  # (GitLab returns at most 100 issues per page)
+#  # duplicate-issue-page-size (optional) controls how many issues to fetch per page when searching for duplicates
 #  duplicate-issue-page-size: 100
 #  # duplicate-issue-max-pages (optional) limits how many pages to fetch when searching for duplicates (0 = no limit)
 #  duplicate-issue-max-pages: 0
@@ -271,10 +271,10 @@ on extensive configurability, massive extensibility and ease of use.`)
 		flagSet.StringSliceVarP(&options.Targets, "target", "u", nil, "target URLs/hosts to scan", goflags.CommaSeparatedStringSliceOptions),
 		flagSet.StringVarP(&options.TargetsFilePath, "list", "l", "", "path to file containing a list of target URLs/hosts to scan (one per line)"),
 		flagSet.StringVarP(&options.InlineTargetsList, "targets-inline", "", "", "inline multiline target list (for use in template profiles)"),
-		flagSet.StringSliceVarP(&options.ExcludeTargets, "exclude-hosts", "eh", nil, "hosts to exclude to scan from the input list (ip, cidr, hostname)", goflags.FileNormalizedOriginalStringSliceOptions),
+		flagSet.StringSliceVarP(&options.ExcludeTargets, "exclude-hosts", "eh", nil, "hosts to exclude to scan from the input list (ip, cidr, hostname)", goflags.FileCommaSeparatedStringSliceOptions),
 		flagSet.StringVar(&options.Resume, "resume", "", "resume scan from and save to specified file (clustering will be disabled)"),
 		flagSet.BoolVarP(&options.ScanAllIPs, "scan-all-ips", "sa", false, "scan all the IP's associated with dns record"),
-		flagSet.StringSliceVarP(&options.IPVersion, "ip-version", "iv", nil, "IP version to scan of hostname (4,6); default uses dialer fallback, -sa scans all addresses", goflags.CommaSeparatedStringSliceOptions),
+		flagSet.StringSliceVarP(&options.IPVersion, "ip-version", "iv", nil, "IP version to scan of hostname (4,6) - (default 4)", goflags.CommaSeparatedStringSliceOptions),
 		flagSet.BoolVarP(&options.DisableURLNormalization, "disable-url-normalization", "dun", false, "keep targets exactly as supplied instead of collapsing urls that address the same resource"),
 		flagSet.IntVarP(&options.MaxURLsPerPattern, "max-urls-per-pattern", "mup", 0, "scan at most this many urls sharing one structural shape, e.g. /user/1 and /user/2 (0 to scan all)"),
 	)
@@ -309,7 +309,7 @@ on extensive configurability, massive extensibility and ease of use.`)
 		flagSet.BoolVarP(&options.EnableGlobalMatchersTemplates, "enable-global-matchers", "egm", false, "enable loading global matchers templates"),
 		flagSet.BoolVar(&options.EnableFileTemplates, "file", false, "enable loading file templates"),
 		flagSet.BoolVar(&options.EnableLLM, "llm", false, "enable llm matchers and extractors (semantic matching)"),
-		flagSet.StringVar(&options.LLMProvider, "llm-provider", "openai", "llm provider for semantic matching (openai, ollama, llamacpp, vllm, lmstudio, groq, openrouter, together, orcarouter, jev)"),
+		flagSet.StringVar(&options.LLMProvider, "llm-provider", "openai", "llm provider for semantic matching (openai, ollama, llamacpp, vllm, lmstudio, groq, openrouter, together, orcarouter)"),
 		flagSet.StringVar(&options.LLMBaseURL, "llm-base-url", "", "openai-compatible endpoint for semantic matching (overrides -llm-provider, e.g. a local model)"),
 		flagSet.StringVar(&options.LLMModel, "llm-model", "", "model used for semantic matching"),
 		flagSet.IntVar(&options.LLMTimeout, "llm-timeout", 30, "time in seconds to wait for a single llm call"),
@@ -355,7 +355,6 @@ on extensive configurability, massive extensibility and ease of use.`)
 		flagSet.StringVarP(&options.JSONLExport, "jsonl-export", "jle", "", "file to export results in JSONL(ine) format"),
 		flagSet.StringVarP(&options.PDFExport, "pdf-export", "pe", "", "file to export results in PDF format"),
 		flagSet.StringSliceVarP(&options.Redact, "redact", "rd", nil, "redact given list of keys from query parameter, request header and body", goflags.CommaSeparatedStringSliceOptions),
-		flagSet.BoolVarP(&options.NoRedact, "no-redact", "nrd", false, "disable the built-in redaction of credential headers (Authorization, Cookie, Set-Cookie, ...) in output; keys given with -redact are still redacted"),
 	)

 	flagSet.CreateGroup("configs", "Configurations",
@@ -471,7 +470,6 @@ on extensive configurability, massive extensibility and ease of use.`)
 		flagSet.BoolVar(&options.PreflightPortScan, "preflight-portscan", false, "run preflight resolve + TCP portscan and filter targets before scanning (disabled by default)"),
 		flagSet.BoolVar(&options.DisableStdin, "no-stdin", false, "disable stdin processing"),
 		flagSet.BoolVar(&options.EnableHTTPCache, "http-cache", false, "enable HTTP cache (RFC 9111) for HTTP requests"),
-		flagSet.BoolVarP(&options.AutoCalibrate, "auto-calibrate", "ac", false, "drop HTTP matches on a host's catch-all page (answers missing paths with 2xx/3xx)"),
 	)

 	flagSet.CreateGroup("headless", "Headless",
@@ -18,11 +18,10 @@ require (
 	github.com/alecthomas/chroma v0.10.0
 	github.com/alexsnet/go-vnc v0.1.0
 	github.com/alitto/pond v1.9.2
-	github.com/andybalholm/brotli v1.2.0
 	github.com/andygrunwald/go-jira v1.16.1
-	github.com/antchfx/htmlquery v1.3.7
+	github.com/antchfx/htmlquery v1.3.5
 	github.com/antchfx/xmlquery v1.4.4
-	github.com/antchfx/xpath v1.3.9
+	github.com/antchfx/xpath v1.3.6
 	github.com/aws/aws-sdk-go-v2 v1.41.5
 	github.com/aws/aws-sdk-go-v2/config v1.31.16
 	github.com/aws/aws-sdk-go-v2/credentials v1.18.20
@@ -34,11 +33,10 @@ require (
 	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/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707
 	github.com/elazarl/goproxy v1.7.2
 	github.com/fatih/structs v1.1.0
 	github.com/fullstorydev/grpcurl v1.9.3
-	github.com/getkin/kin-openapi v0.149.0
+	github.com/getkin/kin-openapi v0.144.0
 	github.com/getsops/sops/v3 v3.9.2
 	github.com/go-echarts/go-echarts/v2 v2.6.0
 	github.com/go-git/go-git/v5 v5.19.2
@@ -63,7 +61,6 @@ require (
 	github.com/jhump/protoreflect v1.17.0
 	github.com/julienschmidt/httprouter v1.3.0
 	github.com/kitabisa/go-ci v1.0.3
-	github.com/klauspost/compress v1.18.7
 	github.com/leslie-qiwa/flat v0.0.0-20230424180412-f9d1cf014baa
 	github.com/lib/pq v1.12.3
 	github.com/logrusorgru/aurora/v4 v4.0.0
@@ -78,7 +75,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/praetorian-inc/fingerprintx v1.1.15
 	github.com/projectdiscovery/clistats v0.1.7
-	github.com/projectdiscovery/dsl v0.9.0
+	github.com/projectdiscovery/dsl v0.8.24
 	github.com/projectdiscovery/fastdialer v0.6.0
 	github.com/projectdiscovery/fasttemplate v0.0.2
 	github.com/projectdiscovery/gcache v0.0.0-20241015120333-12546c6e3f4c
@@ -88,7 +85,7 @@ require (
 	github.com/projectdiscovery/goja_nodejs v0.0.0-20260618132410-8519f75f703d
 	github.com/projectdiscovery/gologger v1.1.73
 	github.com/projectdiscovery/gostruct v0.0.2
-	github.com/projectdiscovery/govaluate v0.0.0-20261102102118-9294133b15a2
+	github.com/projectdiscovery/govaluate v0.0.0-20260615100919-5ee2581bbf7e
 	github.com/projectdiscovery/gozero v0.1.1-0.20260530071156-fa1dad563d76
 	github.com/projectdiscovery/hmap v0.0.102
 	github.com/projectdiscovery/httpx v1.12.0
@@ -105,8 +102,8 @@ require (
 	github.com/projectdiscovery/tlsx v1.4.3-0.20261020052910-acb80c2c7c75
 	github.com/projectdiscovery/uncover v1.2.1
 	github.com/projectdiscovery/useragent v0.0.109
-	github.com/projectdiscovery/utils v0.11.13-0.20261103094816-5c0b20e35350
-	github.com/projectdiscovery/wappalyzergo v0.3.6
+	github.com/projectdiscovery/utils v0.11.12-0.20261025172519-64b3c221cfe5
+	github.com/projectdiscovery/wappalyzergo v0.3.5
 	github.com/projectdiscovery/yamldoc-go v1.0.7
 	github.com/redis/go-redis/v9 v9.19.0
 	github.com/remeh/sizedwaitgroup v1.0.0
@@ -116,7 +113,6 @@ require (
 	github.com/segmentio/ksuid v1.0.4
 	github.com/shurcooL/graphql v0.0.0-20230722043721-ed46e5a46466
 	github.com/sijms/go-ora/v2 v2.9.0
-	github.com/spaolacci/murmur3 v1.1.0
 	github.com/spf13/cast v1.10.0
 	github.com/stretchr/testify v1.12.1
 	github.com/syndtr/goleveldb v1.0.0
@@ -179,6 +175,7 @@ require (
 	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.4 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8 // indirect
@@ -242,6 +239,7 @@ require (
 	github.com/docker/cli v29.2.0+incompatible // indirect
 	github.com/docker/go-connections v0.7.0 // indirect
 	github.com/dop251/goja v0.0.0-20260311135729-065cd970411c // indirect
+	github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/ebitengine/purego v0.10.0 // indirect
 	github.com/emersion/go-sasl v0.0.0-20241020182733-b788ff22d5a6 // indirect
@@ -325,6 +323,7 @@ require (
 	github.com/kaiakz/ubuffer v0.0.0-20200803053910-dd1083087166 // indirect
 	github.com/kataras/jwt v0.1.10 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
+	github.com/klauspost/compress v1.18.7 // indirect
 	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
 	github.com/klauspost/pgzip v1.2.6 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
@@ -386,13 +385,14 @@ require (
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/ryanuber/go-glob v1.0.0 // indirect
 	github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d // indirect
-	github.com/santhosh-tekuri/jsonschema/v6 v6.0.3 // indirect
+	github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
 	github.com/sergi/go-diff v1.4.0 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
 	github.com/shirou/gopsutil/v4 v4.26.3 // indirect
 	github.com/sirupsen/logrus v1.10.2 // indirect
 	github.com/skeema/knownhosts v1.3.1 // indirect
 	github.com/sorairolake/lzip-go v0.3.8 // indirect
+	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	github.com/spf13/afero v1.15.0 // indirect
 	github.com/spf13/pflag v1.0.10 // indirect
 	github.com/spiffe/go-spiffe/v2 v2.7.0 // indirect
@@ -180,13 +180,14 @@ github.com/andygrunwald/go-jira v1.16.1 h1:WoQEar5XoDRAibOgKzTFELlPNlKAtnfWr296R
 github.com/andygrunwald/go-jira v1.16.1/go.mod h1:UQH4IBVxIYWbgagc0LF/k9FRs9xjIiQ8hIcC6HfLwFU=
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
-github.com/antchfx/htmlquery v1.3.7 h1:KCUklE1EO/xm6iS3CWx6iatFlcnENBk4I4UYa2pBmLU=
-github.com/antchfx/htmlquery v1.3.7/go.mod h1:/uBTMnFEl6LaBlIgw3KZ+c061tAQdlfbCXObZoxwQf4=
+github.com/antchfx/htmlquery v1.3.5 h1:aYthDDClnG2a2xePf6tys/UyyM/kRcsFRm+ifhFKoU0=
+github.com/antchfx/htmlquery v1.3.5/go.mod h1:5oyIPIa3ovYGtLqMPNjBF2Uf25NPCKsMjCnQ8lvjaoA=
 github.com/antchfx/xmlquery v1.4.4 h1:mxMEkdYP3pjKSftxss4nUHfjBhnMk4imGoR96FRY2dg=
 github.com/antchfx/xmlquery v1.4.4/go.mod h1:AEPEEPYE9GnA2mj5Ur2L5Q5/2PycJ0N9Fusrx9b12fc=
 github.com/antchfx/xpath v1.3.3/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs=
-github.com/antchfx/xpath v1.3.9 h1:muXJSod6jRzhsiUjvduNSxsRSptFZ2GOJ1oMD1QkPSA=
-github.com/antchfx/xpath v1.3.9/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs=
+github.com/antchfx/xpath v1.3.5/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs=
+github.com/antchfx/xpath v1.3.6 h1:s0y+ElRRtTQdfHP609qFu0+c6bglDv20pqOViQjjdPI=
+github.com/antchfx/xpath v1.3.6/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
@@ -426,8 +427,8 @@ github.com/gaissmai/bart v0.30.0 h1:K1oTSQ6Nf76bhrgxeTqzZa4hE0M9x4xDfL6n6UG67Sc=
 github.com/gaissmai/bart v0.30.0/go.mod h1:GREWQfTLRWz/c5FTOsIw+KkscuFkIV5t8Rp7Nd1Td5c=
 github.com/geoffgarside/ber v1.2.0 h1:/loowoRcs/MWLYmGX9QtIAbA+V/FrnVLsMMPhwiRm64=
 github.com/geoffgarside/ber v1.2.0/go.mod h1:jVPKeCbj6MvQZhwLYsGwaGI52oUorHoHKNecGT85ZCc=
-github.com/getkin/kin-openapi v0.149.0 h1:ZbhmVJ4yq5RZDUsyP8lcBcGMsjsaTqXEFt6isdtMDfA=
-github.com/getkin/kin-openapi v0.149.0/go.mod h1:1+BHDzstro+P5CKtPy1X4PfofnFgmRe6uvMy9+r9fKY=
+github.com/getkin/kin-openapi v0.144.0 h1:hIRcTH+KjLfkLpYU6bSSfdFpi0fZi1fp+hSPi4aQu9Y=
+github.com/getkin/kin-openapi v0.144.0/go.mod h1:3BH9M9XDe/y9M5DSvEocVYAYq1w0qrhJHjC/vZi0AaY=
 github.com/getsops/gopgagent v0.0.0-20240527072608-0c14999532fe h1:QKe/kmAYbndxwu91TcjHERsnMh5SgOB1x/qicvOdUJ8=
 github.com/getsops/gopgagent v0.0.0-20240527072608-0c14999532fe/go.mod h1:awFzISqLJoZLm+i9QQ4SgMNHDqljH6jWV0B36V5MrUM=
 github.com/getsops/sops/v3 v3.9.2 h1:Cuuahc/UGu7W3+NXd+mrl+2oXGxxj/jIPsw6Ah2CbxA=
@@ -934,8 +935,8 @@ github.com/projectdiscovery/cdncheck v1.3.2 h1:I453ZWNBeG0WWIy3wi9412l4PTzorLgeb
 github.com/projectdiscovery/cdncheck v1.3.2/go.mod h1:5IkUMMlcGaeg1DWW5oJVd3r9X3EpJ88j5HxBeF4Me9M=
 github.com/projectdiscovery/clistats v0.1.7 h1:NXf4lUzx1QcbJd6QycNwwYHTv2FsW9MchQ2LsgSL6C0=
 github.com/projectdiscovery/clistats v0.1.7/go.mod h1:RxRGxhMzkT344VTTvZWIrojurUXdQQRN1yfwgg/88I8=
-github.com/projectdiscovery/dsl v0.9.0 h1:i1KyCbKJyKfHkgdbfh0JkWdd14APUjpEYf+GaYANlCg=
-github.com/projectdiscovery/dsl v0.9.0/go.mod h1:ntNFkkiYCTEosGFTbApA61RMrvJTCjnakPxnWj56MyY=
+github.com/projectdiscovery/dsl v0.8.24 h1:rN2w6LSIjA16qKGRjyj70oxdwXGaspe6sAjEkP7F2fk=
+github.com/projectdiscovery/dsl v0.8.24/go.mod h1:V+EludvS5PS19UNMlM3CuBwZ+sFnMaQhCFGxysDUanQ=
 github.com/projectdiscovery/fastdialer v0.6.0 h1:4ZeFQ6LyRH4D8e3qO/yzqIP4Cf9Fr0DduaVpJD6ENnE=
 github.com/projectdiscovery/fastdialer v0.6.0/go.mod h1:FpHwa9S5PUgfPbh+irOm+cdU6AO631XidxkhPwPv7yY=
 github.com/projectdiscovery/fasttemplate v0.0.2 h1:h2cISk5xDhlJEinlBQS6RRx0vOlOirB2y3Yu4PJzpiA=
@@ -956,8 +957,8 @@ github.com/projectdiscovery/gologger v1.1.73 h1:WX2nzq29cL7HdvOHqIttacoid/5lMwap
 github.com/projectdiscovery/gologger v1.1.73/go.mod h1:mJwODZcFDg70ihINpOvZevmBtgvpP8H9/l8Y+OPhZPY=
 github.com/projectdiscovery/gostruct v0.0.2 h1:s8gP8ApugGM4go1pA+sVlPDXaWqNP5BBDDSv7VEdG1M=
 github.com/projectdiscovery/gostruct v0.0.2/go.mod h1:H86peL4HKwMXcQQtEa6lmC8FuD9XFt6gkNR0B/Mu5PE=
-github.com/projectdiscovery/govaluate v0.0.0-20261102102118-9294133b15a2 h1:aSLbDvrJQPlp4HvojU+bTU5XV8xdAVCjoc5gX1Wfbw4=
-github.com/projectdiscovery/govaluate v0.0.0-20261102102118-9294133b15a2/go.mod h1:Z3VjpUJV1pnXDwvAddA8aZ4e839SoeftB7CSdZntAVI=
+github.com/projectdiscovery/govaluate v0.0.0-20260615100919-5ee2581bbf7e h1:vxzgQlz2Cy/YvizYDQx9OhucBcmBotfDhbQ4yCY2vfA=
+github.com/projectdiscovery/govaluate v0.0.0-20260615100919-5ee2581bbf7e/go.mod h1:xH7bPwHxUlz1yx9UlVeTF+UVCUaKhTnZgaxHb5z362E=
 github.com/projectdiscovery/gozero v0.1.1-0.20260530071156-fa1dad563d76 h1:AN70bbi6BBs7KpIM9w0LxygUN7uzT/oH+owDIQ+Fz/k=
 github.com/projectdiscovery/gozero v0.1.1-0.20260530071156-fa1dad563d76/go.mod h1:cWHYnRXoYWHtTpOYyAp5laGYX8GH8ITUhgQaP8G/8FA=
 github.com/projectdiscovery/hmap v0.0.102 h1:ybPuf7UQvuOLiHLOUbVMvd+PSlItQU5iQpP1Erl8kaU=
@@ -998,10 +999,10 @@ github.com/projectdiscovery/uncover v1.2.1 h1:8U46T/96CLT7BPoXBgkTvWqB06lOyeTSLv
 github.com/projectdiscovery/uncover v1.2.1/go.mod h1:0p8onrWxfpXQEYs90ZDzTSpu1107gWmodX1NWqu/+z4=
 github.com/projectdiscovery/useragent v0.0.109 h1:b86BPdZvmgbJousa04jAugDRY4Y+rAvEamE0TFCPmeE=
 github.com/projectdiscovery/useragent v0.0.109/go.mod h1:sRyBqDAcD31RKYrO8fyXGowLd36fNwY1g0MNW9mp7zk=
-github.com/projectdiscovery/utils v0.11.13-0.20261103094816-5c0b20e35350 h1:uXqpYa6XKV9dCvoti9PbSgIWIsBKPu5YKMywB9G4q0Q=
-github.com/projectdiscovery/utils v0.11.13-0.20261103094816-5c0b20e35350/go.mod h1:TJgsyVjB02CavwZVFzUzPg6YOSJXQxLhL808JCiQKlU=
-github.com/projectdiscovery/wappalyzergo v0.3.6 h1:1FXCMeCa1xVu2zaW+eeBcbVxtlMStqGOlKcMLyh2pzI=
-github.com/projectdiscovery/wappalyzergo v0.3.6/go.mod h1:4E6+fh/ckaY3wo5tlM7lNYSkhuTYRHzu2YmGIRraXP0=
+github.com/projectdiscovery/utils v0.11.12-0.20261025172519-64b3c221cfe5 h1:AOspf7ScbwZr8A2YnjCFd4ZJAMSFqzfEaIJIbJPuu10=
+github.com/projectdiscovery/utils v0.11.12-0.20261025172519-64b3c221cfe5/go.mod h1:TJgsyVjB02CavwZVFzUzPg6YOSJXQxLhL808JCiQKlU=
+github.com/projectdiscovery/wappalyzergo v0.3.5 h1:UZradYF1GIcruSIV5wwo/Coph9/VnM17oajLD9eXR2U=
+github.com/projectdiscovery/wappalyzergo v0.3.5/go.mod h1:4E6+fh/ckaY3wo5tlM7lNYSkhuTYRHzu2YmGIRraXP0=
 github.com/projectdiscovery/yamldoc-go v1.0.7 h1:Odmjd1o4EkMff2F6QHi1dIYPIQPZUFy24YqmQCprmTk=
 github.com/projectdiscovery/yamldoc-go v1.0.7/go.mod h1:nqD1iPMcofpRA1DbXavPByJhWURrshT+l8WN9XjyQag=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
@@ -1054,8 +1055,8 @@ github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d h1:hrujxIzL1woJ7
 github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d/go.mod h1:uugorj2VCxiV1x+LzaIdVa9b4S4qGAcH6cbhh4qVxOU=
 github.com/sandrolain/httpcache v1.4.0 h1:Jf4Vx62X2ybvNPSpPvI1kT3xvMdDG1AsApQjOQKO9E0=
 github.com/sandrolain/httpcache v1.4.0/go.mod h1:kHBuXveitSn39SNPBhdf/ybG272X706HJ2RJqOQ+Em0=
-github.com/santhosh-tekuri/jsonschema/v6 v6.0.3 h1:1EYB5IzjZawrrnELUi78f9fPu57HuXjmddZPjrls/28=
-github.com/santhosh-tekuri/jsonschema/v6 v6.0.3/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU=
+github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 h1:KRzFb2m7YtdldCEkzs6KqmJw4nqEVZGK7IN2kJkjTuQ=
+github.com/santhosh-tekuri/jsonschema/v6 v6.0.2/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU=
 github.com/segmentio/ksuid v1.0.4 h1:sBo2BdShXjmcugAMwjugoGUdUV0pcxY5mW4xKRn3v4c=
 github.com/segmentio/ksuid v1.0.4/go.mod h1:/XUiZBD3kVx5SmUOl55voK5yeAbBNNIed+2O73XgrPE=
 github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw=
@@ -39,9 +39,6 @@ func (r *Runner) initializeTemplatesHTTPInput() (*hybrid.HybridMap, error) {
 	}
 	httpxOptions.RetryMax = r.options.Retries
 	httpxOptions.Timeout = time.Duration(r.options.Timeout) * time.Second
-	if len(r.options.InternalResolversList) > 0 {
-		httpxOptions.Resolvers = r.options.InternalResolversList
-	}

 	dialers := protocolstate.GetDialersWithId(r.options.ExecutionId)
 	if dialers == nil {
@@ -2,12 +2,8 @@ package runner

 import (
 	"context"
-	"errors"
-	"sync"
 	"time"

-	"github.com/projectdiscovery/gologger"
-
 	llmclient "github.com/projectdiscovery/nuclei/v3/pkg/operators/common/llm"
 	"github.com/projectdiscovery/nuclei/v3/pkg/types"
 	utilsllm "github.com/projectdiscovery/utils/llm"
@@ -32,32 +28,6 @@ func (a *llmMatcherClient) Complete(ctx context.Context, prompt string, asJSON b
 	})
 }

-// llmJudgeClient is an llmMatcherClient whose provider classifies natively, so
-// llm matchers ask it through Judge instead of Complete.
-type llmJudgeClient struct {
-	*llmMatcherClient
-	warnComplete sync.Once
-}
-
-func (a *llmJudgeClient) Judge(ctx context.Context, question string, labels, inputs []string) (llmclient.Verdict, error) {
-	verdict, err := a.client.Judge(ctx, utilsllm.JudgeRequest{Question: question, Labels: labels, Inputs: inputs})
-	if err != nil {
-		return llmclient.Verdict{}, err
-	}
-	return llmclient.Verdict{Label: verdict.Label, Confidence: verdict.Confidence, Model: verdict.Model}, nil
-}
-
-// Complete is only reached by llm extractors, which need free text a
-// classifier cannot produce. Returning here spends no call budget and
-// makes no provider request. Extractors turn the error into an empty
-// result, and the warning says why.
-func (a *llmJudgeClient) Complete(context.Context, string, bool) (string, error) {
-	a.warnComplete.Do(func() {
-		gologger.Warning().Msgf("llm provider %q cannot run llm extractors, they return nothing", utilsllm.ProviderJev)
-	})
-	return "", errors.New("llm provider cannot run extractors")
-}
-
 // configureLLM builds the scan's llm client from options. It returns nil unless
 // -llm is set, so nothing reaches a model until the user opts in. The API key is
 // read from the environment by the provider layer, never from options.
@@ -82,9 +52,5 @@ func configureLLM(options *types.Options) (llmclient.Client, error) {
 		return nil, err
 	}

-	matcherClient := &llmMatcherClient{client: client, model: options.LLMModel}
-	if client.CanJudge() {
-		return &llmJudgeClient{llmMatcherClient: matcherClient}, nil
-	}
-	return matcherClient, nil
+	return &llmMatcherClient{client: client, model: options.LLMModel}, nil
 }
@@ -1,65 +0,0 @@
-package runner
-
-import (
-	"context"
-	"net/http"
-	"net/http/httptest"
-	"sync/atomic"
-	"testing"
-
-	llmclient "github.com/projectdiscovery/nuclei/v3/pkg/operators/common/llm"
-	"github.com/projectdiscovery/nuclei/v3/pkg/types"
-	"github.com/stretchr/testify/require"
-)
-
-func TestConfigureLLMExposesJudgeOnlyForClassifiers(t *testing.T) {
-	t.Setenv("LLM_API_KEY", "key")
-
-	client, err := configureLLM(&types.Options{EnableLLM: true, LLMProvider: "jev", LLMModel: "jev-latest"})
-	require.NoError(t, err)
-	require.Implements(t, (*llmclient.Judge)(nil), client)
-
-	client, err = configureLLM(&types.Options{EnableLLM: true, LLMProvider: "ollama", LLMModel: "llama3.2"})
-	require.NoError(t, err)
-	_, isJudge := client.(llmclient.Judge)
-	require.False(t, isJudge, "chat providers keep the Complete path")
-}
-
-func TestJevExtractorDoesNotSpendCallBudget(t *testing.T) {
-	t.Setenv("LLM_API_KEY", "key")
-	// ProxyFromEnvironment caches the first request in the process. Match the
-	// proxy the interactsh client test expects, and keep the local server direct.
-	for _, key := range []string{"HTTP_PROXY", "http_proxy", "ALL_PROXY", "all_proxy", "https_proxy", "no_proxy"} {
-		t.Setenv(key, "")
-	}
-	t.Setenv("HTTPS_PROXY", "http://127.0.0.1:9")
-	t.Setenv("NO_PROXY", "127.0.0.1,localhost")
-
-	var calls atomic.Int32
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		calls.Add(1)
-		_, _ = w.Write([]byte(`{"model":"jev-1.14.0","answers":{"q":{"type":"noul","noul":0.9}}}`))
-	}))
-	t.Cleanup(server.Close)
-
-	client, err := configureLLM(&types.Options{
-		EnableLLM:   true,
-		LLMProvider: "jev",
-		LLMBaseURL:  server.URL + "/v1",
-		LLMModel:    "jev-latest",
-		LLMMaxCalls: 1,
-	})
-	require.NoError(t, err)
-
-	_, err = client.Complete(context.Background(), "extract the title", true)
-	require.ErrorContains(t, err, "cannot run extractors")
-	_, err = client.Complete(context.Background(), "extract another", true)
-	require.Error(t, err)
-	require.Zero(t, calls.Load())
-
-	judge := client.(llmclient.Judge)
-	verdict, err := judge.Judge(context.Background(), "login page?", nil, []string{"<form>"})
-	require.NoError(t, err)
-	require.Equal(t, "yes", verdict.Label)
-	require.EqualValues(t, 1, calls.Load())
-}
@@ -228,14 +228,25 @@ func ValidateOptions(options *types.Options) error {
 		}
 	}

-	// An empty -iv leaves one unpinned target so the dialer can fall back
-	// between address families. -sa resolves and scans every selected address.
-	// Explicit -iv 4, -iv 6 and -iv 4,6 retain their usual selection semantics.
+	// verify that a valid ip version type was selected (4, 6)
+	if len(options.IPVersion) == 0 {
+		// add ipv4 as default
+		options.IPVersion = append(options.IPVersion, "4")
+	}
+	var useIPV4, useIPV6 bool
 	for _, ipv := range options.IPVersion {
-		if ipv != "4" && ipv != "6" {
+		switch ipv {
+		case "4":
+			useIPV4 = true
+		case "6":
+			useIPV6 = true
+		default:
 			return fmt.Errorf("unsupported ip version: %s", ipv)
 		}
 	}
+	if !useIPV4 && !useIPV6 {
+		return errors.New("ipv4 and/or ipv6 must be selected")
+	}
 	return nil
 }

@@ -90,15 +90,3 @@ func TestReadsTargetsFromStdin(t *testing.T) {
 		})
 	}
 }
-
-// The default must remain empty so the provider can distinguish automatic
-// IPv6 preference from explicit user-supplied -iv selections.
-func TestValidateOptionsIPVersionPreference(t *testing.T) {
-	automatic := &types.Options{}
-	require.NoError(t, ValidateOptions(automatic))
-	require.Empty(t, automatic.IPVersion)
-	for _, versions := range []goflags.StringSlice{{"4"}, {"6"}, {"4", "6"}} {
-		require.NoError(t, ValidateOptions(&types.Options{IPVersion: versions}))
-	}
-	require.ErrorContains(t, ValidateOptions(&types.Options{IPVersion: goflags.StringSlice{"7"}}), "unsupported ip version")
-}
@@ -67,7 +67,6 @@ import (
 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/utils/excludematchers"
 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/headless/engine"
 	httpProtocol "github.com/projectdiscovery/nuclei/v3/pkg/protocols/http"
-	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/http/catchall"
 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/http/httpclientpool"
 	"github.com/projectdiscovery/nuclei/v3/pkg/reporting"
 	"github.com/projectdiscovery/nuclei/v3/pkg/templates"
@@ -735,9 +734,6 @@ func (r *Runner) RunEnumeration() error {
 	if r.options.HostBackoff {
 		executorOpts.HostBackoff = hostbackoff.New(hostbackoff.Config{Max: r.options.HostBackoffMax})
 	}
-	if r.options.AutoCalibrate {
-		executorOpts.CatchAll = catchall.New(0)
-	}

 	executorEngine := core.New(r.options)
 	executorEngine.SetExecuterOptions(executorOpts)
@@ -1076,7 +1072,6 @@ func (r *Runner) displayExecutionInfo(store *loader.Store) {
 	stats.DisplayAsWarning(httpProtocol.SetThreadToCountZero)
 	stats.ForceDisplayWarning(templates.SkippedUnverifiedTemplateStats)
 	stats.ForceDisplayWarning(templates.SkippedRequestSignatureTemplateStats)
-	stats.ForceDisplayWarning(templates.SkippedWorkflowStepStats)

 	cfg := config.DefaultConfig

@@ -6,17 +6,11 @@ import (
 	"net/http/httptest"
 	"os"
 	"path/filepath"
-	"strconv"
-	"sync/atomic"
 	"testing"
 	"time"

-	"github.com/miekg/dns"
-	"github.com/projectdiscovery/gologger"
 	"github.com/stretchr/testify/require"

-	"github.com/projectdiscovery/nuclei/v3/pkg/input"
-	"github.com/projectdiscovery/nuclei/v3/pkg/input/provider"
 	"github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
 	"github.com/projectdiscovery/nuclei/v3/pkg/types"
@@ -203,63 +197,3 @@ func TestNewInteractshHTTPClient(t *testing.T) {
 	require.NotNil(t, proxyURL)
 	require.Equal(t, "http://127.0.0.1:9", proxyURL.String())
 }
-
-func TestInitializeTemplatesHTTPInputUsesResolvers(t *testing.T) {
-	for _, key := range []string{"HTTP_PROXY", "http_proxy", "HTTPS_PROXY", "https_proxy"} {
-		t.Setenv(key, "")
-	}
-
-	listener, err := net.ListenPacket("udp", "127.0.0.1:0")
-	require.NoError(t, err)
-	queries := new(atomic.Int32)
-	server := &dns.Server{PacketConn: listener, Handler: dns.HandlerFunc(func(writer dns.ResponseWriter, request *dns.Msg) {
-		queries.Add(1)
-		response := new(dns.Msg).SetReply(request)
-		for _, question := range request.Question {
-			if question.Qtype == dns.TypeA {
-				response.Answer = append(response.Answer, &dns.A{Hdr: dns.RR_Header{Name: question.Name, Rrtype: dns.TypeA, Class: dns.ClassINET}, A: net.ParseIP("127.0.0.1")})
-			}
-		}
-		_ = writer.WriteMsg(response)
-	})}
-	started := make(chan struct{})
-	server.NotifyStartedFunc = func() { close(started) }
-	done := make(chan error, 1)
-	go func() { done <- server.ActivateAndServe() }()
-	<-started
-	t.Cleanup(func() { require.NoError(t, server.Shutdown()); require.NoError(t, <-done) })
-
-	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
-		w.WriteHeader(http.StatusOK)
-	}))
-	t.Cleanup(srv.Close)
-
-	resolverFile := filepath.Join(t.TempDir(), "resolv.conf")
-	require.NoError(t, os.WriteFile(resolverFile, nil, 0o600))
-	t.Setenv("RESOLVERS_PATH", resolverFile)
-
-	options := &types.Options{
-		ExecutionId:           t.Name(),
-		Timeout:               5,
-		BulkSize:              1,
-		InternalResolversList: []string{listener.LocalAddr().String()},
-	}
-	require.NoError(t, protocolstate.Init(options))
-	t.Cleanup(func() { protocolstate.Close(options.ExecutionId) })
-
-	target := "probe.nuclei.test:" + strconv.Itoa(srv.Listener.Addr().(*net.TCPAddr).Port)
-	r := &Runner{
-		options:       options,
-		inputProvider: provider.NewSimpleInputProviderWithUrls(options.ExecutionId, target),
-		Logger:        &gologger.Logger{},
-	}
-
-	hm, err := r.initializeTemplatesHTTPInput()
-	require.NoError(t, err)
-	t.Cleanup(func() { _ = hm.Close() })
-
-	probed, ok := hm.Get(input.ProbeKey(target, ""))
-	require.True(t, ok, "the probe should resolve the target through the -r resolver")
-	require.Equal(t, "http://"+target, string(probed))
-	require.Positive(t, queries.Load())
-}
@@ -10,11 +10,9 @@ import (
 	"github.com/logrusorgru/aurora/v4"
 	"github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
 	"github.com/projectdiscovery/nuclei/v3/pkg/catalog/loader"
-	"github.com/projectdiscovery/nuclei/v3/pkg/model"

 	"github.com/projectdiscovery/nuclei/v3/pkg/templates"
 	"github.com/projectdiscovery/nuclei/v3/pkg/types"
-	"github.com/projectdiscovery/nuclei/v3/pkg/utils"
 	"github.com/projectdiscovery/nuclei/v3/pkg/utils/json"
 )

@@ -40,17 +38,12 @@ func (r *Runner) verboseTemplate(tpl *templates.Template) {
 		tpl.Info.SeverityHolder.Severity))
 }

-// listedTemplate names its fields like a result event, so a -jsonl listing
-// joins with scan results on the same keys.
-type listedTemplate struct {
-	Template     string     `json:"template,omitempty"`
-	TemplateID   string     `json:"template-id"`
-	TemplatePath string     `json:"template-path"`
-	Info         model.Info `json:"info"`
-}
-
 func (r *Runner) listAvailableStoreTemplates(store *loader.Store) {
-	r.listingHeader("templates")
+	r.Logger.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 {
@@ -58,10 +51,6 @@ func (r *Runner) listAvailableStoreTemplates(store *loader.Store) {
 	})

 	for _, tpl := range templates {
-		if r.options.JSONL && !r.options.TemplateDisplay {
-			r.listTemplateJSON(tpl)
-			continue
-		}
 		if hasExtraFlags(r.options) {
 			if r.options.TemplateDisplay {
 				colorize := !r.options.NoColor
@@ -89,36 +78,12 @@ func (r *Runner) listAvailableStoreTemplates(store *loader.Store) {
 	}
 }

-func (r *Runner) listTemplateJSON(tpl *templates.Template) {
-	path, _ := utils.TemplatePathURL(tpl.Path, tpl.ID, "")
-	marshalled, err := json.Marshal(listedTemplate{
-		Template:     path,
-		TemplateID:   tpl.ID,
-		TemplatePath: tpl.Path,
-		Info:         tpl.Info,
-	})
-	if err != nil {
-		r.Logger.Error().Msgf("Could not marshal the template %s: %s", tpl.Path, err)
-		return
-	}
-	r.Logger.Print().Msgf("%s", marshalled)
-}
-
-// listingHeader is skipped for -jsonl, where every line must parse as JSON.
-func (r *Runner) listingHeader(what string) {
-	if r.options.JSONL {
-		return
-	}
+func (r *Runner) listAvailableTags(tagsMap map[string]int) {
 	r.Logger.Print().Msgf(
-		"\nListing available %v nuclei %s for %v",
+		"\nListing available %v nuclei tags for %v",
 		config.DefaultConfig.TemplateVersion,
-		what,
 		config.DefaultConfig.TemplatesDirectory,
 	)
-}
-
-func (r *Runner) listAvailableTags(tagsMap map[string]int) {
-	r.listingHeader("tags")

 	type kv struct {
 		Key   string `json:"tag"`
@@ -1,76 +0,0 @@
-package runner
-
-import (
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"github.com/projectdiscovery/gologger"
-	"github.com/projectdiscovery/gologger/formatter"
-	"github.com/projectdiscovery/gologger/levels"
-	"github.com/projectdiscovery/nuclei/v3/internal/tests/testutils"
-	"github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
-	"github.com/projectdiscovery/nuclei/v3/pkg/catalog/disk"
-	"github.com/projectdiscovery/nuclei/v3/pkg/catalog/loader"
-	"github.com/projectdiscovery/nuclei/v3/pkg/templates"
-	"github.com/projectdiscovery/nuclei/v3/pkg/utils/json"
-	"github.com/stretchr/testify/require"
-)
-
-const listedTemplateYAML = `id: listed-template
-info:
-  name: Listed Template
-  author: pdteam
-  severity: info
-  tags: listing
-http:
-  - method: GET
-    path:
-      - "{{BaseURL}}"
-`
-
-func TestTemplateListWritesJSONLines(t *testing.T) {
-	root := t.TempDir()
-	cfg := config.DefaultConfig
-	oldRoot := cfg.TemplatesDirectory
-	t.Cleanup(func() { cfg.SetTemplatesDir(oldRoot) })
-	cfg.SetTemplatesDir(root)
-
-	path := filepath.Join(root, "http", "listed-template.yaml")
-	require.NoError(t, os.MkdirAll(filepath.Dir(path), 0o755))
-	require.NoError(t, os.WriteFile(path, []byte(listedTemplateYAML), 0o600))
-
-	writer := &ignoreFileLogWriter{}
-	logger := &gologger.Logger{}
-	logger.SetFormatter(formatter.NewCLI(true))
-	logger.SetWriter(writer)
-	logger.SetMaxLevel(levels.LevelInfo)
-
-	options := testutils.DefaultOptions.Copy()
-	options.ExecutionId = t.Name()
-	options.Logger = logger
-	options.Templates = []string{path}
-	options.TemplateList = true
-	options.JSONL = true
-	testutils.Init(options)
-	t.Cleanup(func() { testutils.Cleanup(options) })
-
-	executerOpts := testutils.NewMockExecuterOptions(options, nil)
-	executerOpts.Parser = templates.NewParser()
-	store, err := loader.New(loader.NewConfig(options, disk.NewCatalog(root), executerOpts))
-	require.NoError(t, err)
-	require.NoError(t, store.LoadTemplatesOnlyMetadata())
-
-	require.Len(t, store.Templates(), 1)
-
-	r := &Runner{options: options, Logger: logger}
-	r.listAvailableStoreTemplates(store)
-
-	require.Len(t, writer.records, 1, "JSONL output carries no banner line")
-	var listed map[string]any
-	require.NoError(t, json.Unmarshal([]byte(strings.TrimSpace(writer.records[0].message)), &listed))
-	require.Equal(t, "listed-template", listed["template-id"])
-	require.Equal(t, filepath.Join("http", "listed-template.yaml"), listed["template"])
-	require.Equal(t, "Listed Template", listed["info"].(map[string]any)["name"])
-}
@@ -33,7 +33,6 @@ import (
 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/interactsh"
 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/utils/excludematchers"
 	browserEngine "github.com/projectdiscovery/nuclei/v3/pkg/protocols/headless/engine"
-	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/http/catchall"
 	"github.com/projectdiscovery/nuclei/v3/pkg/reporting"
 	"github.com/projectdiscovery/nuclei/v3/pkg/templates"
 	"github.com/projectdiscovery/nuclei/v3/pkg/types"
@@ -111,9 +110,6 @@ func newNucleiExecutor(opts *NucleiExecutorOptions) (*nucleiExecutor, error) {
 	if opts.Options.HostBackoff {
 		executorOpts.HostBackoff = hostbackoff.New(hostbackoff.Config{Max: opts.Options.HostBackoffMax})
 	}
-	if opts.Options.AutoCalibrate {
-		executorOpts.CatchAll = catchall.New(0)
-	}

 	executorEngine := core.New(opts.Options)
 	executorEngine.SetExecuterOptions(executorOpts)
@@ -102,7 +102,6 @@ var httpTestcases = []integrationCase{
 	{Path: "protocols/http/raw-unsafe-path-single-slash.yaml", TestCase: &httpRawUnsafePathSingleSlash{}},
 	{Path: "protocols/http/disable-http-cache.yaml", TestCase: &httpDisableCache{}},
 	{Path: "protocols/http/http-cache.yaml", TestCase: &httpCache{}},
-	{Path: "protocols/http/get.yaml", TestCase: &httpExcludeHostsFileComments{}},
 }

 type httpMultiVarSharing struct{}
@@ -1984,59 +1983,3 @@ func (h *httpDisableCache) Execute(filePath string) error {

 	return nil
 }
-
-// ensure that comments in an -exclude-hosts file are ignored
-type httpExcludeHostsFileComments struct{}
-
-// Execute executes a test case and returns an error if occurred
-func (h *httpExcludeHostsFileComments) 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")
-	})
-	ts := httptest.NewServer(router)
-	defer ts.Close()
-
-	excludeHosts := func(content string) ([]string, error) {
-		file, err := os.CreateTemp("", "exclude-hosts-*.txt")
-		if err != nil {
-			return nil, err
-		}
-		defer func() { _ = os.Remove(file.Name()) }()
-		_, err = file.WriteString(content)
-		_ = file.Close()
-		if err != nil {
-			return nil, err
-		}
-
-		return testutils.RunNucleiTemplateAndGetResults(filePath, ts.URL, debug, "-eh", file.Name())
-	}
-
-	// a comment line is not a host, even when it reads as an invalid regex
-	results, err := excludeHosts("# hosts out of scope (see ticket\n203.0.113.10\n")
-	if err != nil {
-		return fmt.Errorf("comment line: %w", err)
-	}
-	if err := expectResultsCount(results, 1); err != nil {
-		return fmt.Errorf("comment line: %w", err)
-	}
-
-	// a trailing comment does not stop the host from being excluded
-	results, err = excludeHosts("127.0.0.1 # test server\n")
-	if err != nil {
-		return fmt.Errorf("trailing comment: %w", err)
-	}
-	if err := expectResultsCount(results, 0); err != nil {
-		return fmt.Errorf("trailing comment: %w", err)
-	}
-
-	// comma separated hosts are still split when passed on the command line
-	results, err = testutils.RunNucleiTemplateAndGetResults(filePath, ts.URL, debug, "-eh", "203.0.113.10, 127.0.0.1")
-	if err != nil {
-		return fmt.Errorf("comma separated: %w", err)
-	}
-	if err := expectResultsCount(results, 0); err != nil {
-		return fmt.Errorf("comma separated: %w", err)
-	}
-	return nil
-}
@@ -358,9 +358,6 @@ func (e *NucleiEngine) init(ctx context.Context) error {

 	httpxOptions := httpx.DefaultOptions
 	httpxOptions.Timeout = 5 * time.Second
-	if len(e.opts.InternalResolversList) > 0 {
-		httpxOptions.Resolvers = e.opts.InternalResolversList
-	}
 	if client, err := httpx.New(&httpxOptions); err != nil {
 		return err
 	} else {
@@ -631,10 +631,10 @@ func (store *Store) noteMissingCapabilities(templatePath string, missingCaps []t
 // erroring out on discovering any faulty templates.
 func (store *Store) ValidateTemplates() error {
 	templatePaths, errs := store.config.Catalog.GetTemplatesPath(store.finalTemplates)
-	notFound := store.logErroredTemplates(errs)
+	store.logErroredTemplates(errs)

 	workflowPaths, errs := store.config.Catalog.GetTemplatesPath(store.finalWorkflows)
-	notFound += store.logErroredTemplates(errs)
+	store.logErroredTemplates(errs)

 	templatePathsMap := make(map[string]struct{}, len(templatePaths))
 	for _, path := range templatePaths {
@@ -646,8 +646,7 @@ func (store *Store) ValidateTemplates() error {
 		workflowPathsMap[path] = struct{}{}
 	}

-	// a path that can't be resolved is not validated, so it can't count as valid
-	if store.areTemplatesValid(templatePathsMap) && store.areWorkflowsValid(workflowPathsMap) && notFound == 0 {
+	if store.areTemplatesValid(templatePathsMap) && store.areWorkflowsValid(workflowPathsMap) {
 		return nil
 	}

@@ -1057,15 +1056,10 @@ func workflowContainsProtocol(workflow []*workflows.WorkflowTemplate) bool {
 	return false
 }

-// logErroredTemplates logs the templates that could not be found and returns
-// how many of them were not handled by the NotFoundCallback.
-func (s *Store) logErroredTemplates(erred map[string]error) int {
-	notFound := 0
+func (s *Store) logErroredTemplates(erred map[string]error) {
 	for template, err := range erred {
 		if s.NotFoundCallback == nil || !s.NotFoundCallback(template) {
 			s.logger.Error().Msgf("Could not find template '%s': %s", template, err)
-			notFound++
 		}
 	}
-	return notFound
 }
@@ -176,8 +176,25 @@ func TestLoadTemplatesOnlyMetadataLogsCachedTemplateParseErrors(t *testing.T) {
 	require.Contains(t, output.String(), "Could not load template")
 }

-func newValidateStore(t *testing.T, executionID, templatePath string) (*Store, *bytes.Buffer) {
-	t.Helper()
+func TestValidateTemplatesRejectsRuntimeCompilationError(t *testing.T) {
+	templatePath := filepath.Join(t.TempDir(), "invalid-regex-group.yaml")
+	require.NoError(t, os.WriteFile(templatePath, []byte(`id: invalid-regex-group
+
+info:
+  name: Invalid Regex Group
+  author: pdteam
+  severity: info
+
+http:
+  - method: GET
+    path:
+      - "{{BaseURL}}"
+    extractors:
+      - type: regex
+        group: -1
+        regex:
+          - "(a)(b)"
+`), 0o600))

 	options := testutils.DefaultOptions.Copy()
 	var output bytes.Buffer
@@ -186,7 +203,7 @@ func newValidateStore(t *testing.T, executionID, templatePath string) (*Store, *
 	logger.SetWriter(&utils.CaptureWriter{Buffer: &output})
 	logger.SetMaxLevel(levels.LevelDebug)
 	options.Logger = logger
-	options.ExecutionId = executionID
+	options.ExecutionId = "loader-invalid-regex-group"
 	options.Templates = []string{templatePath}
 	options.Validate = true
 	options.TemplateLoadingConcurrency = 1
@@ -209,50 +226,10 @@ func newValidateStore(t *testing.T, executionID, templatePath string) (*Store, *

 	store, err := New(NewConfig(options, catalog, executerOpts))
 	require.NoError(t, err)
-	return store, &output
-}
-
-func TestValidateTemplatesRejectsRuntimeCompilationError(t *testing.T) {
-	templatePath := filepath.Join(t.TempDir(), "invalid-regex-group.yaml")
-	require.NoError(t, os.WriteFile(templatePath, []byte(`id: invalid-regex-group
-
-info:
-  name: Invalid Regex Group
-  author: pdteam
-  severity: info
-
-http:
-  - method: GET
-    path:
-      - "{{BaseURL}}"
-    extractors:
-      - type: regex
-        group: -1
-        regex:
-          - "(a)(b)"
-`), 0o600))
-
-	store, output := newValidateStore(t, "loader-invalid-regex-group", templatePath)
 	require.Error(t, store.ValidateTemplates())
 	require.Contains(t, output.String(), "regex extractor group must be >= 0")
 }

-func TestValidateTemplatesRejectsMissingTemplatePath(t *testing.T) {
-	templatePath := filepath.Join(t.TempDir(), "no-such-templates")
-
-	store, output := newValidateStore(t, "loader-missing-template-path", templatePath)
-	require.Error(t, store.ValidateTemplates())
-	require.Contains(t, output.String(), "Could not find template")
-}
-
-func TestValidateTemplatesAcceptsMissingPathHandledByCallback(t *testing.T) {
-	templatePath := filepath.Join(t.TempDir(), "no-such-templates")
-
-	store, _ := newValidateStore(t, "loader-missing-path-callback", templatePath)
-	store.NotFoundCallback = func(string) bool { return true }
-	require.NoError(t, store.ValidateTemplates())
-}
-
 func TestRemoteTemplates(t *testing.T) {
 	catalog := disk.NewCatalog("")

@@ -5,7 +5,6 @@ Formats implements support for passing a number of request source as input provi
 Currently the following formats are implemented - 

 - Burp Suite XML Request/Response file
- HAR (HTTP Archive) file exported by browsers and proxies
 - Proxify JSONL output file
 - OpenAPI Specification file
 - Postman Collection file
@@ -1,137 +0,0 @@
-package har
-
-import (
-	"encoding/base64"
-	"io"
-	"net/http"
-	"strconv"
-	"strings"
-
-	"github.com/pkg/errors"
-	"github.com/projectdiscovery/gologger"
-	"github.com/projectdiscovery/nuclei/v3/pkg/input/formats"
-	"github.com/projectdiscovery/nuclei/v3/pkg/input/types"
-	"github.com/projectdiscovery/nuclei/v3/pkg/utils/json"
-)
-
-// HARFormat is an HTTP Archive (HAR 1.2) parser, the format browsers and
-// proxies export captured traffic in.
-type HARFormat struct {
-	opts formats.InputFormatOptions
-}
-
-// New creates a new HAR parser
-func New() *HARFormat {
-	return &HARFormat{}
-}
-
-var _ formats.Format = &HARFormat{}
-
-type archive struct {
-	Log struct {
-		Entries []entry `json:"entries"`
-	} `json:"log"`
-}
-
-type entry struct {
-	Request struct {
-		Method   string   `json:"method"`
-		URL      string   `json:"url"`
-		Headers  []header `json:"headers"`
-		PostData *struct {
-			Text string `json:"text"`
-		} `json:"postData"`
-	} `json:"request"`
-	Response struct {
-		Status     int      `json:"status"`
-		StatusText string   `json:"statusText"`
-		Headers    []header `json:"headers"`
-		Content    struct {
-			Text     string `json:"text"`
-			Encoding string `json:"encoding"`
-		} `json:"content"`
-	} `json:"response"`
-}
-
-type header struct {
-	Name  string `json:"name"`
-	Value string `json:"value"`
-}
-
-// Name returns the name of the format
-func (h *HARFormat) Name() string {
-	return "har"
-}
-
-func (h *HARFormat) SetOptions(options formats.InputFormatOptions) {
-	h.opts = options
-}
-
-// Parse parses the input and calls the provided callback
-// function for each RawRequest it discovers.
-func (h *HARFormat) Parse(input io.Reader, resultsCb formats.ParseReqRespCallback, filePath string) error {
-	var har archive
-	if err := json.NewDecoder(input).Decode(&har); err != nil {
-		return errors.Wrap(err, "could not decode har file")
-	}
-
-	for _, e := range har.Log.Entries {
-		// Browsers also log data:, blob: and extension URLs, which have no
-		// host to send a request to.
-		if !strings.HasPrefix(e.Request.URL, "http://") && !strings.HasPrefix(e.Request.URL, "https://") {
-			continue
-		}
-		rawRequest, err := types.ParseRawRequestWithURL(rawRequestOf(e), e.Request.URL)
-		if err != nil {
-			gologger.Warning().Msgf("har: Could not parse request %s: %s\n", e.Request.URL, err)
-			continue
-		}
-		// Status 0 is a request that was blocked or never answered.
-		if e.Response.Status != 0 {
-			rawRequest.Response = &types.HttpResponse{Raw: rawResponseOf(e)}
-		}
-		resultsCb(rawRequest)
-	}
-	return nil
-}
-
-// rawRequestOf rebuilds the request as HTTP/1.1 with an absolute target, which
-// carries the authority that HTTP/2 captures only keep in pseudo-headers.
-func rawRequestOf(e entry) string {
-	var b strings.Builder
-	b.WriteString(e.Request.Method + " " + e.Request.URL + " HTTP/1.1\r\n")
-	writeHeaders(&b, e.Request.Headers)
-	if e.Request.PostData != nil {
-		b.WriteString(e.Request.PostData.Text)
-	}
-	return b.String()
-}
-
-func rawResponseOf(e entry) string {
-	statusText := e.Response.StatusText
-	if statusText == "" {
-		statusText = http.StatusText(e.Response.Status)
-	}
-	var b strings.Builder
-	b.WriteString("HTTP/1.1 " + strconv.Itoa(e.Response.Status) + " " + statusText + "\r\n")
-	writeHeaders(&b, e.Response.Headers)
-	body := e.Response.Content.Text
-	if e.Response.Content.Encoding == "base64" {
-		if decoded, err := base64.StdEncoding.DecodeString(body); err == nil {
-			body = string(decoded)
-		}
-	}
-	b.WriteString(body)
-	return b.String()
-}
-
-func writeHeaders(b *strings.Builder, headers []header) {
-	for _, h := range headers {
-		// HTTP/2 pseudo-headers (:authority, :path, ...) are not headers.
-		if strings.HasPrefix(h.Name, ":") {
-			continue
-		}
-		b.WriteString(h.Name + ": " + h.Value + "\r\n")
-	}
-	b.WriteString("\r\n")
-}
@@ -1,71 +0,0 @@
-package har
-
-import (
-	"os"
-	"strings"
-	"testing"
-
-	"github.com/projectdiscovery/nuclei/v3/pkg/input/types"
-	"github.com/stretchr/testify/require"
-)
-
-const chromeHAR = "../testdata/chrome.har"
-
-func parse(t *testing.T, input string) []*types.RequestResponse {
-	t.Helper()
-	file, err := os.Open(input)
-	require.NoError(t, err)
-	defer func() { _ = file.Close() }()
-
-	var got []*types.RequestResponse
-	require.NoError(t, New().Parse(file, func(rr *types.RequestResponse) bool {
-		got = append(got, rr)
-		return false
-	}, input))
-	return got
-}
-
-func TestHARParse(t *testing.T) {
-	got := parse(t, chromeHAR)
-
-	urls := make([]string, 0, len(got))
-	for _, rr := range got {
-		urls = append(urls, rr.URL.String())
-	}
-	require.Equal(t, []string{
-		"https://ginandjuice.shop/catalog?category=Juice",
-		"https://ginandjuice.shop/login",
-		"https://ginandjuice.shop/blocked.js",
-	}, urls, "non-http entries such as data: URLs are skipped")
-}
-
-func TestHARParseHTTP2Request(t *testing.T) {
-	rr := parse(t, chromeHAR)[0]
-
-	require.Equal(t, "GET", rr.Request.Method)
-	cookie, _ := rr.Request.Headers.Get("cookie")
-	require.Equal(t, "session=abc123", cookie)
-	for _, name := range rr.Request.Headers.GetKeys() {
-		require.False(t, strings.HasPrefix(name, ":"), "pseudo-header %s is not a real header", name)
-	}
-
-	req, err := rr.BuildRequest()
-	require.NoError(t, err)
-	require.Equal(t, "ginandjuice.shop", req.Host)
-}
-
-func TestHARParseBodyAndResponse(t *testing.T) {
-	got := parse(t, chromeHAR)
-
-	login := got[1]
-	require.Equal(t, "POST", login.Request.Method)
-	require.Equal(t, "username=carlos&password=hunter2", login.Request.Body)
-	require.NotNil(t, login.Response)
-	require.Contains(t, login.Response.Raw, "302 Found")
-	require.Contains(t, login.Response.Raw, "Location: /my-account")
-
-	require.NotNil(t, got[0].Response)
-	require.Contains(t, got[0].Response.Raw, "<h1>Juice</h1>", "base64 content is decoded")
-
-	require.Nil(t, got[2].Response, "a request that never got an answer has no response")
-}
@@ -1,20 +0,0 @@
-//go:build gofuzz
-// +build gofuzz
-
-package openapi
-
-// Fuzz exercises OpenAPI 3.0 schema parsing and request generation. The input
-// bytes are treated as a raw schema document (YAML or JSON) and fed through the
-// format's Parse, which loads the schema and generates requests from it.
-func Fuzz(data []byte) int {
-	if len(data) == 0 {
-		return 0
-	}
-	if len(data) > fuzzMaxInputSize {
-		return -1
-	}
-	if !fuzzOpenAPIParsing(data) {
-		return 0
-	}
-	return 1
-}
@@ -1,32 +0,0 @@
-package openapi
-
-import (
-	"bytes"
-
-	"github.com/projectdiscovery/nuclei/v3/pkg/input/formats"
-	"github.com/projectdiscovery/nuclei/v3/pkg/input/types"
-)
-
-const fuzzMaxInputSize = 64 << 10
-
-// fuzzOpenAPIParsing feeds data to the OpenAPI format parser as a raw schema
-// document and drives request generation. It must never panic for any input;
-// it returns true when the schema parsed and at least one request was produced.
-func fuzzOpenAPIParsing(data []byte) bool {
-	if len(data) == 0 || len(data) > fuzzMaxInputSize {
-		return false
-	}
-
-	format := New()
-	format.SetOptions(formats.InputFormatOptions{})
-
-	produced := false
-	cb := func(rr *types.RequestResponse) bool {
-		produced = true
-		return true
-	}
-	if err := format.Parse(bytes.NewReader(data), cb, "fuzz.openapi"); err != nil {
-		return false
-	}
-	return produced
-}
@@ -1,84 +0,0 @@
-package openapi
-
-import (
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"github.com/projectdiscovery/nuclei/v3/pkg/input/types"
-	"github.com/stretchr/testify/require"
-)
-
-func TestFuzzOpenAPIParsingSeedCorpus(t *testing.T) {
-	entries, err := os.ReadDir("testdata/gofuzz-corpus")
-	require.NoError(t, err)
-	require.NotEmpty(t, entries)
-
-	for _, entry := range entries {
-		if entry.IsDir() {
-			continue
-		}
-
-		data, err := os.ReadFile(filepath.Join("testdata/gofuzz-corpus", entry.Name()))
-		require.NoError(t, err)
-		require.Truef(t, fuzzOpenAPIParsing(data), "seed %s should produce at least one request", entry.Name())
-	}
-}
-
-func TestFuzzOpenAPIParsingRejectsOversizeInput(t *testing.T) {
-	require.False(t, fuzzOpenAPIParsing(make([]byte, fuzzMaxInputSize+1)))
-}
-
-// Null entries decode to nil pointers and used to panic during request
-// generation. The remaining valid entries must still produce requests.
-func TestFuzzOpenAPIParsingNullEntries(t *testing.T) {
-	specs := map[string]string{
-		"null server": `
-openapi: 3.0.0
-info: {title: t, version: "1"}
-servers:
-  -
-  - {url: "http://example.com"}
-paths:
-  /users:
-    get:
-      responses: {"200": {description: ok}}
-`,
-		"null media type": `
-openapi: 3.0.0
-info: {title: t, version: "1"}
-servers: [{url: "http://example.com"}]
-paths:
-  /users:
-    post:
-      requestBody:
-        content:
-          application/xml:
-          application/json:
-            schema: {type: object, properties: {name: {type: string}}}
-      responses: {"200": {description: ok}}
-`,
-	}
-
-	for name, spec := range specs {
-		t.Run(name, func(t *testing.T) {
-			require.True(t, fuzzOpenAPIParsing([]byte(spec)))
-		})
-	}
-}
-
-func TestGenerateRequestsOnlyNullServers(t *testing.T) {
-	spec := `
-openapi: 3.0.0
-info: {title: t, version: "1"}
-servers:
-  -
-paths:
-  /users:
-    get:
-      responses: {"200": {description: ok}}
-`
-	err := New().Parse(strings.NewReader(spec), func(*types.RequestResponse) bool { return false }, "spec.yaml")
-	require.ErrorContains(t, err, "no servers found in openapi schema")
-}
@@ -9,7 +9,6 @@ import (
 	"net/http/httputil"
 	"net/url"
 	"os"
-	"slices"
 	"strings"

 	"github.com/clbanning/mxj/v2"
@@ -34,9 +33,7 @@ const (

 // GenerateRequestsFromSchema generates http requests from an OpenAPI 3.0 document object
 func GenerateRequestsFromSchema(schema *openapi3.T, opts formats.InputFormatOptions, callback formats.ParseReqRespCallback) error {
-	// Null entries in `servers:` are skipped below, so a list of only null
-	// entries has no usable server, the same as an empty list.
-	if !slices.ContainsFunc(schema.Servers, func(s *openapi3.Server) bool { return s != nil }) {
+	if len(schema.Servers) == 0 {
 		return errors.New("no servers found in openapi schema")
 	}
 	globalParams, globalSecurityErr := selectSecurityParameters(schema, &schema.Security, opts.Variables)
@@ -52,11 +49,6 @@ func GenerateRequestsFromSchema(schema *openapi3.T, opts formats.InputFormatOpti
 	}

 	for _, serverURL := range schema.Servers {
-		// A null entry in the `servers:` list decodes to a nil *Server, so skip
-		// it rather than dereferencing it.
-		if serverURL == nil {
-			continue
-		}
 		pathURL := serverURL.URL
 		// Split the server URL into baseURL and serverPath
 		u, err := url.Parse(pathURL)
@@ -276,11 +268,6 @@ func generateRequestsFromOp(opts *generateReqOptions) error {

 	if opts.op.RequestBody != nil {
 		for content, value := range opts.op.RequestBody.Value.Content {
-			// A null media-type entry (e.g. `content: {application/json: }`)
-			// decodes to a nil *MediaType, so skip it before dereferencing.
-			if value == nil {
-				continue
-			}
 			cloned := req.Clone(req.Context())

 			var val interface{}
@@ -1 +0,0 @@
-{"openapi":"3.0.0","info":{"title":"t","version":"1"},"servers":[{"url":"http://example.com"}],"paths":{"/a":{"post":{"requestBody":{"content":{"application/json":{"schema":{"type":"object","properties":{"k":{"type":"string"}}}}}},"responses":{"200":{"description":"ok"}}}}}}
@@ -1,7 +0,0 @@
-openapi: 3.0.0
-info: {title: t, version: "1"}
-servers: [{url: "http://example.com"}]
-paths:
-  /users:
-    get:
-      responses: {"200": {description: ok}}
@@ -1,12 +0,0 @@
-openapi: 3.0.0
-info: {title: t, version: "1"}
-servers: [{url: "http://example.com"}]
-paths:
-  /users:
-    post:
-      requestBody:
-        content:
-          application/xml:
-          application/json:
-            schema: {type: object, properties: {name: {type: string}}}
-      responses: {"200": {description: ok}}
@@ -1,9 +0,0 @@
-openapi: 3.0.0
-info: {title: t, version: "1"}
-servers:
-  -
-  - {url: "http://example.com"}
-paths:
-  /users:
-    get:
-      responses: {"200": {description: ok}}
@@ -3,9 +3,7 @@ package swagger
 import (
 	"fmt"
 	"io"
-	"maps"
 	"path"
-	"slices"

 	"github.com/getkin/kin-openapi/openapi2"
 	"github.com/getkin/kin-openapi/openapi2conv"
@@ -57,7 +55,6 @@ func (j *SwaggerFormat) Parse(input io.Reader, resultsCb formats.ParseReqRespCal
 	if err != nil {
 		return errors.Wrap(err, "could not decode openapi 2.0 schema")
 	}
-	dropNullEntries(schemav2)
 	schema, err := openapi2conv.ToV3(schemav2)
 	if err != nil {
 		return errors.Wrap(err, "could not convert openapi 2.0 schema to 3.0")
@@ -70,32 +67,6 @@ func (j *SwaggerFormat) Parse(input io.Reader, resultsCb formats.ParseReqRespCal
 	return openapi.GenerateRequestsFromSchema(schema, j.opts, resultsCb)
 }

-// dropNullEntries removes null entries from the maps and lists of a decoded
-// OpenAPI 2.0 document. A null value such as `paths: {/x: }` or an empty list
-// item under `parameters:` decodes to a nil pointer, which openapi2conv.ToV3
-// dereferences without checking.
-func dropNullEntries(doc *openapi2.T) {
-	maps.DeleteFunc(doc.Paths, func(_ string, v *openapi2.PathItem) bool { return v == nil })
-	maps.DeleteFunc(doc.Parameters, func(_ string, v *openapi2.Parameter) bool { return v == nil })
-	dropNullResponses(doc.Responses)
-	for _, pathItem := range doc.Paths {
-		pathItem.Parameters = slices.DeleteFunc(pathItem.Parameters, func(v *openapi2.Parameter) bool { return v == nil })
-		for _, op := range pathItem.Operations() {
-			op.Parameters = slices.DeleteFunc(op.Parameters, func(v *openapi2.Parameter) bool { return v == nil })
-			dropNullResponses(op.Responses)
-		}
-	}
-}
-
-// dropNullResponses removes null responses, and null headers of the remaining
-// responses, which openapi2conv.ToV3Response also dereferences.
-func dropNullResponses(responses map[string]*openapi2.Response) {
-	maps.DeleteFunc(responses, func(_ string, v *openapi2.Response) bool { return v == nil })
-	for _, response := range responses {
-		maps.DeleteFunc(response.Headers, func(_ string, v *openapi2.Header) bool { return v == nil })
-	}
-}
-
 func decodeYAML(data []byte, target interface{}) error {
 	var value interface{}
 	if err := yaml.Unmarshal(data, &value); err != nil {
@@ -2,7 +2,6 @@ package swagger

 import (
 	"os"
-	"strings"
 	"testing"

 	"github.com/projectdiscovery/nuclei/v3/pkg/input/types"
@@ -40,69 +39,3 @@ func TestSwaggerAPIParser(t *testing.T) {
 	}
 	require.ElementsMatch(t, gotMethodsToURLs, expectedURLs, "could not get swagger urls")
 }
-
-func TestSwaggerParseNullEntries(t *testing.T) {
-	// Each spec has a null map value or list item that decodes to a nil
-	// pointer and used to panic inside openapi2conv.ToV3.
-	specs := map[string]string{
-		"null-path-item": `
-swagger: "2.0"
-info: {title: t, version: "1"}
-host: localhost
-paths:
-  /x:
-`,
-		"null-parameter": `
-swagger: "2.0"
-info: {title: t, version: "1"}
-host: localhost
-paths:
-  /x:
-    get:
-      parameters:
-        -
-      responses: {"200": {description: ok}}
-`,
-		"null-response": `
-swagger: "2.0"
-info: {title: t, version: "1"}
-host: localhost
-paths:
-  /x:
-    get:
-      responses: {"200": }
-`,
-		"null-response-header": `
-swagger: "2.0"
-info: {title: t, version: "1"}
-host: localhost
-responses:
-  Shared:
-    description: ok
-    headers:
-      X-Shared:
-paths:
-  /x:
-    get:
-      responses:
-        "200":
-          description: ok
-          headers:
-            X-Rate-Limit:
-`,
-	}
-
-	for name, spec := range specs {
-		t.Run(name, func(t *testing.T) {
-			var count int
-			err := New().Parse(strings.NewReader(spec), func(request *types.RequestResponse) bool {
-				count++
-				return false
-			}, "spec.yaml")
-			require.NoError(t, err)
-			if name != "null-path-item" {
-				require.Equal(t, 1, count, "the operation should still produce a request")
-			}
-		})
-	}
-}
@@ -1,71 +0,0 @@
-{
-  "log": {
-    "version": "1.2",
-    "creator": { "name": "WebInspector", "version": "537.36" },
-    "entries": [
-      {
-        "request": {
-          "method": "GET",
-          "url": "https://ginandjuice.shop/catalog?category=Juice",
-          "httpVersion": "http/2.0",
-          "headers": [
-            { "name": ":authority", "value": "ginandjuice.shop" },
-            { "name": ":method", "value": "GET" },
-            { "name": ":path", "value": "/catalog?category=Juice" },
-            { "name": ":scheme", "value": "https" },
-            { "name": "accept", "value": "text/html" },
-            { "name": "cookie", "value": "session=abc123" }
-          ],
-          "queryString": [{ "name": "category", "value": "Juice" }],
-          "cookies": [],
-          "headersSize": -1,
-          "bodySize": 0
-        },
-        "response": {
-          "status": 200,
-          "statusText": "",
-          "httpVersion": "http/2.0",
-          "headers": [{ "name": "content-type", "value": "text/html; charset=utf-8" }],
-          "content": { "size": 19, "mimeType": "text/html", "text": "PGgxPkp1aWNlPC9oMT4=", "encoding": "base64" }
-        }
-      },
-      {
-        "request": {
-          "method": "POST",
-          "url": "https://ginandjuice.shop/login",
-          "httpVersion": "HTTP/1.1",
-          "headers": [
-            { "name": "Host", "value": "ginandjuice.shop" },
-            { "name": "Content-Type", "value": "application/x-www-form-urlencoded" }
-          ],
-          "postData": { "mimeType": "application/x-www-form-urlencoded", "text": "username=carlos&password=hunter2" }
-        },
-        "response": {
-          "status": 302,
-          "statusText": "Found",
-          "httpVersion": "HTTP/1.1",
-          "headers": [{ "name": "Location", "value": "/my-account" }],
-          "content": { "size": 0, "mimeType": "" }
-        }
-      },
-      {
-        "request": {
-          "method": "GET",
-          "url": "data:image/png;base64,iVBORw0KGgo=",
-          "httpVersion": "",
-          "headers": []
-        },
-        "response": { "status": 200, "statusText": "", "httpVersion": "", "headers": [], "content": { "size": 0 } }
-      },
-      {
-        "request": {
-          "method": "GET",
-          "url": "https://ginandjuice.shop/blocked.js",
-          "httpVersion": "",
-          "headers": []
-        },
-        "response": { "status": 0, "statusText": "", "httpVersion": "", "headers": [], "content": { "size": 0 } }
-      }
-    ]
-  }
-}
@@ -10,7 +10,6 @@ import (
 	"github.com/projectdiscovery/gologger"
 	"github.com/projectdiscovery/nuclei/v3/pkg/input/formats"
 	"github.com/projectdiscovery/nuclei/v3/pkg/input/formats/burp"
-	"github.com/projectdiscovery/nuclei/v3/pkg/input/formats/har"
 	"github.com/projectdiscovery/nuclei/v3/pkg/input/formats/json"
 	"github.com/projectdiscovery/nuclei/v3/pkg/input/formats/openapi"
 	"github.com/projectdiscovery/nuclei/v3/pkg/input/formats/raw"
@@ -143,7 +142,6 @@ func (i *HttpInputProvider) Close() {}
 // Supported Providers
 var providersList = []formats.Format{
 	burp.New(),
-	har.New(),
 	json.New(),
 	yaml.New(),
 	openapi.New(),
@@ -89,9 +89,8 @@ func New(opts *Options) (*ListInputProvider, error) {
 		patterns:      normalize.NewFingerprinter(options.MaxURLsPerPattern),
 		ipOptions: &ipOptions{
 			ScanAllIPs: options.ScanAllIPs,
-			IPV4:       len(options.IPVersion) == 0 || sliceutil.Contains(options.IPVersion, "4"),
-			IPV6:       len(options.IPVersion) == 0 || sliceutil.Contains(options.IPVersion, "6"),
-			Auto:       len(options.IPVersion) == 0,
+			IPV4:       sliceutil.Contains(options.IPVersion, "4"),
+			IPV6:       sliceutil.Contains(options.IPVersion, "6"),
 		},
 		excludedHosts: make(map[string]struct{}),
 		profiles:      targetprofile.NewRegistry(configuration.TemplatesDirectory(options, config.DefaultConfig)),
@@ -169,61 +168,6 @@ func (i *ListInputProvider) TargetProfiles() *targetprofile.Registry {
 	return i.profiles
 }

-// selectedIPs returns address pins for a hostname. An empty pin delegates
-// DNS and connection fallback to fastdialer, which races IPv4 and IPv6.
-// Set and Del share this selection. With -iv omitted and without -sa, one
-// unpinned target is returned. -sa returns every selected address.
-func (i *ListInputProvider) selectedIPs(executionId, hostname string) []string {
-	if i.ipOptions == nil || (!i.ipOptions.ScanAllIPs && (i.ipOptions.Auto || !i.ipOptions.IPV6)) {
-		return []string{""}
-	}
-	dialers := protocolstate.GetDialersWithId(executionId)
-	if dialers == nil {
-		gologger.Warning().Msgf("cannot resolve %s: dialer %s not found", hostname, executionId)
-		return nil
-	}
-	dnsData, err := dialers.Fastdialer.GetDNSData(hostname)
-	if err != nil {
-		gologger.Warning().Msgf("DNS resolution failed for %s: %v", hostname, err)
-		if i.ipOptions.IPV4 {
-			return []string{""}
-		}
-		return nil
-	}
-	if len(dnsData.A) == 0 && len(dnsData.AAAA) == 0 {
-		gologger.Warning().Msgf("DNS resolution returned no IP addresses for %s", hostname)
-		if i.ipOptions.IPV4 {
-			return []string{""}
-		}
-		return nil
-	}
-	if i.ipOptions.ScanAllIPs {
-		var ips []string
-		if i.ipOptions.IPV6 {
-			ips = append(ips, dnsData.AAAA...)
-		}
-		if i.ipOptions.IPV4 {
-			ips = append(ips, dnsData.A...)
-		}
-		if len(ips) == 0 {
-			gologger.Warning().Msgf("no DNS addresses matching -iv selection for %s", hostname)
-		}
-		return ips
-	}
-	var ips []string
-	if i.ipOptions.IPV6 && len(dnsData.AAAA) > 0 {
-		ips = append(ips, dnsData.AAAA[0])
-	}
-	// Explicit -iv 4,6 scans the first IPv6 address and one unpinned target.
-	if i.ipOptions.IPV4 {
-		ips = append(ips, "")
-	}
-	if len(ips) == 0 {
-		gologger.Warning().Msgf("no IPv6 DNS address found for %s", hostname)
-	}
-	return ips
-}
-
 // Set normalizes and stores passed input values
 func (i *ListInputProvider) Set(executionId string, value string) {
 	i.set(executionId, value, nil)
@@ -258,11 +202,75 @@ func (i *ListInputProvider) set(executionId string, value string, selection *tar
 		return
 	}

-	for _, ip := range i.selectedIPs(executionId, urlx.Hostname()) {
+	if i.ipOptions.ScanAllIPs {
+		// scan all ips
+		dialers := protocolstate.GetDialersWithId(executionId)
+		if dialers == nil {
+			gologger.Error().Msgf("dialers with executionId %s not found", executionId)
+			return
+		}
+
+		dnsData, err := dialers.Fastdialer.GetDNSData(urlx.Hostname())
+		if err == nil {
+			if (len(dnsData.A) + len(dnsData.AAAA)) > 0 {
+				var ips []string
+				if i.ipOptions.IPV4 {
+					ips = append(ips, dnsData.A...)
+				}
+				if i.ipOptions.IPV6 {
+					ips = append(ips, dnsData.AAAA...)
+				}
+				for _, ip := range ips {
+					if ip == "" {
+						continue
+					}
+					metaInput := contextargs.NewMetaInput()
+					metaInput.Input = URL
+					metaInput.CustomIP = ip
+					i.setItem(metaInput, selection)
+				}
+				return
+			} else {
+				gologger.Debug().Msgf("scanAllIps: no ip's found reverting to default")
+			}
+		} else {
+			// failed to scanallips falling back to defaults
+			gologger.Debug().Msgf("scanAllIps: dns resolution failed: %v", err)
+		}
+	}
+
+	ips := []string{}
+	// only scan the target but ipv6 if it has one
+	if i.ipOptions.IPV6 {
+		dialers := protocolstate.GetDialersWithId(executionId)
+		if dialers == nil {
+			gologger.Error().Msgf("dialers with executionId %s not found", executionId)
+			return
+		}
+
+		dnsData, err := dialers.Fastdialer.GetDNSData(urlx.Hostname())
+		if err == nil && len(dnsData.AAAA) > 0 {
+			// pick/ prefer 1st
+			ips = append(ips, dnsData.AAAA[0])
+		} else {
+			gologger.Warning().Msgf("target does not have ipv6 address falling back to ipv4 %v\n", err)
+		}
+	}
+	if i.ipOptions.IPV4 {
+		// if IPV4 is enabled do not specify ip let dialer handle it
+		ips = append(ips, "")
+	}
+
+	for _, ip := range ips {
 		metaInput := contextargs.NewMetaInput()
-		metaInput.Input = URL
-		metaInput.CustomIP = ip
-		i.setItem(metaInput, selection)
+		if ip != "" {
+			metaInput.Input = URL
+			metaInput.CustomIP = ip
+			i.setItem(metaInput, selection)
+		} else {
+			metaInput.Input = URL
+			i.setItem(metaInput, selection)
+		}
 	}
 }

@@ -485,11 +493,75 @@ func (i *ListInputProvider) Del(executionId string, value string) {
 		return
 	}

-	for _, ip := range i.selectedIPs(executionId, urlx.Hostname()) {
+	if i.ipOptions.ScanAllIPs {
+		// scan all ips
+		dialers := protocolstate.GetDialersWithId(executionId)
+		if dialers == nil {
+			gologger.Error().Msgf("dialers with executionId %s not found", executionId)
+			return
+		}
+
+		dnsData, err := dialers.Fastdialer.GetDNSData(urlx.Hostname())
+		if err == nil {
+			if (len(dnsData.A) + len(dnsData.AAAA)) > 0 {
+				var ips []string
+				if i.ipOptions.IPV4 {
+					ips = append(ips, dnsData.A...)
+				}
+				if i.ipOptions.IPV6 {
+					ips = append(ips, dnsData.AAAA...)
+				}
+				for _, ip := range ips {
+					if ip == "" {
+						continue
+					}
+					metaInput := contextargs.NewMetaInput()
+					metaInput.Input = value
+					metaInput.CustomIP = ip
+					i.delItem(metaInput)
+				}
+				return
+			} else {
+				gologger.Debug().Msgf("scanAllIps: no ip's found reverting to default")
+			}
+		} else {
+			// failed to scanallips falling back to defaults
+			gologger.Debug().Msgf("scanAllIps: dns resolution failed: %v", err)
+		}
+	}
+
+	ips := []string{}
+	// only scan the target but ipv6 if it has one
+	if i.ipOptions.IPV6 {
+		dialers := protocolstate.GetDialersWithId(executionId)
+		if dialers == nil {
+			gologger.Error().Msgf("dialers with executionId %s not found", executionId)
+			return
+		}
+
+		dnsData, err := dialers.Fastdialer.GetDNSData(urlx.Hostname())
+		if err == nil && len(dnsData.AAAA) > 0 {
+			// pick/ prefer 1st
+			ips = append(ips, dnsData.AAAA[0])
+		} else {
+			gologger.Warning().Msgf("target does not have ipv6 address falling back to ipv4 %v\n", err)
+		}
+	}
+	if i.ipOptions.IPV4 {
+		// if IPV4 is enabled do not specify ip let dialer handle it
+		ips = append(ips, "")
+	}
+
+	for _, ip := range ips {
 		metaInput := contextargs.NewMetaInput()
-		metaInput.Input = URL
-		metaInput.CustomIP = ip
-		i.delItem(metaInput)
+		if ip != "" {
+			metaInput.Input = URL
+			metaInput.CustomIP = ip
+			i.delItem(metaInput)
+		} else {
+			metaInput.Input = URL
+			i.delItem(metaInput)
+		}
 	}
 }

@@ -1,106 +0,0 @@
-package list
-
-import (
-	"net"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/miekg/dns"
-	"github.com/projectdiscovery/hmap/store/hybrid"
-	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
-	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
-	"github.com/projectdiscovery/nuclei/v3/pkg/types"
-	"github.com/stretchr/testify/require"
-)
-
-// A local deterministic DNS responder for dual-stack, A-only and AAAA-only hosts.
-type ipVersionDNSHandler struct{}
-
-func (ipVersionDNSHandler) ServeDNS(w dns.ResponseWriter, r *dns.Msg) {
-	reply := new(dns.Msg)
-	reply.SetReply(r)
-	if len(r.Question) == 0 {
-		_ = w.WriteMsg(reply)
-		return
-	}
-	question := r.Question[0]
-	// Some resolvers try search suffixes before the absolute name. Match the
-	// test host prefix rather than answering unrelated names as dual-stack.
-	host := strings.ToLower(question.Name)
-	if strings.HasPrefix(host, "empty.") {
-		_ = w.WriteMsg(reply)
-		return
-	}
-	isDual := strings.HasPrefix(host, "dual.")
-	isV4 := strings.HasPrefix(host, "v4only.")
-	isV6 := strings.HasPrefix(host, "v6only.")
-	if question.Qtype == dns.TypeA && (isDual || isV4) {
-		reply.Answer = append(reply.Answer, &dns.A{Hdr: dns.RR_Header{Name: question.Name, Rrtype: dns.TypeA, Class: dns.ClassINET, Ttl: 60}, A: net.ParseIP("192.0.2.10")})
-	}
-	if question.Qtype == dns.TypeAAAA && (isDual || isV6) {
-		reply.Answer = append(reply.Answer, &dns.AAAA{Hdr: dns.RR_Header{Name: question.Name, Rrtype: dns.TypeAAAA, Class: dns.ClassINET, Ttl: 60}, AAAA: net.ParseIP("2001:db8::10")})
-	}
-	_ = w.WriteMsg(reply)
-}
-
-func TestIPVersionsDefaultAndExplicitSelection(t *testing.T) {
-	conn, err := net.ListenPacket("udp", "127.0.0.1:0")
-	require.NoError(t, err)
-	started := make(chan struct{})
-	server := &dns.Server{PacketConn: conn, Handler: ipVersionDNSHandler{}, NotifyStartedFunc: func() { close(started) }}
-	go func() { _ = server.ActivateAndServe() }()
-	t.Cleanup(func() { _ = server.Shutdown() })
-	select {
-	case <-started:
-	case <-time.After(5 * time.Second):
-		t.Fatal("DNS test resolver did not start")
-	}
-	opts := types.DefaultOptions()
-	opts.ExecutionId = "ip-version-regression"
-	opts.InternalResolversList = []string{conn.LocalAddr().String()}
-	require.NoError(t, protocolstate.Init(opts))
-	t.Cleanup(func() { protocolstate.Close(opts.ExecutionId) })
-	for _, tc := range []struct {
-		name, hostname            string
-		scanAll, ipv4, ipv6, auto bool
-		want                      []string
-	}{
-		{"automatic dual-stack keeps dialer fallback", "dual.test", false, true, true, true, []string{""}},
-		{"automatic IPv6-only keeps dialer fallback", "v6only.test", false, true, true, true, []string{""}},
-		{"auto IPv4 fallback", "v4only.test", false, true, true, true, []string{""}},
-		{"auto empty DNS response fallback", "empty.test", false, true, true, true, []string{""}},
-		{"all empty DNS response fallback", "empty.test", true, true, true, true, []string{""}},
-		{"all dual", "dual.test", true, true, true, true, []string{"192.0.2.10", "2001:db8::10"}},
-		{"all IPv6 only", "v6only.test", true, true, true, true, []string{"2001:db8::10"}},
-		{"all IPv4 only", "v4only.test", true, true, true, true, []string{"192.0.2.10"}},
-		{"explicit IPv4 only", "dual.test", false, true, false, false, []string{""}},
-		{"explicit IPv6 only", "dual.test", false, false, true, false, []string{"2001:db8::10"}},
-		{"explicit both", "dual.test", false, true, true, false, []string{"2001:db8::10", ""}},
-		{"all explicit IPv6", "dual.test", true, false, true, false, []string{"2001:db8::10"}},
-		{"all explicit IPv4", "dual.test", true, true, false, false, []string{"192.0.2.10"}},
-		{"IPv6 restricted on IPv4-only", "v4only.test", true, false, true, false, nil},
-	} {
-		t.Run(tc.name, func(t *testing.T) {
-			hm, err := hybrid.New(hybrid.DefaultDiskOptions)
-			require.NoError(t, err)
-			input := &ListInputProvider{
-				hostMap:       hm,
-				excludedHosts: make(map[string]struct{}),
-				ipOptions:     &ipOptions{ScanAllIPs: tc.scanAll, IPV4: tc.ipv4, IPV6: tc.ipv6, Auto: tc.auto},
-			}
-			t.Cleanup(input.Close)
-			input.Set(opts.ExecutionId, "https://"+tc.hostname)
-			var got []string
-			input.Iterate(func(value *contextargs.MetaInput) bool {
-				got = append(got, value.CustomIP)
-				return true
-			})
-			require.ElementsMatch(t, tc.want, got)
-			if tc.scanAll && len(tc.want) > 0 {
-				input.Del(opts.ExecutionId, "https://"+tc.hostname)
-				require.EqualValues(t, 0, input.Count(), "Del must remove the same IPs added by Set")
-			}
-		})
-	}
-}
@@ -4,5 +4,4 @@ type ipOptions struct {
 	ScanAllIPs bool
 	IPV4       bool
 	IPV6       bool
-	Auto       bool // -iv omitted: one unpinned target unless -sa scans every address
 }
@@ -16,12 +16,10 @@ import (
 	syncutil "github.com/projectdiscovery/utils/sync"

 	_ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/libbytes"
-	_ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/libcompress"
 	_ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/libdcerpc"
 	_ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/libdcom"
 	_ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/libfs"
 	_ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/libgrpc"
-	_ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/libhash"
 	_ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/libhttp"
 	_ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/libikev2"
 	_ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/libkerberos"
@@ -1,158 +0,0 @@
-package compiler
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"math/rand"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"strconv"
-	"testing"
-	"time"
-
-	"github.com/andybalholm/brotli"
-	"github.com/klauspost/compress/gzip"
-	"github.com/klauspost/compress/zlib"
-	"github.com/klauspost/compress/zstd"
-	"github.com/projectdiscovery/dsl"
-	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
-	"github.com/projectdiscovery/nuclei/v3/pkg/types"
-	httputil "github.com/projectdiscovery/utils/http"
-	"github.com/stretchr/testify/require"
-)
-
-const streamHashScript = `
-	const net = require('nuclei/net');
-	const compress = require('nuclei/compress');
-	const hash = require('nuclei/hash');
-
-	const conn = net.Open('tcp', %q);
-	conn.Send('GET / HTTP/1.1\r\nHost: test\r\nAccept-Encoding: gzip, deflate, br, zstd\r\n\r\n');
-	let head = '';
-	while (!head.endsWith('\r\n\r\n')) head += conn.RecvString(1);
-	const header = (name) => (head.match(new RegExp('\r\n' + name + ': ([^\r]+)', 'i')) || [])[1];
-	const length = header('Content-Length');
-	const coding = [header('Content-Encoding'), header('Transfer-Encoding')].filter(Boolean).join(', ');
-
-	const d = compress.NewDecoder(coding);
-	const sha = hash.New('sha256'), mmh3 = hash.New('mmh3');
-	const take = (out) => { sha.Write(out); mmh3.Write(out); };
-	if (length !== undefined) {
-		for (let read = 0; read < parseInt(length); ) {
-			const chunk = conn.Recv(65536);
-			read += chunk.length;
-			for (let out = d.Write(chunk); out.length > 0; out = d.Read()) take(out);
-		}
-		for (let out = d.Close(); out.length > 0; out = d.Read()) take(out);
-	} else {
-		while (!d.Finished()) {
-			for (let out = d.Write(conn.Recv(65536)); out.length > 0; out = d.Read()) take(out);
-		}
-	}
-	ExportAs('sha256', sha.Sum());
-	ExportAs('mmh3', mmh3.Sum());
-	true;
-`
-
-func encodeBody(t *testing.T, encoding string, data []byte) []byte {
-	t.Helper()
-	var buf bytes.Buffer
-	var w io.WriteCloser
-	switch encoding {
-	case "gzip":
-		w = gzip.NewWriter(&buf)
-	case "deflate":
-		w = zlib.NewWriter(&buf)
-	case "br":
-		w = brotli.NewWriter(&buf)
-	case "zstd":
-		zw, err := zstd.NewWriter(&buf)
-		require.NoError(t, err)
-		w = zw
-	case "":
-		return data
-	}
-	_, err := w.Write(data)
-	require.NoError(t, err)
-	require.NoError(t, w.Close())
-	return buf.Bytes()
-}
-
-func TestStreamingHashMatchesHTTPEngine(t *testing.T) {
-	rng := rand.New(rand.NewSource(1))
-	var body []byte
-	for len(body) < 6<<20 {
-		body = append(body, "large compressed response body "...)
-		body = append(body, byte(rng.Intn(256)))
-	}
-
-	executionID := t.Name()
-	require.NoError(t, protocolstate.Init(&types.Options{ExecutionId: executionID}))
-	t.Cleanup(func() { protocolstate.Close(executionID) })
-
-	for _, tc := range []struct {
-		encoding string
-		chunked  bool
-	}{
-		{"gzip", false},
-		{"gzip", true},
-		{"deflate", false},
-		{"br", true},
-		{"zstd", true},
-		{"", true},
-	} {
-		t.Run(fmt.Sprintf("%s chunked=%v", tc.encoding, tc.chunked), func(t *testing.T) {
-			encoded := encodeBody(t, tc.encoding, body)
-			server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				if tc.encoding != "" {
-					w.Header().Set("Content-Encoding", tc.encoding)
-				}
-				if !tc.chunked {
-					w.Header().Set("Content-Length", strconv.Itoa(len(encoded)))
-					_, _ = w.Write(encoded)
-					return
-				}
-				// Flushing before the handler returns makes the body chunked.
-				for rest := encoded; len(rest) > 0; {
-					n := min(len(rest), 50000)
-					_, _ = w.Write(rest[:n])
-					w.(http.Flusher).Flush()
-					rest = rest[n:]
-				}
-			}))
-			defer server.Close()
-
-			client := &http.Client{Transport: &http.Transport{DisableCompression: true}}
-			resp, err := client.Get(server.URL)
-			require.NoError(t, err)
-			if tc.chunked {
-				require.Equal(t, []string{"chunked"}, resp.TransferEncoding)
-			}
-			chain := httputil.NewResponseChain(resp, 64<<20)
-			defer chain.Close()
-			require.NoError(t, chain.Fill())
-			require.Equal(t, len(body), chain.Body().Len(), "the engine must decode the whole body")
-			engineBody := map[string]interface{}{"body": chain.BodyString()}
-			wantSha, err := dsl.EvalExpr("sha256(body)", engineBody)
-			require.NoError(t, err)
-			wantMmh3, err := dsl.EvalExpr("mmh3(body)", engineBody)
-			require.NoError(t, err)
-
-			serverURL, err := url.Parse(server.URL)
-			require.NoError(t, err)
-			script := fmt.Sprintf(streamHashScript, serverURL.Host)
-			compiled, err := SourceAutoMode(script, false)
-			require.NoError(t, err)
-			result, err := New().ExecuteWithOptions(t.Context(), compiled, NewExecuteArgs(), &ExecuteOptions{
-				ExecutionId:     executionID,
-				Source:          &script,
-				TimeoutVariants: &types.Timeouts{JsCompilerExecutionTimeout: 20 * time.Second},
-			})
-			require.NoError(t, err)
-			require.Equal(t, fmt.Sprint(wantSha), result["sha256"])
-			require.Equal(t, fmt.Sprint(wantMmh3), result["mmh3"])
-		})
-	}
-}
@@ -1,30 +0,0 @@
-package compress
-
-import (
-	lib_compress "github.com/projectdiscovery/nuclei/v3/pkg/js/libs/compress"
-
-	"github.com/projectdiscovery/goja"
-	"github.com/projectdiscovery/nuclei/v3/pkg/js/gojs"
-)
-
-var (
-	module = gojs.NewGojaModule("nuclei/compress")
-)
-
-func init() {
-	module.Set(
-		gojs.Objects{
-			// Functions
-			"NewDecoder": lib_compress.NewDecoder,
-
-			// Var and consts
-
-			// Objects / Classes
-			"Decoder": gojs.GetClassConstructor[lib_compress.Decoder](&lib_compress.Decoder{}),
-		},
-	).Register()
-}
-
-func Enable(runtime *goja.Runtime) {
-	module.Enable(runtime)
-}
@@ -1,30 +0,0 @@
-package hash
-
-import (
-	lib_hash "github.com/projectdiscovery/nuclei/v3/pkg/js/libs/hash"
-
-	"github.com/projectdiscovery/goja"
-	"github.com/projectdiscovery/nuclei/v3/pkg/js/gojs"
-)
-
-var (
-	module = gojs.NewGojaModule("nuclei/hash")
-)
-
-func init() {
-	module.Set(
-		gojs.Objects{
-			// Functions
-			"New": lib_hash.New,
-
-			// Var and consts
-
-			// Objects / Classes
-			"Hash": gojs.GetClassConstructor[lib_hash.Hash](&lib_hash.Hash{}),
-		},
-	).Register()
-}
-
-func Enable(runtime *goja.Runtime) {
-	module.Enable(runtime)
-}
@@ -53,12 +53,13 @@ func init() {
 			"FilterWorkstationTrustAccount":    lib_ldap.FilterWorkstationTrustAccount,

 			// Objects / Classes
-			"Client":         lib_ldap.NewClient,
-			"Config":         gojs.GetClassConstructor[lib_ldap.Config](&lib_ldap.Config{}),
-			"LdapAttributes": gojs.GetClassConstructor[lib_ldap.LdapAttributes](&lib_ldap.LdapAttributes{}),
-			"LdapEntry":      gojs.GetClassConstructor[lib_ldap.LdapEntry](&lib_ldap.LdapEntry{}),
-			"Metadata":       gojs.GetClassConstructor[lib_ldap.Metadata](&lib_ldap.Metadata{}),
-			"SearchResult":   gojs.GetClassConstructor[lib_ldap.SearchResult](&lib_ldap.SearchResult{}),
+			"AuthenticateOptions": gojs.GetClassConstructor[lib_ldap.AuthenticateOptions](&lib_ldap.AuthenticateOptions{}),
+			"Client":              lib_ldap.NewClient,
+			"Config":              gojs.GetClassConstructor[lib_ldap.Config](&lib_ldap.Config{}),
+			"LdapAttributes":      gojs.GetClassConstructor[lib_ldap.LdapAttributes](&lib_ldap.LdapAttributes{}),
+			"LdapEntry":           gojs.GetClassConstructor[lib_ldap.LdapEntry](&lib_ldap.LdapEntry{}),
+			"Metadata":            gojs.GetClassConstructor[lib_ldap.Metadata](&lib_ldap.Metadata{}),
+			"SearchResult":        gojs.GetClassConstructor[lib_ldap.SearchResult](&lib_ldap.SearchResult{}),
 		},
 	).Register()
 }
@@ -19,8 +19,9 @@ func init() {
 			// Var and consts

 			// Objects / Classes
-			"MSSQLClient": gojs.GetClassConstructor[lib_mssql.MSSQLClient](&lib_mssql.MSSQLClient{}),
-			"MSSQLInfo":   gojs.GetClassConstructor[lib_mssql.MSSQLInfo](&lib_mssql.MSSQLInfo{}),
+			"MSSQLClient":  gojs.GetClassConstructor[lib_mssql.MSSQLClient](&lib_mssql.MSSQLClient{}),
+			"MSSQLInfo":    gojs.GetClassConstructor[lib_mssql.MSSQLInfo](&lib_mssql.MSSQLInfo{}),
+			"MSSQLOptions": gojs.GetClassConstructor[lib_mssql.MSSQLOptions](&lib_mssql.MSSQLOptions{}),
 		},
 	).Register()
 }
@@ -21,6 +21,7 @@ func init() {
 			// Objects / Classes
 			"IsOracleResponse": gojs.GetClassConstructor[lib_oracle.IsOracleResponse](&lib_oracle.IsOracleResponse{}),
 			"OracleClient":     gojs.GetClassConstructor[lib_oracle.OracleClient](&lib_oracle.OracleClient{}),
+			"OracleOptions":    gojs.GetClassConstructor[lib_oracle.OracleOptions](&lib_oracle.OracleOptions{}),
 		},
 	).Register()
 }
@@ -19,7 +19,8 @@ func init() {
 			// Var and consts

 			// Objects / Classes
-			"PGClient": gojs.GetClassConstructor[lib_postgres.PGClient](&lib_postgres.PGClient{}),
+			"PGClient":         gojs.GetClassConstructor[lib_postgres.PGClient](&lib_postgres.PGClient{}),
+			"PostgresOptions": gojs.GetClassConstructor[lib_postgres.PostgresOptions](&lib_postgres.PostgresOptions{}),
 		},
 	).Register()
 }
@@ -15,16 +15,17 @@ func init() {
 	module.Set(
 		gojs.Objects{
 			// Functions
-			"Connect":           lib_redis.Connect,
-			"GetServerInfo":     lib_redis.GetServerInfo,
-			"GetServerInfoAuth": lib_redis.GetServerInfoAuth,
-			"IsAuthenticated":   lib_redis.IsAuthenticated,
-			"RunLuaScript":      lib_redis.RunLuaScript,
+			"Connect":            lib_redis.Connect, //nolint:staticcheck // SA1019: retained for JS API compatibility
+			"ConnectWithOptions": lib_redis.ConnectWithOptions,
+			"GetServerInfo":      lib_redis.GetServerInfo,
+			"GetServerInfoAuth":  lib_redis.GetServerInfoAuth,
+			"IsAuthenticated":    lib_redis.IsAuthenticated,
+			"RunLuaScript":       lib_redis.RunLuaScript,

 			// Var and consts

 			// Objects / Classes
-
+			"RedisOptions": gojs.GetClassConstructor[lib_redis.RedisOptions](&lib_redis.RedisOptions{}),
 		},
 	).Register()
 }
@@ -19,7 +19,8 @@ func init() {
 			// Var and consts

 			// Objects / Classes
-			"SMBClient": gojs.GetClassConstructor[lib_smb.SMBClient](&lib_smb.SMBClient{}),
+			"SMBClient":  gojs.GetClassConstructor[lib_smb.SMBClient](&lib_smb.SMBClient{}),
+			"SMBOptions": gojs.GetClassConstructor[lib_smb.SMBOptions](&lib_smb.SMBOptions{}),
 		},
 	).Register()
 }
@@ -19,7 +19,8 @@ func init() {
 			// Var and consts

 			// Objects / Classes
-			"SSHClient": gojs.GetClassConstructor[lib_ssh.SSHClient](&lib_ssh.SSHClient{}),
+			"SSHClient":  gojs.GetClassConstructor[lib_ssh.SSHClient](&lib_ssh.SSHClient{}),
+			"SSHOptions": gojs.GetClassConstructor[lib_ssh.SSHOptions](&lib_ssh.SSHOptions{}),
 		},
 	).Register()
 }
@@ -35,6 +35,7 @@ func init() {
 			"IsTelnetResponse":   gojs.GetClassConstructor[lib_telnet.IsTelnetResponse](&lib_telnet.IsTelnetResponse{}),
 			"TelnetClient":       gojs.GetClassConstructor[lib_telnet.TelnetClient](&lib_telnet.TelnetClient{}),
 			"TelnetInfoResponse": gojs.GetClassConstructor[lib_telnet.TelnetInfoResponse](&lib_telnet.TelnetInfoResponse{}),
+			"TelnetOptions":      gojs.GetClassConstructor[lib_telnet.TelnetOptions](&lib_telnet.TelnetOptions{}),
 		},
 	).Register()
 }
@@ -22,6 +22,7 @@ func init() {
 			// Objects / Classes
 			"IsVNCResponse": gojs.GetClassConstructor[lib_vnc.IsVNCResponse](&lib_vnc.IsVNCResponse{}),
 			"VNCClient":     gojs.GetClassConstructor[lib_vnc.VNCClient](&lib_vnc.VNCClient{}),
+			"VNCOptions":    gojs.GetClassConstructor[lib_vnc.VNCOptions](&lib_vnc.VNCOptions{}),
 		},
 	).Register()
 }
@@ -1,102 +0,0 @@
-
-
-/**
- * NewDecoder returns a decoder for gzip, deflate, br, zstd, chunked or
- * identity. List several comma-separated, in the order they were applied.
- * @example
- * ```javascript
- * const compress = require('nuclei/compress');
- * const d = compress.NewDecoder('br');
- * // Content-Encoding: gzip sent with Transfer-Encoding: chunked
- * const c = compress.NewDecoder('gzip, chunked');
- * ```
- */
-export function NewDecoder(encoding: string): Decoder | null {
-    return null;
-}
-
-
-
-/**
- * Decoder decodes a compressed stream written to it in chunks. Each call
- * returns up to about 1 MB; call Read until it returns nothing before the
- * next Write.
- * @example
- * ```javascript
- * const compress = require('nuclei/compress');
- * const hash = require('nuclei/hash');
- * const d = compress.NewDecoder('gzip');
- * const h = hash.New('sha256');
- * for (const chunk of chunks) {
- *   for (let out = d.Write(chunk); out.length > 0; out = d.Read()) h.Write(out);
- * }
- * for (let out = d.Close(); out.length > 0; out = d.Read()) h.Write(out);
- * log(h.Sum());
- * ```
- */
-export class Decoder {
-    
-
-    // Constructor of Decoder
-    constructor() {}
-    /**
-    * Write decodes the next chunk and returns up to about 1 MB of output.
-    * @example
-    * ```javascript
-    * const compress = require('nuclei/compress');
-    * const d = compress.NewDecoder('gzip');
-    * const out = d.Write(chunk);
-    * ```
-    */
-    public Write(chunk: Uint8Array): Uint8Array | null {
-        return null;
-    }
-    
-
-    /**
-    * Read returns more decoded bytes, or none once the decoder needs input.
-    * @example
-    * ```javascript
-    * const compress = require('nuclei/compress');
-    * const d = compress.NewDecoder('gzip');
-    * for (let out = d.Write(chunk); out.length > 0; out = d.Read()) log(out.length);
-    * ```
-    */
-    public Read(): Uint8Array | null {
-        return null;
-    }
-    
-
-    /**
-    * Close ends the input and returns the last decoded bytes. A truncated
-    * stream errors once the bytes before the cut have been returned.
-    * @example
-    * ```javascript
-    * const compress = require('nuclei/compress');
-    * const d = compress.NewDecoder('gzip');
-    * d.Write(chunk);
-    * for (let out = d.Close(); out.length > 0; out = d.Read()) log(out.length);
-    * ```
-    */
-    public Close(): Uint8Array | null {
-        return null;
-    }
-    
-
-    /**
-    * Finished reports whether a stream that marks its own end, such as a
-    * chunked body, has ended and all its output was read.
-    * @example
-    * ```javascript
-    * const compress = require('nuclei/compress');
-    * const d = compress.NewDecoder('gzip, chunked');
-    * while (!d.Finished()) for (let out = d.Write(conn.Recv(65536)); out.length > 0; out = d.Read()) log(out.length);
-    * ```
-    */
-    public Finished(): boolean {
-        return false;
-    }
-    
-
-}
-
@@ -1,77 +0,0 @@
-
-
-/**
- * New returns a running hash for md5, sha1, sha256, sha512 or mmh3. Sum
- * matches the DSL function of the same name.
- * @example
- * ```javascript
- * const hash = require('nuclei/hash');
- * const h = hash.New('sha256');
- * ```
- */
-export function New(algorithm: string): Hash | null {
-    return null;
-}
-
-
-
-/**
- * Hash is a running hash.
- * @example
- * ```javascript
- * const hash = require('nuclei/hash');
- * const h = hash.New('sha256');
- * h.WriteString('hello');
- * log(h.Sum());
- * ```
- */
-export class Hash {
-    
-
-    // Constructor of Hash
-    constructor() {}
-    /**
-    * Write adds data to the hash.
-    * @example
-    * ```javascript
-    * const hash = require('nuclei/hash');
-    * const h = hash.New('sha256');
-    * h.Write([104, 105]);
-    * ```
-    */
-    public Write(data: Uint8Array): void {
-        return;
-    }
-    
-
-    /**
-    * WriteString adds the string data to the hash.
-    * @example
-    * ```javascript
-    * const hash = require('nuclei/hash');
-    * const h = hash.New('sha256');
-    * h.WriteString('hi');
-    * ```
-    */
-    public WriteString(data: string): void {
-        return;
-    }
-    
-
-    /**
-    * Sum returns the hash of the data written so far, formatted as the DSL does.
-    * @example
-    * ```javascript
-    * const hash = require('nuclei/hash');
-    * const h = hash.New('mmh3');
-    * h.WriteString('hello');
-    * log(h.Sum());
-    * ```
-    */
-    public Sum(): string | null {
-        return null;
-    }
-    
-
-}
-
@@ -1,11 +1,9 @@
 export * as bytes from './bytes';
-export * as compress from './compress';
 export * as dcom from './dcom';
 export * as dcerpc from './dcerpc';
 export * as fs from './fs';
 export * as goconsole from './goconsole';
 export * as grpc from './grpc';
-export * as hash from './hash';
 export * as http from './http';
 export * as ikev2 from './ikev2';
 export * as kerberos from './kerberos';
@@ -404,6 +404,14 @@ export class Client {
    }
    

+    /**
+    * AuthenticateWithOptions authenticates using a password or an NTLM hash.
+    */
+    public AuthenticateWithOptions(opts: AuthenticateOptions): boolean {
+        return false;
+    }
+    
+
    /**
    * AuthenticateWithNTLMHash authenticates with the ldap server using the given username and NTLM hash
    * @example
@@ -507,6 +515,21 @@ export interface Config {



+/**
+ * AuthenticateOptions defines credentials for LDAP authentication. Hash takes
+ * precedence over Password when both are provided.
+ */
+export interface AuthenticateOptions {
+    
+    Username?: string,
+    
+    Password?: string,
+    
+    Hash?: string,
+}
+
+
+
 /**
 * LdapAttributes represents all LDAP attributes of a particular
 * ldap entry
@@ -46,6 +46,14 @@ export class MSSQLClient {
    }
    

+    /**
+    * ConnectWithOptions connects to MS SQL using the supplied connection options.
+    */
+    public ConnectWithOptions(opts: MSSQLOptions): boolean | null {
+        return null;
+    }
+    
+
    /**
    * IsMssql checks if the given host is running MS SQL database.
    * If the host is running MS SQL database, it returns true.
@@ -95,6 +103,26 @@ export class MSSQLClient {



+/**
+ * MSSQLOptions defines the connection options for an MS SQL database.
+ */
+export interface MSSQLOptions {
+    
+    Host?: string,
+    
+    Port?: number,
+    
+    Username?: string,
+    
+    Password?: string,
+    
+    DbName?: string,
+    
+    Timeout?: number,
+}
+
+
+
 /**
 * SQLResult Interface
 */
@@ -63,6 +63,14 @@ export class MySQLClient {
    }
    

+    /**
+    * ConnectWithOptions connects to MySQL using the supplied connection options.
+    */
+    public ConnectWithOptions(opts: MySQLOptions): boolean | null {
+        return null;
+    }
+    
+
    /**
    * returns MySQLInfo when fingerprint is successful
    * @example
@@ -41,6 +41,13 @@ export class OracleClient {
        return null;
    }

+    /**
+     * ConnectWithOptions connects to Oracle using the supplied connection options.
+     */
+    public ConnectWithOptions(opts: OracleOptions): boolean | null {
+        return null;
+    }
+
    /**
     * ConnectWithDSN connects to an Oracle database using a DSN string
     * @example
@@ -96,6 +103,17 @@ export class OracleClient {
    }
 }

+/**
+ * OracleOptions defines the connection options for an Oracle database.
+ */
+export interface OracleOptions {
+    Host?: string,
+    Port?: number,
+    ServiceName?: string,
+    Username?: string,
+    Password?: string,
+}
+
 /**
 * SQLResult Interface
 */
@@ -46,6 +46,14 @@ export class PGClient {
    }
    

+    /**
+    * ConnectWithOptions connects to Postgres using the supplied connection options.
+    */
+    public ConnectWithOptions(opts: PostgresOptions): boolean | null {
+        return null;
+    }
+    
+
    /**
    * ExecuteQuery connects to Postgres database using given credentials and database name.
    * and executes a query on the db.
@@ -84,6 +92,28 @@ export class PGClient {



+/**
+ * PostgresOptions defines the connection options for a Postgres database.
+ */
+export interface PostgresOptions {
+    
+    Host?: string,
+    
+    Port?: number,
+    
+    Username?: string,
+    
+    Password?: string,
+    
+    DbName?: string,
+    
+    Timeout?: number,
+    
+    SSLMode?: string,
+}
+
+
+
 /**
 * SQLResult Interface
 */
@@ -14,6 +14,43 @@ export function Connect(host: string, port: number, password: string): boolean |



+/**
+ * ConnectWithOptions tries to connect to Redis using the supplied options.
+ * @example
+ * ```javascript
+ * const redis = require('nuclei/redis');
+ * const opts = new redis.RedisOptions();
+ * opts.Host = 'acme.com';
+ * opts.Port = 6379;
+ * opts.Password = 'password';
+ * opts.DB = 1;
+ * const connected = redis.ConnectWithOptions(opts);
+ * ```
+ */
+export function ConnectWithOptions(opts: RedisOptions): boolean | null {
+    return null;
+}
+
+
+
+/**
+ * RedisOptions defines the connection options for a Redis server.
+ */
+export interface RedisOptions {
+    
+    Host?: string,
+    
+    Port?: number,
+    
+    Password?: string,
+    
+    DB?: number,
+    
+    Timeout?: number,
+}
+
+
+
 /**
 * GetServerInfo returns the server info for a redis server
 * @example
@@ -149,6 +149,26 @@ export class SMBClient {
        return null;
    }

+    /**
+    * ListSharesWithOptions lists SMB share names using SMBOptions.
+    * Supports domain, pass-the-hash, workstation, and SPN overrides.
+    * @example
+    * ```javascript
+    * const smb = require('nuclei/smb');
+    * const client = new smb.SMBClient();
+    * const opts = new smb.SMBOptions();
+    * opts.Host = 'acme.com';
+    * opts.Port = 445;
+    * opts.User = 'Administrator';
+    * opts.Domain = 'ACME';
+    * const shares = client.ListSharesWithOptions(opts);
+    * ```
+    */
+    public ListSharesWithOptions(opts: SMBOptions): string[] | null {
+        return null;
+    }
+    
+
    /**
    * DetectSMBGhost tries to detect SMBGhost vulnerability
    * by using SMBv3 compression feature.
@@ -204,6 +224,38 @@ export interface ProtocolInfo {



+/**
+ * SMBOptions represents configuration for authenticated SMB operations.
+ * @example
+ * ```javascript
+ * const smb = require('nuclei/smb');
+ * const opts = new smb.SMBOptions();
+ * opts.Host = 'acme.com';
+ * opts.Port = 445;
+ * opts.User = 'Administrator';
+ * opts.Password = 'password';
+ * opts.Domain = 'ACME';
+ * ```
+ */
+export interface SMBOptions {
+    
+    Host?: string,
+    
+    Port?: number,
+    
+    User?: string,
+    
+    Password?: string,
+    
+    Hash?: string,
+    
+    Domain?: string,
+    
+    Timeout?: number,
+}
+
+
+
 /**
 * HeaderLog Interface
 */
@@ -28,6 +28,27 @@ export class SSHClient {
    }
    

+    /**
+    * ConnectWithOptions tries to connect using the provided SSHOptions.
+    * Prefer this over Connect/ConnectWithKey when setting timeout, client version,
+    * or combining password and private key auth.
+    * @example
+    * ```javascript
+    * const ssh = require('nuclei/ssh');
+    * const client = new ssh.SSHClient();
+    * const opts = new ssh.SSHOptions();
+    * opts.Host = 'acme.com';
+    * opts.Port = 22;
+    * opts.User = 'username';
+    * opts.Password = 'password';
+    * const connected = client.ConnectWithOptions(opts);
+    * ```
+    */
+    public ConnectWithOptions(opts: SSHOptions): boolean | null {
+        return null;
+    }
+    
+
    /**
    * Connect tries to connect to provided host and port
    * with provided username and password with ssh.
@@ -124,6 +145,41 @@ export class SSHClient {



+/**
+ * SSHOptions represents configuration options for an SSH connection.
+ * Use ConnectWithOptions when you need protocol-specific knobs beyond
+ * username/password (timeout, client version, private key).
+ * @example
+ * ```javascript
+ * const ssh = require('nuclei/ssh');
+ * const opts = new ssh.SSHOptions();
+ * opts.Host = 'acme.com';
+ * opts.Port = 22;
+ * opts.User = 'username';
+ * opts.Password = 'password';
+ * opts.Timeout = 15;
+ * opts.ClientVersion = 'SSH-2.0-OpenSSH_8.9';
+ * ```
+ */
+export interface SSHOptions {
+    
+    Host?: string,
+    
+    Port?: number,
+    
+    User?: string,
+    
+    Password?: string,
+    
+    PrivateKey?: string,
+    
+    Timeout?: number,
+    
+    ClientVersion?: string,
+}
+
+
+
 /**
 * Algorithms Interface
 */
@@ -39,6 +39,13 @@ export class TelnetClient {
        return false;
    }

+    /**
+     * ConnectWithOptions connects to Telnet using the supplied connection options.
+     */
+    public ConnectWithOptions(opts: TelnetOptions): boolean {
+        return false;
+    }
+
    /**
     * Info gathers information about the telnet server including encryption support.
     * Uses the telnetmini library's DetectEncryption helper function.
@@ -90,6 +97,22 @@ export interface IsTelnetResponse {
    Banner?: string,
 }

+/**
+ * TelnetOptions defines the connection options for a Telnet server.
+ */
+export interface TelnetOptions {
+    
+    Host?: string,
+    
+    Port?: number,
+    
+    Username?: string,
+    
+    Password?: string,
+    
+    Timeout?: number,
+}
+
 /**
 * TelnetInfoResponse is the response from the Info function.
 * @example
@@ -62,5 +62,26 @@ export class VNCClient {
    public Connect(host: string, port: number, password: string): boolean | null {
        return null;
    }
+
+    /**
+    * ConnectWithOptions connects to VNC using the supplied connection options.
+    */
+    public ConnectWithOptions(opts: VNCOptions): boolean | null {
+        return null;
+    }
+}
+
+/**
+ * VNCOptions defines the connection options for a VNC server.
+ */
+export interface VNCOptions {
+    
+    Host?: string,
+    
+    Port?: number,
+    
+    Password?: string,
+    
+    Timeout?: number,
 }

@@ -1,303 +0,0 @@
-// Package compress exposes streaming decompression to nuclei JavaScript templates.
-package compress
-
-import (
-	"bytes"
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"net/http/httputil"
-	"slices"
-	"strings"
-
-	"github.com/dsnet/compress/brotli"
-	"github.com/klauspost/compress/gzip"
-	"github.com/klauspost/compress/zlib"
-	"github.com/klauspost/compress/zstd"
-)
-
-// maxDecodedChunk caps the decoded bytes one call hands back.
-const maxDecodedChunk = 1 << 20
-
-type pauseReason int
-
-const (
-	needInput pauseReason = iota
-	outputFull
-	finished
-)
-
-type (
-	// Decoder decodes a compressed stream written to it in chunks. Each call
-	// returns up to about 1 MB; call Read until it returns nothing before the
-	// next Write.
-	// @example
-	// ```javascript
-	// const compress = require('nuclei/compress');
-	// const hash = require('nuclei/hash');
-	// const d = compress.NewDecoder('gzip');
-	// const h = hash.New('sha256');
-	// for (const chunk of chunks) {
-	//   for (let out = d.Write(chunk); out.length > 0; out = d.Read()) h.Write(out);
-	// }
-	// for (let out = d.Close(); out.length > 0; out = d.Read()) h.Write(out);
-	// log(h.Sum());
-	// ```
-	Decoder struct {
-		ctx context.Context
-		// The decode goroutine and the template's calls take turns over these
-		// channels, so no field is accessed by both at once.
-		resume chan []byte
-		paused chan pauseReason
-		done   chan struct{}
-		out    []byte
-
-		state      pauseReason
-		inputEnded bool
-
-		pending []byte
-		eof     bool
-		err     error
-	}
-)
-
-// NewDecoder returns a decoder for gzip, deflate, br, zstd, chunked or
-// identity. List several comma-separated, in the order they were applied.
-// @example
-// ```javascript
-// const compress = require('nuclei/compress');
-// const d = compress.NewDecoder('br');
-// // Content-Encoding: gzip sent with Transfer-Encoding: chunked
-// const c = compress.NewDecoder('gzip, chunked');
-// ```
-func NewDecoder(ctx context.Context, encoding string) (*Decoder, error) {
-	var opens []func(io.Reader) (io.Reader, func(), error)
-	for name := range strings.SplitSeq(encoding, ",") {
-		switch name = strings.ToLower(strings.TrimSpace(name)); name {
-		case "gzip":
-			opens = append(opens, func(r io.Reader) (io.Reader, func(), error) {
-				zr, err := gzip.NewReader(r)
-				return zr, func() {}, err
-			})
-		case "deflate":
-			opens = append(opens, func(r io.Reader) (io.Reader, func(), error) {
-				zr, err := zlib.NewReader(r)
-				return zr, func() {}, err
-			})
-		case "br":
-			opens = append(opens, func(r io.Reader) (io.Reader, func(), error) {
-				br, err := brotli.NewReader(r, nil)
-				return br, func() {}, err
-			})
-		case "zstd":
-			opens = append(opens, func(r io.Reader) (io.Reader, func(), error) {
-				// One goroutine so no background workers outlive the stream.
-				zr, err := zstd.NewReader(r, zstd.WithDecoderConcurrency(1))
-				if err != nil {
-					return nil, nil, err
-				}
-				return zr, zr.Close, nil
-			})
-		case "chunked":
-			opens = append(opens, func(r io.Reader) (io.Reader, func(), error) {
-				return httputil.NewChunkedReader(r), func() {}, nil
-			})
-		case "", "identity":
-		default:
-			return nil, fmt.Errorf("unsupported encoding %q, expected gzip, deflate, br, zstd, chunked or identity", name)
-		}
-	}
-	slices.Reverse(opens)
-	open := func(r io.Reader) (io.Reader, func(), error) {
-		var closers []func()
-		closeAll := func() {
-			for _, c := range slices.Backward(closers) {
-				c()
-			}
-		}
-		for _, o := range opens {
-			next, c, err := o(r)
-			if err != nil {
-				closeAll()
-				return nil, nil, err
-			}
-			r = next
-			closers = append(closers, c)
-		}
-		return r, closeAll, nil
-	}
-	d := &Decoder{
-		ctx:    ctx,
-		resume: make(chan []byte),
-		paused: make(chan pauseReason),
-		done:   make(chan struct{}),
-	}
-	go d.run(open)
-	d.wait()
-	return d, nil
-}
-
-// Write decodes the next chunk and returns up to about 1 MB of output.
-// @example
-// ```javascript
-// const compress = require('nuclei/compress');
-// const d = compress.NewDecoder('gzip');
-// const out = d.Write(chunk);
-// ```
-func (d *Decoder) Write(chunk []byte) ([]byte, error) {
-	if d.done == nil {
-		return nil, errNotCreatedByNewDecoder
-	}
-	if d.inputEnded {
-		return nil, errors.New("decoder is closed")
-	}
-	if d.state == outputFull {
-		return nil, errors.New("decoded bytes are waiting: call Read until it returns no bytes before writing more")
-	}
-	if d.state == needInput && len(chunk) > 0 {
-		// The decode goroutine may still hold the chunk after Write returns.
-		d.resumeWith(bytes.Clone(chunk))
-	}
-	return d.result()
-}
-
-// Read returns more decoded bytes, or none once the decoder needs input.
-// @example
-// ```javascript
-// const compress = require('nuclei/compress');
-// const d = compress.NewDecoder('gzip');
-// for (let out = d.Write(chunk); out.length > 0; out = d.Read()) log(out.length);
-// ```
-func (d *Decoder) Read() ([]byte, error) {
-	if d.done == nil {
-		return nil, errNotCreatedByNewDecoder
-	}
-	d.advance()
-	return d.result()
-}
-
-// Close ends the input and returns the last decoded bytes. A truncated
-// stream errors once the bytes before the cut have been returned.
-// @example
-// ```javascript
-// const compress = require('nuclei/compress');
-// const d = compress.NewDecoder('gzip');
-// d.Write(chunk);
-// for (let out = d.Close(); out.length > 0; out = d.Read()) log(out.length);
-// ```
-func (d *Decoder) Close() ([]byte, error) {
-	if d.done == nil {
-		return nil, errNotCreatedByNewDecoder
-	}
-	d.inputEnded = true
-	d.advance()
-	return d.result()
-}
-
-// Finished reports whether a stream that marks its own end, such as a
-// chunked body, has ended and all its output was read.
-// @example
-// ```javascript
-// const compress = require('nuclei/compress');
-// const d = compress.NewDecoder('gzip, chunked');
-// while (!d.Finished()) for (let out = d.Write(conn.Recv(65536)); out.length > 0; out = d.Read()) log(out.length);
-// ```
-func (d *Decoder) Finished() bool {
-	return d.state == finished && len(d.out) == 0
-}
-
-var errNotCreatedByNewDecoder = errors.New("decoder was not created with compress.NewDecoder")
-
-func (d *Decoder) advance() {
-	for len(d.out) == 0 && (d.state == outputFull || d.state == needInput && d.inputEnded) {
-		d.resumeWith(nil)
-	}
-}
-
-func (d *Decoder) result() ([]byte, error) {
-	out := d.out
-	d.out = nil
-	if len(out) == 0 && d.state == finished {
-		return nil, d.err
-	}
-	return out, nil
-}
-
-func (d *Decoder) resumeWith(chunk []byte) {
-	select {
-	case d.resume <- chunk:
-		d.wait()
-	case <-d.done:
-		d.state = finished
-	}
-}
-
-func (d *Decoder) wait() {
-	select {
-	case d.state = <-d.paused:
-	case <-d.done:
-		d.state = finished
-	}
-}
-
-func (d *Decoder) run(open func(io.Reader) (io.Reader, func(), error)) {
-	defer close(d.done)
-	r, closeReader, err := open(decoderInput{d})
-	if err != nil {
-		d.err = err
-		return
-	}
-	defer closeReader()
-	_, err = io.Copy(decoderOutput{d}, r)
-	d.err = err
-}
-
-func (d *Decoder) pause(reason pauseReason) ([]byte, error) {
-	select {
-	case d.paused <- reason:
-	case <-d.ctx.Done():
-		return nil, context.Cause(d.ctx)
-	}
-	select {
-	case chunk := <-d.resume:
-		return chunk, nil
-	case <-d.ctx.Done():
-		return nil, context.Cause(d.ctx)
-	}
-}
-
-type decoderInput struct{ d *Decoder }
-
-func (in decoderInput) Read(p []byte) (int, error) {
-	d := in.d
-	for len(d.pending) == 0 {
-		if d.eof {
-			return 0, io.EOF
-		}
-		chunk, err := d.pause(needInput)
-		if err != nil {
-			return 0, err
-		}
-		if chunk == nil {
-			d.eof = true
-		}
-		d.pending = chunk
-	}
-	n := copy(p, d.pending)
-	d.pending = d.pending[n:]
-	return n, nil
-}
-
-type decoderOutput struct{ d *Decoder }
-
-func (out decoderOutput) Write(p []byte) (int, error) {
-	d := out.d
-	d.out = append(d.out, p...)
-	if len(d.out) >= maxDecodedChunk {
-		if _, err := d.pause(outputFull); err != nil {
-			return 0, err
-		}
-	}
-	return len(p), nil
-}
@@ -1,192 +0,0 @@
-package compress
-
-import (
-	"bytes"
-	"context"
-	"io"
-	"math/rand"
-	"net/http/httputil"
-	"testing"
-	"time"
-
-	"github.com/andybalholm/brotli"
-	"github.com/klauspost/compress/gzip"
-	"github.com/klauspost/compress/zlib"
-	"github.com/klauspost/compress/zstd"
-	"github.com/stretchr/testify/require"
-)
-
-func compressed(t *testing.T, encoding string, data []byte) []byte {
-	t.Helper()
-	var buf bytes.Buffer
-	var w io.WriteCloser
-	switch encoding {
-	case "gzip":
-		w = gzip.NewWriter(&buf)
-	case "deflate":
-		w = zlib.NewWriter(&buf)
-	case "br":
-		w = brotli.NewWriter(&buf)
-	case "zstd":
-		zw, err := zstd.NewWriter(&buf)
-		require.NoError(t, err)
-		w = zw
-	case "identity":
-		return data
-	}
-	_, err := w.Write(data)
-	require.NoError(t, err)
-	require.NoError(t, w.Close())
-	return buf.Bytes()
-}
-
-func decodeInChunks(t *testing.T, d *Decoder, input []byte) ([]byte, error) {
-	t.Helper()
-	rng := rand.New(rand.NewSource(1))
-	var decoded []byte
-	collect := func(out []byte, err error) bool {
-		require.LessOrEqual(t, len(out), maxDecodedChunk+64<<10)
-		decoded = append(decoded, out...)
-		return err == nil && len(out) > 0
-	}
-	drain := func(out []byte, err error) error {
-		for collect(out, err) {
-			out, err = d.Read()
-		}
-		return err
-	}
-	for len(input) > 0 {
-		n := min(len(input), 1+rng.Intn(70000))
-		out, err := d.Write(input[:n])
-		if err := drain(out, err); err != nil {
-			return decoded, err
-		}
-		input = input[n:]
-	}
-	out, err := d.Close()
-	return decoded, drain(out, err)
-}
-
-func TestDecoderMatchesWholeBodyDecode(t *testing.T) {
-	data := bytes.Repeat([]byte("nuclei streaming decoder "), 400000)
-	for _, encoding := range []string{"gzip", "deflate", "br", "zstd", "identity"} {
-		t.Run(encoding, func(t *testing.T) {
-			d, err := NewDecoder(t.Context(), encoding)
-			require.NoError(t, err)
-			decoded, err := decodeInChunks(t, d, compressed(t, encoding, data))
-			require.NoError(t, err)
-			require.Equal(t, data, decoded)
-		})
-	}
-}
-
-func chunked(t *testing.T, data []byte) []byte {
-	t.Helper()
-	var buf bytes.Buffer
-	w := httputil.NewChunkedWriter(&buf)
-	for len(data) > 0 {
-		n := min(len(data), 8000)
-		_, err := w.Write(data[:n])
-		require.NoError(t, err)
-		data = data[n:]
-	}
-	require.NoError(t, w.Close())
-	buf.WriteString("\r\n")
-	return buf.Bytes()
-}
-
-func TestDecoderDecodesChunkedTransfer(t *testing.T) {
-	data := bytes.Repeat([]byte("nuclei chunked decoder "), 400000)
-	for _, encoding := range []string{"gzip", "deflate", "br", "zstd", "identity"} {
-		t.Run(encoding, func(t *testing.T) {
-			d, err := NewDecoder(t.Context(), encoding+", chunked")
-			require.NoError(t, err)
-			decoded, err := decodeInChunks(t, d, chunked(t, compressed(t, encoding, data)))
-			require.NoError(t, err)
-			require.Equal(t, data, decoded)
-		})
-	}
-}
-
-func TestDecoderFinishesAtLastChunk(t *testing.T) {
-	data := bytes.Repeat([]byte("finished "), 1000)
-	d, err := NewDecoder(t.Context(), "gzip, chunked")
-	require.NoError(t, err)
-	input := chunked(t, compressed(t, "gzip", data))
-
-	half := len(input) / 2
-	_, err = d.Write(input[:half])
-	require.NoError(t, err)
-	require.False(t, d.Finished())
-
-	out, err := d.Write(input[half:])
-	require.NoError(t, err)
-	var decoded []byte
-	for ; len(out) > 0; out, err = d.Read() {
-		decoded = append(decoded, out...)
-	}
-	require.NoError(t, err)
-	require.Equal(t, data, decoded)
-	require.True(t, d.Finished(), "decoder must finish without Close once the last chunk arrives")
-}
-
-func TestDecoderAppliesCodingsInReverse(t *testing.T) {
-	data := bytes.Repeat([]byte("two codings "), 100000)
-	input := compressed(t, "br", compressed(t, "gzip", data))
-	d, err := NewDecoder(t.Context(), "gzip, br")
-	require.NoError(t, err)
-	decoded, err := decodeInChunks(t, d, input)
-	require.NoError(t, err)
-	require.Equal(t, data, decoded)
-}
-
-func TestDecoderReportsTruncatedStream(t *testing.T) {
-	data := bytes.Repeat([]byte("truncated "), 200000)
-	for _, encoding := range []string{"gzip", "deflate", "br", "zstd", "identity, chunked"} {
-		t.Run(encoding, func(t *testing.T) {
-			var input []byte
-			if encoding == "identity, chunked" {
-				input = chunked(t, data)
-			} else {
-				input = compressed(t, encoding, data)
-			}
-			d, err := NewDecoder(t.Context(), encoding)
-			require.NoError(t, err)
-			decoded, err := decodeInChunks(t, d, input[:len(input)/2])
-			require.Error(t, err)
-			require.True(t, bytes.HasPrefix(data, decoded), "bytes before the cut must still be handed back")
-		})
-	}
-}
-
-func TestDecoderStopsWhenContextEnds(t *testing.T) {
-	ctx, cancel := context.WithCancel(t.Context())
-	d, err := NewDecoder(ctx, "gzip")
-	require.NoError(t, err)
-	_, err = d.Write(compressed(t, "gzip", []byte("abandoned"))[:5])
-	require.NoError(t, err)
-
-	cancel()
-	select {
-	case <-d.done:
-	case <-time.After(time.Second):
-		t.Fatal("decode goroutine outlived its context")
-	}
-}
-
-func TestNewDecoderRejectsUnknownEncoding(t *testing.T) {
-	_, err := NewDecoder(t.Context(), "compress")
-	require.Error(t, err)
-	_, err = NewDecoder(t.Context(), "gzip, compress")
-	require.Error(t, err)
-}
-
-func TestDecoderNotCreatedByNewDecoderErrors(t *testing.T) {
-	var d Decoder
-	_, err := d.Write([]byte("x"))
-	require.ErrorIs(t, err, errNotCreatedByNewDecoder)
-	_, err = d.Read()
-	require.ErrorIs(t, err, errNotCreatedByNewDecoder)
-	_, err = d.Close()
-	require.ErrorIs(t, err, errNotCreatedByNewDecoder)
-}
@@ -1,100 +0,0 @@
-// Package hash exposes incremental hashes to nuclei JavaScript templates.
-package hash
-
-import (
-	"crypto/md5"
-	"crypto/sha1"
-	"crypto/sha256"
-	"crypto/sha512"
-	"encoding/hex"
-	"errors"
-	"fmt"
-	"hash"
-	"strings"
-
-	"github.com/spaolacci/murmur3"
-)
-
-type (
-	// Hash is a running hash.
-	// @example
-	// ```javascript
-	// const hash = require('nuclei/hash');
-	// const h = hash.New('sha256');
-	// h.WriteString('hello');
-	// log(h.Sum());
-	// ```
-	Hash struct {
-		h    hash.Hash
-		mmh3 bool
-	}
-)
-
-// New returns a running hash for md5, sha1, sha256, sha512 or mmh3. Sum
-// matches the DSL function of the same name.
-// @example
-// ```javascript
-// const hash = require('nuclei/hash');
-// const h = hash.New('sha256');
-// ```
-func New(algorithm string) (*Hash, error) {
-	switch strings.ToLower(algorithm) {
-	case "md5":
-		return &Hash{h: md5.New()}, nil
-	case "sha1":
-		return &Hash{h: sha1.New()}, nil
-	case "sha256":
-		return &Hash{h: sha256.New()}, nil
-	case "sha512":
-		return &Hash{h: sha512.New()}, nil
-	case "mmh3":
-		return &Hash{h: murmur3.New32WithSeed(0), mmh3: true}, nil
-	}
-	return nil, fmt.Errorf("unsupported hash algorithm %q, expected md5, sha1, sha256, sha512 or mmh3", algorithm)
-}
-
-// Write adds data to the hash.
-// @example
-// ```javascript
-// const hash = require('nuclei/hash');
-// const h = hash.New('sha256');
-// h.Write([104, 105]);
-// ```
-func (h *Hash) Write(data []byte) error {
-	if h.h == nil {
-		return errNotCreatedByNew
-	}
-	_, _ = h.h.Write(data)
-	return nil
-}
-
-// WriteString adds the string data to the hash.
-// @example
-// ```javascript
-// const hash = require('nuclei/hash');
-// const h = hash.New('sha256');
-// h.WriteString('hi');
-// ```
-func (h *Hash) WriteString(data string) error {
-	return h.Write([]byte(data))
-}
-
-// Sum returns the hash of the data written so far, formatted as the DSL does.
-// @example
-// ```javascript
-// const hash = require('nuclei/hash');
-// const h = hash.New('mmh3');
-// h.WriteString('hello');
-// log(h.Sum());
-// ```
-func (h *Hash) Sum() (string, error) {
-	if h.h == nil {
-		return "", errNotCreatedByNew
-	}
-	if h.mmh3 {
-		return fmt.Sprintf("%d", int32(h.h.(hash.Hash32).Sum32())), nil
-	}
-	return hex.EncodeToString(h.h.Sum(nil)), nil
-}
-
-var errNotCreatedByNew = errors.New("hash was not created with hash.New")
@@ -1,43 +0,0 @@
-package hash
-
-import (
-	"testing"
-
-	"github.com/projectdiscovery/dsl"
-	"github.com/stretchr/testify/require"
-)
-
-func TestSumMatchesDSLAcrossChunks(t *testing.T) {
-	data := make([]byte, 3<<20+7)
-	for i := range data {
-		data[i] = byte(i * 31)
-	}
-	for _, algorithm := range []string{"md5", "sha1", "sha256", "sha512", "mmh3"} {
-		t.Run(algorithm, func(t *testing.T) {
-			h, err := New(algorithm)
-			require.NoError(t, err)
-			for chunk := data; len(chunk) > 0; {
-				n := min(len(chunk), 65521)
-				require.NoError(t, h.Write(chunk[:n]))
-				chunk = chunk[n:]
-			}
-			want, err := dsl.EvalExpr(algorithm+"(body)", map[string]interface{}{"body": string(data)})
-			require.NoError(t, err)
-			sum, err := h.Sum()
-			require.NoError(t, err)
-			require.Equal(t, want, sum)
-		})
-	}
-}
-
-func TestNewRejectsUnknownAlgorithm(t *testing.T) {
-	_, err := New("crc32")
-	require.Error(t, err)
-}
-
-func TestHashNotCreatedByNewErrors(t *testing.T) {
-	var h Hash
-	require.ErrorIs(t, h.WriteString("x"), errNotCreatedByNew)
-	_, err := h.Sum()
-	require.ErrorIs(t, err, errNotCreatedByNew)
-}
@@ -61,6 +61,14 @@ type (
 		ServerName string // default to host (when using tls)
 		Upgrade    bool   // when true first connects to non-tls and then upgrades to tls
 	}
+
+	// AuthenticateOptions defines credentials for LDAP authentication. Hash takes
+	// precedence over Password when both are provided.
+	AuthenticateOptions struct {
+		Username string
+		Password string
+		Hash     string
+	}
 )

 // Constructor for creating a new ldap client
@@ -168,6 +176,8 @@ func NewClient(call goja.ConstructorCall, runtime *goja.Runtime) *goja.Object {

 // Authenticate authenticates with the ldap server using the given username and password
 // performs NTLMBind first and then Bind/UnauthenticatedBind if NTLMBind fails
+//
+// Deprecated: prefer AuthenticateWithOptions for new templates.
 // @example
 // ```javascript
 // const ldap = require('nuclei/ldap');
@@ -175,24 +185,35 @@ func NewClient(call goja.ConstructorCall, runtime *goja.Runtime) *goja.Object {
 // client.Authenticate('user', 'password');
 // ```
 func (c *Client) Authenticate(username, password string) bool {
+	return c.AuthenticateWithOptions(AuthenticateOptions{Username: username, Password: password})
+}
+
+// AuthenticateWithOptions authenticates using a password or an NTLM hash.
+func (c *Client) AuthenticateWithOptions(opts AuthenticateOptions) bool {
 	c.nj.Require(c.conn != nil, "no existing connection")
 	if c.BaseDN == "" {
 		c.BaseDN = fmt.Sprintf("dc=%s", strings.Join(strings.Split(c.Realm, "."), ",dc="))
 	}
-	if err := c.conn.NTLMBind(c.Realm, username, password); err == nil {
+	if authenticationUsesHash(opts) {
+		if err := c.conn.NTLMBindWithHash(c.Realm, opts.Username, opts.Hash); err != nil {
+			c.nj.ThrowError(err)
+		}
+		return true
+	}
+	if err := c.conn.NTLMBind(c.Realm, opts.Username, opts.Password); err == nil {
 		// if bind with NTLMBind(), there is nothing
 		// else to do, you are authenticated
 		return true
 	}

 	var err error
-	switch password {
+	switch opts.Password {
 	case "":
-		if err = c.conn.UnauthenticatedBind(username); err != nil {
+		if err = c.conn.UnauthenticatedBind(opts.Username); err != nil {
 			c.nj.ThrowError(err)
 		}
 	default:
-		if err = c.conn.Bind(username, password); err != nil {
+		if err = c.conn.Bind(opts.Username, opts.Password); err != nil {
 			c.nj.ThrowError(err)
 		}
 	}
@@ -207,15 +228,11 @@ func (c *Client) Authenticate(username, password string) bool {
 // client.AuthenticateWithNTLMHash('pdtm', 'hash');
 // ```
 func (c *Client) AuthenticateWithNTLMHash(username, hash string) bool {
-	c.nj.Require(c.conn != nil, "no existing connection")
-	if c.BaseDN == "" {
-		c.BaseDN = fmt.Sprintf("dc=%s", strings.Join(strings.Split(c.Realm, "."), ",dc="))
-	}
-	var err error
-	if err = c.conn.NTLMBindWithHash(c.Realm, username, hash); err != nil {
-		c.nj.ThrowError(err)
-	}
-	return err == nil
+	return c.AuthenticateWithOptions(AuthenticateOptions{Username: username, Hash: hash})
+}
+
+func authenticationUsesHash(opts AuthenticateOptions) bool {
+	return opts.Hash != ""
 }

 // Search accepts whatever filter and returns a list of maps having provided attributes
@@ -173,3 +173,15 @@ func requireNetworkPolicyError(t *testing.T, err error, target string) {
 		t.Fatalf("expected network-policy denial for %q, got %q", target, err)
 	}
 }
+
+func TestAuthenticateOptionsPreferHash(t *testing.T) {
+	if !authenticationUsesHash(AuthenticateOptions{Username: "user", Hash: "ntlm-hash"}) {
+		t.Fatal("expected hash authentication mode")
+	}
+	if !authenticationUsesHash(AuthenticateOptions{Username: "user", Password: "password", Hash: "ntlm-hash"}) {
+		t.Fatal("expected hash to take precedence over password")
+	}
+	if authenticationUsesHash(AuthenticateOptions{Username: "user", Password: "password"}) {
+		t.Fatal("expected password authentication mode")
+	}
+}
@@ -9,7 +9,7 @@ import (
 	"net/url"
 	"strings"

-	_ "github.com/microsoft/go-mssqldb"
+	mssqldb "github.com/microsoft/go-mssqldb"
 	"github.com/projectdiscovery/nuclei/v3/pkg/js/utils"
 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
 )
@@ -23,9 +23,33 @@ type (
 	// const client = new mssql.MSSQLClient;
 	// ```
 	MSSQLClient struct{}
+
+	// MSSQLOptions defines the connection options for an MS SQL database.
+	// @example
+	// ```javascript
+	// const mssql = require('nuclei/mssql');
+	// const opts = new mssql.MSSQLOptions();
+	// opts.Host = 'acme.com';
+	// opts.Port = 1433;
+	// opts.Username = 'sa';
+	// opts.Password = 'password';
+	// opts.DbName = 'master';
+	// opts.Timeout = 15;
+	// const connected = client.ConnectWithOptions(opts);
+	// ```
+	MSSQLOptions struct {
+		Host     string // Host is the hostname or IP of the MS SQL server.
+		Port     int    // Port is the MS SQL port (usually 1433).
+		Username string // Username is the login name.
+		Password string // Password is the login password.
+		DbName   string // DbName is the database name (default master when using Connect).
+		Timeout  int    // Timeout is the connection timeout in seconds (default 30).
+	}
 )

 // Connect connects to MS SQL database using given credentials.
+//
+// Deprecated: prefer ConnectWithOptions for new templates.
 // If connection is successful, it returns true.
 // If connection is unsuccessful, it returns false and error.
 // The connection is closed after the function returns.
@@ -41,6 +65,8 @@ func (c *MSSQLClient) Connect(ctx context.Context, host string, port int, userna
 }

 // ConnectWithDB connects to MS SQL database using given credentials and database name.
+//
+// Deprecated: prefer ConnectWithOptions for new templates.
 // If connection is successful, it returns true.
 // If connection is unsuccessful, it returns false and error.
 // The connection is closed after the function returns.
@@ -55,21 +81,47 @@ func (c *MSSQLClient) ConnectWithDB(ctx context.Context, host string, port int,
 	return memoizedconnect(ctx, executionId, host, port, username, password, dbName)
 }

+// ConnectWithOptions connects to MS SQL using the supplied connection options.
+// Prefer this over Connect/ConnectWithDB when setting timeout or database name together.
+// @example
+// ```javascript
+// const mssql = require('nuclei/mssql');
+// const client = new mssql.MSSQLClient;
+// const opts = new mssql.MSSQLOptions();
+// opts.Host = 'acme.com';
+// opts.Port = 1433;
+// opts.Username = 'sa';
+// opts.Password = 'password';
+// opts.DbName = 'master';
+// opts.Timeout = 15;
+// const connected = client.ConnectWithOptions(opts);
+// ```
+func (c *MSSQLClient) ConnectWithOptions(ctx context.Context, opts MSSQLOptions) (bool, error) {
+	executionId := ctx.Value("executionId").(string)
+	return connectWithOptions(ctx, executionId, opts)
+}
+
 // @memo
 func connect(ctx context.Context, executionId string, host string, port int, username string, password string, dbName string) (bool, error) {
-	if host == "" || port <= 0 {
+	return connectWithOptions(ctx, executionId, MSSQLOptions{
+		Host: host, Port: port, Username: username, Password: password, DbName: dbName,
+	})
+}
+
+func connectWithOptions(ctx context.Context, executionId string, opts MSSQLOptions) (bool, error) {
+	if opts.Host == "" || opts.Port <= 0 {
 		return false, fmt.Errorf("invalid host or port")
 	}
-	if !protocolstate.IsHostAllowed(executionId, host) {
+	if !protocolstate.IsHostAllowed(executionId, opts.Host) {
 		// host is not valid according to network policy
-		return false, protocolstate.ErrHostDenied.Msgf(host)
+		return false, protocolstate.ErrHostDenied.Msgf(opts.Host)
 	}

-	target := net.JoinHostPort(host, fmt.Sprintf("%d", port))
+	target := net.JoinHostPort(opts.Host, fmt.Sprintf("%d", opts.Port))

-	connString := mssqlConnString(target, username, password, dbName)
+	connString := mssqlConnString(target, opts)

-	db, err := sql.Open("sqlserver", connString)
+	db, err := openDB(executionId, connString)
 	if err != nil {
 		return false, err
 	}
@@ -156,9 +208,11 @@ func (c *MSSQLClient) ExecuteQuery(ctx context.Context, host string, port int, u
 	}

 	target := net.JoinHostPort(host, fmt.Sprintf("%d", port))
-	connString := mssqlConnString(target, username, password, dbName)
+	connString := mssqlConnString(target, MSSQLOptions{
+		Username: username, Password: password, DbName: dbName,
+	})

-	db, err := sql.Open("sqlserver", connString)
+	db, err := openDB(executionId, connString)
 	if err != nil {
 		return nil, err
 	}
@@ -184,10 +238,40 @@ func (c *MSSQLClient) ExecuteQuery(ctx context.Context, host string, port int, u
 	return data, nil
 }

-func mssqlConnString(target, username, password, dbName string) string {
-	return fmt.Sprintf("sqlserver://%s:%s@%s?database=%s&connection+timeout=30",
-		url.PathEscape(username),
-		url.PathEscape(password),
+func mssqlConnString(target string, opts MSSQLOptions) string {
+	timeout := opts.Timeout
+	if timeout <= 0 {
+		timeout = 30
+	}
+	return fmt.Sprintf("sqlserver://%s:%s@%s?database=%s&connection+timeout=%d",
+		url.PathEscape(opts.Username),
+		url.PathEscape(opts.Password),
 		target,
-		url.QueryEscape(dbName))
+		url.QueryEscape(opts.DbName),
+		timeout)
+}
+
+// openDB opens an MSSQL database using nuclei's policy-aware fastdialer.
+func openDB(executionId, connString string) (*sql.DB, error) {
+	connector, err := mssqldb.NewConnector(connString)
+	if err != nil {
+		return nil, err
+	}
+	connector.Dialer = mssqlDialer{executionId: executionId}
+	return sql.OpenDB(connector), nil
+}
+
+type mssqlDialer struct {
+	executionId string
+}
+
+func (d mssqlDialer) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
+	if !protocolstate.IsHostAllowed(d.executionId, address) {
+		return nil, protocolstate.ErrHostDenied.Msgf(address)
+	}
+	dialers := protocolstate.GetDialersWithId(d.executionId)
+	if dialers == nil {
+		return nil, fmt.Errorf("dialers not initialized for %s", d.executionId)
+	}
+	return dialers.Fastdialer.Dial(ctx, network, address)
 }
@@ -1,9 +1,13 @@
 package mssql

 import (
+	"context"
+	"strings"
 	"testing"

 	"github.com/microsoft/go-mssqldb/msdsn"
+	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
+	"github.com/projectdiscovery/nuclei/v3/pkg/types"
 	"github.com/stretchr/testify/require"
 )

@@ -14,7 +18,9 @@ func TestConnectionStringDoesNotTreatDatabaseNameAsDriverOptions(t *testing.T) {
 		"&krb5-keytabfile=/tmp/krb5.keytab" +
 		"&krb5-credcachefile=/tmp/krb5.ccache"

-	cfg, err := msdsn.Parse(mssqlConnString("127.0.0.1:1433", "user", "password", dbName))
+	cfg, err := msdsn.Parse(mssqlConnString("127.0.0.1:1433", MSSQLOptions{
+		Username: "user", Password: "password", DbName: dbName,
+	}))
 	require.NoError(t, err)

 	require.Equal(t, dbName, cfg.Database)
@@ -27,9 +33,34 @@ func TestConnectionStringDoesNotTreatDatabaseNameAsDriverOptions(t *testing.T) {
 	require.NotContains(t, cfg.Parameters, "krb5-credcachefile")
 }

+func TestConnectWithOptionsValidatesTarget(t *testing.T) {
+	connected, err := connectWithOptions(context.Background(), "test", MSSQLOptions{Port: 1433})
+	require.False(t, connected)
+	require.EqualError(t, err, "invalid host or port")
+}
+
+func TestConnectWithOptionsDeniesRestrictedLocalHostBeforeDial(t *testing.T) {
+	executionID := t.Name()
+	require.NoError(t, protocolstate.Init(&types.Options{
+		ExecutionId:                executionID,
+		RestrictLocalNetworkAccess: true,
+	}))
+	t.Cleanup(func() { protocolstate.Close(executionID) })
+
+	connected, err := connectWithOptions(context.Background(), executionID, MSSQLOptions{
+		Host: "127.0.0.1", Port: 1433,
+	})
+	require.False(t, connected)
+	require.Error(t, err)
+	require.True(t, strings.Contains(err.Error(), "network policy") && strings.Contains(err.Error(), "127.0.0.1"))
+}
+
 func TestConnectionStringKeepsPlainDatabaseName(t *testing.T) {
-	cfg, err := msdsn.Parse(mssqlConnString("127.0.0.1:1433", "user", "password", "master"))
+	cfg, err := msdsn.Parse(mssqlConnString("127.0.0.1:1433", MSSQLOptions{
+		Username: "user", Password: "password", DbName: "master", Timeout: 12,
+	}))
 	require.NoError(t, err)

 	require.Equal(t, "master", cfg.Database)
+	require.Equal(t, "12", cfg.Parameters["connection timeout"])
 }
@@ -48,6 +48,8 @@ func isMySQL(ctx context.Context, executionId string, host string, port int) (bo
 }

 // Connect connects to MySQL database using given credentials.
+//
+// Deprecated: prefer ConnectWithOptions for new templates.
 // If connection is successful, it returns true.
 // If connection is unsuccessful, it returns false and error.
 // The connection is closed after the function returns.
@@ -58,22 +60,7 @@ func isMySQL(ctx context.Context, executionId string, host string, port int) (bo
 // const connected = client.Connect('acme.com', 3306, 'username', 'password');
 // ```
 func (c *MySQLClient) Connect(ctx context.Context, host string, port int, username, password string) (bool, error) {
-	executionId := ctx.Value("executionId").(string)
-	if !protocolstate.IsHostAllowed(executionId, host) {
-		// host is not valid according to network policy
-		return false, protocolstate.ErrHostDenied.Msgf(host)
-	}
-
-	// executing queries implies the remote mysql service
-	ok, err := c.IsMySQL(ctx, host, port)
-	if err != nil {
-		return false, err
-	}
-	if !ok {
-		return false, fmt.Errorf("not a mysql service")
-	}
-
-	dsn, err := BuildDSN(MySQLOptions{
+	return c.ConnectWithOptions(ctx, MySQLOptions{
 		Host:     host,
 		Port:     port,
 		DbName:   "INFORMATION_SCHEMA",
@@ -81,6 +68,29 @@ func (c *MySQLClient) Connect(ctx context.Context, host string, port int, userna
 		Username: username,
 		Password: password,
 	})
+}
+
+// ConnectWithOptions connects to MySQL using the supplied connection options.
+func (c *MySQLClient) ConnectWithOptions(ctx context.Context, opts MySQLOptions) (bool, error) {
+	executionId := ctx.Value("executionId").(string)
+	if opts.Host == "" || opts.Port <= 0 {
+		return false, fmt.Errorf("invalid host or port")
+	}
+	if !protocolstate.IsHostAllowed(executionId, opts.Host) {
+		// host is not valid according to network policy
+		return false, protocolstate.ErrHostDenied.Msgf(opts.Host)
+	}
+
+	// executing queries implies the remote mysql service
+	ok, err := c.IsMySQL(ctx, opts.Host, opts.Port)
+	if err != nil {
+		return false, err
+	}
+	if !ok {
+		return false, fmt.Errorf("not a mysql service")
+	}
+
+	dsn, err := BuildDSN(opts)
 	if err != nil {
 		return false, err
 	}
@@ -2,11 +2,7 @@ package mysql

 import (
 	"context"
-	"fmt"
 	"net"
-	"os"
-	"path/filepath"
-	"runtime"
 	"strings"
 	"sync/atomic"
 	"testing"
@@ -173,84 +169,6 @@ func TestFingerprintMySQLDeniedByNetworkPolicy(t *testing.T) {
 	require.Contains(t, err.Error(), "127.0.0.1")
 }

-func TestConnectWithDSNDeniedByNetworkPolicy(t *testing.T) {
-	t.Parallel()
-
-	executionID := "mysql-dsn-deny-" + strings.NewReplacer("/", "-", " ", "-").Replace(t.Name())
-	require.NoError(t, protocolstate.Init(&types.Options{
-		ExecutionId:                executionID,
-		RestrictLocalNetworkAccess: true,
-	}))
-	t.Cleanup(func() { protocolstate.Close(executionID) })
-	ctx := context.WithValue(context.Background(), "executionId", executionID) //nolint:staticcheck
-
-	var accepted atomic.Int32
-	ln, err := net.Listen("tcp", "127.0.0.1:0")
-	require.NoError(t, err)
-	t.Cleanup(func() { _ = ln.Close() })
-	go func() {
-		for {
-			conn, err := ln.Accept()
-			if err != nil {
-				return
-			}
-			accepted.Add(1)
-			_ = conn.Close()
-		}
-	}()
-
-	port := ln.Addr().(*net.TCPAddr).Port
-	dsn := fmt.Sprintf("vuser:vpass@tcp(127.0.0.1:%d)/vdb", port)
-	ok, err := (&MySQLClient{}).ConnectWithDSN(ctx, dsn)
-	require.Error(t, err)
-	require.False(t, ok)
-	require.Contains(t, err.Error(), "127.0.0.1")
-	require.Zero(t, accepted.Load())
-}
-
-func TestConnectWithDSNUnixDeniedByNetworkPolicy(t *testing.T) {
-	t.Parallel()
-
-	executionID := "mysql-dsn-unix-deny-" + strings.NewReplacer("/", "-", " ", "-").Replace(t.Name())
-	require.NoError(t, protocolstate.Init(&types.Options{
-		ExecutionId:                executionID,
-		RestrictLocalNetworkAccess: true,
-	}))
-	t.Cleanup(func() { protocolstate.Close(executionID) })
-	ctx := context.WithValue(context.Background(), "executionId", executionID) //nolint:staticcheck
-
-	// t.TempDir can exceed the unix socket path limit on macOS, so use a short dir.
-	dir, err := os.MkdirTemp("", "nuclei-mysql")
-	require.NoError(t, err)
-	t.Cleanup(func() { _ = os.RemoveAll(dir) })
-	sock := filepath.Join(dir, "lna.sock")
-	ln, err := net.Listen("unix", sock)
-	if err != nil && runtime.GOOS == "windows" {
-		t.Skipf("unix sockets not available: %v", err)
-	}
-	require.NoError(t, err)
-	t.Cleanup(func() { _ = ln.Close() })
-
-	var accepted atomic.Int32
-	go func() {
-		for {
-			conn, err := ln.Accept()
-			if err != nil {
-				return
-			}
-			accepted.Add(1)
-			_ = conn.Close()
-		}
-	}()
-
-	dsn := fmt.Sprintf("vuser:vpass@unix(%s)/vdb", sock)
-	ok, err := (&MySQLClient{}).ConnectWithDSN(ctx, dsn)
-	require.Error(t, err)
-	require.False(t, ok)
-	require.Contains(t, err.Error(), "127.0.0.1")
-	require.Zero(t, accepted.Load())
-}
-
 func TestFingerprintMySQLVersionNeverEmptyOnHandshakeFixtures(t *testing.T) {
 	t.Parallel()

@@ -7,6 +7,7 @@ import (
 	"net"
 	"net/url"
 	"strings"
+	"time"

 	"github.com/go-sql-driver/mysql"
 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
@@ -51,11 +52,14 @@ func BuildDSN(opts MySQLOptions) (string, error) {
 	if opts.Protocol == "" {
 		opts.Protocol = "tcp"
 	}
-	// We're going to use a custom dialer when creating MySQL connections, so if we've been
-	// given "tcp" as the protocol, then quietly switch it to "nucleitcp", which we have
-	// already registered.
-	if opts.Protocol == "tcp" {
+	switch opts.Protocol {
+	case "tcp", "nucleitcp":
+		// We're going to use a custom dialer when creating MySQL connections, so if we've been
+		// given "tcp" as the protocol, then quietly switch it to "nucleitcp", which we have
+		// already registered with fastdialer + network policy.
 		opts.Protocol = "nucleitcp"
+	default:
+		return "", fmt.Errorf("unsupported mysql protocol %q (only tcp is allowed)", opts.Protocol)
 	}
 	if opts.DbName == "" {
 		opts.DbName = "/"
@@ -73,63 +77,52 @@ func BuildDSN(opts MySQLOptions) (string, error) {
 	if opts.RawQuery != "" {
 		dsn.WriteString(opts.RawQuery)
 	}
-	return dsn.String(), nil
+	config, err := mysql.ParseDSN(dsn.String())
+	if err != nil {
+		return "", err
+	}
+	if opts.Timeout > 0 {
+		config.Timeout = time.Duration(opts.Timeout) * time.Second
+	}
+	return config.FormatDSN(), nil
 }

-// sandboxDSN enforces local file and network policy on a MySQL DSN.
-// allowAllFiles is only honored when -lfa is enabled. tcp, tcp4 and tcp6
-// DSNs are rewritten to nucleitcp so the driver uses the fastdialer
-// registered in protocolstate. Unix sockets are treated as loopback for -lna.
-// Other networks are rejected.
-func sandboxDSN(executionId, dsn string) (string, error) {
+// sandboxDSN enforces the local file access sandbox on a MySQL DSN. The
+// driver's allowAllFiles option lets a malicious server read any local file
+// off the host via LOAD DATA LOCAL INFILE, so it is only honored when -lfa is
+// enabled, mirroring the fs.ReadFile restriction.
+// It also rewrites the network to nucleitcp so ConnectWithDSN cannot bypass
+// fastdialer / network policy via a raw tcp or unix DSN.
+func sandboxDSN(dsn string, lfaAllowed bool) (string, error) {
 	cfg, err := mysql.ParseDSN(dsn)
 	if err != nil {
 		return "", err
 	}
-	opts := &types.Options{ExecutionId: executionId}
-	if cfg.AllowAllFiles && !protocolstate.IsLfaAllowed(opts) {
+	if cfg.AllowAllFiles && !lfaAllowed {
 		cfg.AllowAllFiles = false
 	}
-
-	netName := cfg.Net
-	if netName == "" {
-		netName = "tcp"
-	}
-	switch netName {
-	case "unix":
-		// IP-based policy never sees a socket path; gate on loopback like ldapi.
-		const unixPolicyHost = "127.0.0.1"
-		if !protocolstate.IsHostAllowed(executionId, unixPolicyHost) {
-			return "", protocolstate.ErrHostDenied.Msgf(unixPolicyHost)
-		}
-	case "tcp", "tcp4", "tcp6", "nucleitcp":
-		// Only nucleitcp has a registered dialer; the others would use the
-		// driver's plain net.Dialer and skip the dial-time policy check.
+	switch cfg.Net {
+	case "", "tcp", "nucleitcp":
 		cfg.Net = "nucleitcp"
-		host := dsnPolicyHost(cfg.Addr)
-		if !protocolstate.IsHostAllowed(executionId, host) {
-			return "", protocolstate.ErrHostDenied.Msgf(host)
-		}
 	default:
-		return "", fmt.Errorf("unsupported mysql network %q", netName)
+		return "", fmt.Errorf("unsupported mysql protocol %q (only tcp is allowed)", cfg.Net)
 	}
 	return cfg.FormatDSN(), nil
 }

-func dsnPolicyHost(addr string) string {
-	host, _, err := net.SplitHostPort(addr)
-	if err == nil && host != "" {
-		return host
-	}
-	return addr
-}
-
 // openDB opens a sandboxed MySQL connection from dsn.
 func openDB(executionId, dsn string) (*sql.DB, error) {
-	dsn, err := sandboxDSN(executionId, dsn)
+	dsn, err := sandboxDSN(dsn, protocolstate.IsLfaAllowed(&types.Options{ExecutionId: executionId}))
 	if err != nil {
 		return nil, err
 	}
+	cfg, err := mysql.ParseDSN(dsn)
+	if err != nil {
+		return nil, err
+	}
+	if !protocolstate.IsHostAllowed(executionId, cfg.Addr) {
+		return nil, protocolstate.ErrHostDenied.Msgf(cfg.Addr)
+	}
 	return sql.Open("mysql", dsn)
 }

@@ -2,17 +2,75 @@ package mysql

 import (
 	"testing"
+	"time"

 	"github.com/go-sql-driver/mysql"
-	"github.com/stretchr/testify/require"
-
 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
 	"github.com/projectdiscovery/nuclei/v3/pkg/types"
+	"github.com/stretchr/testify/require"
 )

+func TestBuildDSNMapsOptions(t *testing.T) {
+	dsn, err := BuildDSN(MySQLOptions{
+		Host: "127.0.0.1", Port: 3306, Username: "user", Password: "password",
+		DbName: "app", Timeout: 7, RawQuery: "?tls=skip-verify",
+	})
+	require.NoError(t, err)
+
+	cfg, err := mysql.ParseDSN(dsn)
+	require.NoError(t, err)
+	require.Equal(t, "nucleitcp", cfg.Net)
+	require.Equal(t, "127.0.0.1:3306", cfg.Addr)
+	require.Equal(t, "app", cfg.DBName)
+	require.Equal(t, 7*time.Second, cfg.Timeout)
+	require.Equal(t, "skip-verify", cfg.TLSConfig)
+}
+
+func TestBuildDSNRejectsMissingHostOrPort(t *testing.T) {
+	_, err := BuildDSN(MySQLOptions{Port: 3306})
+	require.EqualError(t, err, "invalid host or port")
+	_, err = BuildDSN(MySQLOptions{Host: "127.0.0.1"})
+	require.EqualError(t, err, "invalid host or port")
+}
+
+func TestBuildDSNRejectsNonTCPProtocol(t *testing.T) {
+	_, err := BuildDSN(MySQLOptions{Host: "127.0.0.1", Port: 3306, Protocol: "unix"})
+	require.Error(t, err)
+	require.Contains(t, err.Error(), "unsupported mysql protocol")
+}
+
+func TestSandboxDSNForcesNucleiTCP(t *testing.T) {
+	got, err := sandboxDSN("root:x@tcp(127.0.0.1:3306)/", false)
+	require.NoError(t, err)
+
+	cfg, err := mysql.ParseDSN(got)
+	require.NoError(t, err)
+	require.Equal(t, "nucleitcp", cfg.Net)
+}
+
+func TestSandboxDSNRejectsUnixSocket(t *testing.T) {
+	_, err := sandboxDSN("root:x@unix(/var/run/mysqld.sock)/", false)
+	require.Error(t, err)
+	require.Contains(t, err.Error(), "unsupported mysql protocol")
+}
+
+func TestOpenDBDeniesRestrictedLocalHost(t *testing.T) {
+	executionID := "mysql-open-deny-" + t.Name()
+	require.NoError(t, protocolstate.Init(&types.Options{
+		ExecutionId:                executionID,
+		RestrictLocalNetworkAccess: true,
+	}))
+	t.Cleanup(func() { protocolstate.Close(executionID) })
+
+	_, err := openDB(executionID, "root:x@tcp(127.0.0.1:3306)/")
+	require.Error(t, err)
+	require.Contains(t, err.Error(), "network policy")
+	require.Contains(t, err.Error(), "127.0.0.1")
+}
+
 func TestSandboxDSN(t *testing.T) {
 	t.Run("strips allowAllFiles when lfa disabled", func(t *testing.T) {
-		got, err := sandboxDSN("", "root:x@nucleitcp(127.0.0.1:3306)/?allowAllFiles=true")
+		got, err := sandboxDSN("root:x@nucleitcp(127.0.0.1:3306)/?allowAllFiles=true", false)
 		require.NoError(t, err)

 		cfg, err := mysql.ParseDSN(got)
@@ -21,14 +79,7 @@ func TestSandboxDSN(t *testing.T) {
 	})

 	t.Run("keeps allowAllFiles when lfa enabled", func(t *testing.T) {
-		executionID := "mysql-lfa-" + t.Name()
-		require.NoError(t, protocolstate.Init(&types.Options{
-			ExecutionId:          executionID,
-			AllowLocalFileAccess: true,
-		}))
-		t.Cleanup(func() { protocolstate.Close(executionID) })
-
-		got, err := sandboxDSN(executionID, "root:x@nucleitcp(127.0.0.1:3306)/?allowAllFiles=true")
+		got, err := sandboxDSN("root:x@nucleitcp(127.0.0.1:3306)/?allowAllFiles=true", true)
 		require.NoError(t, err)

 		cfg, err := mysql.ParseDSN(got)
@@ -37,7 +88,7 @@ func TestSandboxDSN(t *testing.T) {
 	})

 	t.Run("leaves dsn without allowAllFiles untouched", func(t *testing.T) {
-		got, err := sandboxDSN("", "root:x@nucleitcp(127.0.0.1:3306)/")
+		got, err := sandboxDSN("root:x@nucleitcp(127.0.0.1:3306)/", false)
 		require.NoError(t, err)

 		cfg, err := mysql.ParseDSN(got)
@@ -45,80 +96,8 @@ func TestSandboxDSN(t *testing.T) {
 		require.False(t, cfg.AllowAllFiles)
 	})

-	t.Run("rewrites tcp to nucleitcp", func(t *testing.T) {
-		got, err := sandboxDSN("", "root:x@tcp(acme.com:3306)/")
-		require.NoError(t, err)
-
-		cfg, err := mysql.ParseDSN(got)
-		require.NoError(t, err)
-		require.Equal(t, "nucleitcp", cfg.Net)
-		require.Equal(t, "acme.com:3306", cfg.Addr)
-	})
-
-	t.Run("rewrites tcp4 and tcp6 to nucleitcp", func(t *testing.T) {
-		for _, netName := range []string{"tcp4", "tcp6"} {
-			got, err := sandboxDSN("", "root:x@"+netName+"(acme.com:3306)/")
-			require.NoError(t, err)
-
-			cfg, err := mysql.ParseDSN(got)
-			require.NoError(t, err)
-			require.Equal(t, "nucleitcp", cfg.Net)
-			require.Equal(t, "acme.com:3306", cfg.Addr)
-		}
-	})
-
-	t.Run("rejects unsupported network", func(t *testing.T) {
-		_, err := sandboxDSN("", "root:x@udp(acme.com:3306)/")
-		require.Error(t, err)
-		require.Contains(t, err.Error(), "udp")
-	})
-
 	t.Run("errors on invalid dsn", func(t *testing.T) {
-		_, err := sandboxDSN("", "::not-a-dsn::")
+		_, err := sandboxDSN("::not-a-dsn::", false)
 		require.Error(t, err)
 	})
-
-	t.Run("denies loopback tcp when lna enabled", func(t *testing.T) {
-		executionID := "mysql-lna-tcp-" + t.Name()
-		require.NoError(t, protocolstate.Init(&types.Options{
-			ExecutionId:                executionID,
-			RestrictLocalNetworkAccess: true,
-		}))
-		t.Cleanup(func() { protocolstate.Close(executionID) })
-
-		_, err := sandboxDSN(executionID, "vuser:vpass@tcp(127.0.0.1:3306)/vdb")
-		require.Error(t, err)
-		require.Contains(t, err.Error(), "127.0.0.1")
-	})
-
-	t.Run("denies loopback variants when lna enabled", func(t *testing.T) {
-		executionID := "mysql-lna-variants-" + t.Name()
-		require.NoError(t, protocolstate.Init(&types.Options{
-			ExecutionId:                executionID,
-			RestrictLocalNetworkAccess: true,
-		}))
-		t.Cleanup(func() { protocolstate.Close(executionID) })
-
-		for _, dsn := range []string{
-			"vuser:vpass@tcp4(127.0.0.1:3306)/vdb",
-			"vuser:vpass@tcp6([::1]:3306)/vdb",
-			"vuser:vpass@tcp([::ffff:127.0.0.1]:3306)/vdb",
-		} {
-			_, err := sandboxDSN(executionID, dsn)
-			require.Error(t, err, dsn)
-		}
-	})
-
-	t.Run("denies unix socket when lna enabled", func(t *testing.T) {
-		executionID := "mysql-lna-unix-" + t.Name()
-		require.NoError(t, protocolstate.Init(&types.Options{
-			ExecutionId:                executionID,
-			RestrictLocalNetworkAccess: true,
-		}))
-		t.Cleanup(func() { protocolstate.Close(executionID) })
-
-		_, err := sandboxDSN(executionID, "vuser:vpass@unix(/tmp/nuclei-mysql-lna.sock)/vdb")
-		require.Error(t, err)
-		require.Contains(t, err.Error(), "127.0.0.1")
-	})
 }
@@ -39,6 +39,15 @@ type (
 	OracleClient struct {
 		connector *goora.OracleConnector
 	}
+
+	// OracleOptions defines the connection options for an Oracle database.
+	OracleOptions struct {
+		Host        string
+		Port        int
+		ServiceName string
+		Username    string
+		Password    string
+	}
 )

 // IsOracle checks if a host is running an Oracle server
@@ -56,6 +65,9 @@ func (c *OracleClient) IsOracle(ctx context.Context, host string, port int) (IsO
 // @memo
 func isOracle(ctx context.Context, executionId string, host string, port int) (IsOracleResponse, error) {
 	resp := IsOracleResponse{}
+	if !protocolstate.IsHostAllowed(executionId, host) {
+		return resp, protocolstate.ErrHostDenied.Msgf(host)
+	}

 	dialer := protocolstate.GetDialersWithId(executionId)
 	if dialer == nil {
@@ -90,15 +102,24 @@ func (c *OracleClient) oracleDbInstance(ctx context.Context, connStr string, exe
 	if err != nil {
 		return nil, err
 	}
-
-	if c.connector == nil {
-		connector := goora.NewConnector(connStr)
-		oraConnector, ok := connector.(*goora.OracleConnector)
-		if !ok {
-			return nil, fmt.Errorf("failed to cast connector to OracleConnector")
-		}
-		c.connector = oraConnector
+	config, err := goora.ParseConfig(connStr)
+	if err != nil {
+		return nil, err
 	}
+	for _, server := range config.Servers {
+		if !protocolstate.IsHostAllowed(executionId, server.Addr) {
+			return nil, protocolstate.ErrHostDenied.Msgf(server.Addr)
+		}
+	}
+
+	connector := goora.NewConnector(connStr)
+	oraConnector, ok := connector.(*goora.OracleConnector)
+	if !ok {
+		return nil, fmt.Errorf("failed to cast connector to OracleConnector")
+	}
+	// A connector embeds its DSN, so replace it for each invocation to ensure
+	// option changes and the sandboxed DSN are applied to the actual dial.
+	c.connector = oraConnector

 	// Refresh the dialer on every call so the connector uses the current
 	// execution context instead of a stale or already-canceled one.
@@ -149,7 +170,9 @@ func isOracleTracePathOption(key string) bool {
 	}
 }

-// Connect connects to an Oracle database
+// Connect connects to an Oracle database.
+//
+// Deprecated: prefer ConnectWithOptions for new templates.
 // @example
 // ```javascript
 // const oracle = require('nuclei/oracle');
@@ -157,8 +180,24 @@ func isOracleTracePathOption(key string) bool {
 // client.Connect('acme.com', 1521, 'XE', 'user', 'password');
 // ```
 func (c *OracleClient) Connect(ctx context.Context, host string, port int, serviceName string, username string, password string) (bool, error) {
-	connStr := goora.BuildUrl(host, port, serviceName, username, password, nil)
+	return c.ConnectWithOptions(ctx, OracleOptions{
+		Host: host, Port: port, ServiceName: serviceName, Username: username, Password: password,
+	})
+}

+// ConnectWithOptions connects to Oracle using the supplied connection options.
+func (c *OracleClient) ConnectWithOptions(ctx context.Context, opts OracleOptions) (bool, error) {
+	executionId := ctx.Value("executionId").(string)
+	if opts.Host == "" || opts.Port <= 0 {
+		return false, fmt.Errorf("invalid host or port")
+	}
+	if !protocolstate.IsHostAllowed(executionId, opts.Host) {
+		return false, protocolstate.ErrHostDenied.Msgf(opts.Host)
+	}
+	connStr, err := buildOracleDSN(opts)
+	if err != nil {
+		return false, err
+	}
 	return c.ConnectWithDSN(ctx, connStr)
 }

@@ -187,6 +226,16 @@ func (c *OracleClient) ConnectWithDSN(ctx context.Context, dsn string) (bool, er
 	return true, nil
 }

+func buildOracleDSN(opts OracleOptions) (string, error) {
+	if opts.Host == "" || opts.Port <= 0 {
+		return "", fmt.Errorf("invalid host or port")
+	}
+	if opts.ServiceName == "" {
+		return "", fmt.Errorf("service name cannot be empty")
+	}
+	return goora.BuildUrl(opts.Host, opts.Port, opts.ServiceName, opts.Username, opts.Password, nil), nil
+}
+
 // ExecuteQuery connects to MS SQL database using given credentials and executes a query.
 // It returns the results of the query or an error if something goes wrong.
 // @example
@@ -100,3 +100,42 @@ func restoreOracleTemplatesDir(t *testing.T, templatesDir string) {
 		config.DefaultConfig.SetTemplatesDir(oldTemplatesDir)
 	})
 }
+
+func TestBuildOracleDSNMapsOptions(t *testing.T) {
+	dsn, err := buildOracleDSN(OracleOptions{
+		Host: "127.0.0.1", Port: 1521, ServiceName: "XE", Username: "user", Password: "pass",
+	})
+	require.NoError(t, err)
+
+	cfg, err := go_ora.ParseConfig(dsn)
+	require.NoError(t, err)
+	require.Len(t, cfg.Servers, 1)
+	require.Equal(t, "127.0.0.1", cfg.Servers[0].Addr)
+	require.Equal(t, 1521, cfg.Servers[0].Port)
+	require.Equal(t, "XE", cfg.ServiceName)
+}
+
+func TestBuildOracleDSNValidatesTarget(t *testing.T) {
+	_, err := buildOracleDSN(OracleOptions{Port: 1521, ServiceName: "XE"})
+	require.EqualError(t, err, "invalid host or port")
+	_, err = buildOracleDSN(OracleOptions{Host: "127.0.0.1", Port: 1521})
+	require.EqualError(t, err, "service name cannot be empty")
+}
+
+func TestConnectWithOptionsDeniesRestrictedLocalHostBeforeDial(t *testing.T) {
+	executionID := t.Name()
+	require.NoError(t, protocolstate.Init(&types.Options{
+		ExecutionId:                executionID,
+		RestrictLocalNetworkAccess: true,
+	}))
+	t.Cleanup(func() { protocolstate.Close(executionID) })
+
+	ctx := context.WithValue(context.Background(), "executionId", executionID) // nolint:staticcheck
+	connected, err := (&OracleClient{}).ConnectWithOptions(ctx, OracleOptions{
+		Host: "127.0.0.1", Port: 1521, ServiceName: "XE", Username: "user", Password: "pass",
+	})
+	require.False(t, connected)
+	require.Error(t, err)
+	require.Contains(t, err.Error(), "network policy")
+	require.Contains(t, err.Error(), "127.0.0.1")
+}
@@ -2,6 +2,7 @@ package postgres

 import (
 	"context"
+	"crypto/tls"
 	"fmt"
 	"net"
 	"net/url"
@@ -25,6 +26,17 @@ type (
 	// const client = new postgres.PGClient;
 	// ```
 	PGClient struct{}
+
+	// PostgresOptions defines the connection options for a Postgres database.
+	PostgresOptions struct {
+		Host     string
+		Port     int
+		Username string
+		Password string
+		DbName   string
+		Timeout  int // Timeout is in seconds.
+		SSLMode  string
+	}
 )

 // IsPostgres checks if the given host and port are running Postgres database.
@@ -45,6 +57,9 @@ func (c *PGClient) IsPostgres(ctx context.Context, host string, port int) (bool,
 func isPostgres(ctx context.Context, executionId string, host string, port int) (bool, error) {
 	timeout := 10 * time.Second

+	if !protocolstate.IsHostAllowed(executionId, host) {
+		return false, protocolstate.ErrHostDenied.Msgf(host)
+	}
 	dialer := protocolstate.GetDialersWithId(executionId)
 	if dialer == nil {
 		return false, fmt.Errorf("dialers not initialized for %s", executionId)
@@ -72,6 +87,8 @@ func isPostgres(ctx context.Context, executionId string, host string, port int)
 }

 // Connect connects to Postgres database using given credentials.
+//
+// Deprecated: prefer ConnectWithOptions for new templates.
 // If connection is successful, it returns true.
 // If connection is unsuccessful, it returns false and error.
 // The connection is closed after the function returns.
@@ -93,6 +110,25 @@ func (c *PGClient) Connect(ctx context.Context, host string, port int, username
 	return memoizedconnect(ctx, executionId, host, port, username, password, "postgres")
 }

+// ConnectWithOptions connects to Postgres using the supplied connection options.
+func (c *PGClient) ConnectWithOptions(ctx context.Context, opts PostgresOptions) (bool, error) {
+	if opts.Host == "" || opts.Port <= 0 {
+		return false, fmt.Errorf("invalid host or port")
+	}
+	if _, err := postgresTLSConfig(opts.SSLMode, opts.Host); err != nil {
+		return false, err
+	}
+	ok, err := c.IsPostgres(ctx, opts.Host, opts.Port)
+	if err != nil {
+		return false, err
+	}
+	if !ok {
+		return false, fmt.Errorf("not a postgres service")
+	}
+	executionId := ctx.Value("executionId").(string)
+	return connectWithOptions(ctx, executionId, opts)
+}
+
 // ExecuteQuery connects to Postgres database using given credentials and database name.
 // and executes a query on the db.
 // If connection is successful, it returns the result of the query.
@@ -147,19 +183,31 @@ func executeQuery(ctx context.Context, executionId string, host string, port int
 }

 func buildPostgresConnURL(username, password, target, dbName, executionId string) string {
+	return buildPostgresConnURLWithOptions(PostgresOptions{
+		Username: username, Password: password, DbName: dbName,
+	}, target, executionId)
+}
+
+func buildPostgresConnURLWithOptions(opts PostgresOptions, target, executionId string) string {
 	values := url.Values{}
-	values.Set("sslmode", "disable")
+	sslMode := opts.SSLMode
+	if sslMode == "" {
+		sslMode = "disable"
+	}
+	values.Set("sslmode", sslMode)
 	values.Set("executionId", executionId)

 	return fmt.Sprintf("postgres://%s@%s/%s?%s",
-		url.UserPassword(username, password).String(),
+		url.UserPassword(opts.Username, opts.Password).String(),
 		target,
-		url.PathEscape(dbName),
+		url.PathEscape(opts.DbName),
 		values.Encode(),
 	)
 }

 // ConnectWithDB connects to Postgres database using given credentials and database name.
+//
+// Deprecated: prefer ConnectWithOptions for new templates.
 // If connection is successful, it returns true.
 // If connection is unsuccessful, it returns false and error.
 // The connection is closed after the function returns.
@@ -185,16 +233,26 @@ func (c *PGClient) ConnectWithDB(ctx context.Context, host string, port int, use

 // @memo
 func connect(ctx context.Context, executionId string, host string, port int, username string, password string, dbName string) (bool, error) {
-	if host == "" || port <= 0 {
+	return connectWithOptions(ctx, executionId, PostgresOptions{
+		Host: host, Port: port, Username: username, Password: password, DbName: dbName,
+	})
+}
+
+func connectWithOptions(ctx context.Context, executionId string, opts PostgresOptions) (bool, error) {
+	if opts.Host == "" || opts.Port <= 0 {
 		return false, fmt.Errorf("invalid host or port")
 	}

-	if !protocolstate.IsHostAllowed(executionId, host) {
+	if !protocolstate.IsHostAllowed(executionId, opts.Host) {
 		// host is not valid according to network policy
-		return false, protocolstate.ErrHostDenied.Msgf(host)
+		return false, protocolstate.ErrHostDenied.Msgf(opts.Host)
 	}

-	target := net.JoinHostPort(host, fmt.Sprintf("%d", port))
+	target := net.JoinHostPort(opts.Host, fmt.Sprintf("%d", opts.Port))
+	tlsConfig, err := postgresTLSConfig(opts.SSLMode, opts.Host)
+	if err != nil {
+		return false, err
+	}

 	execCtx, cancel := context.WithCancel(ctx)
 	defer cancel()
@@ -205,21 +263,25 @@ func connect(ctx context.Context, executionId string, host string, port int, use
 	}

 	db := pg.Connect(&pg.Options{
-		Addr:     target,
-		User:     username,
-		Password: password,
-		Database: dbName,
+		Addr:         target,
+		User:         opts.Username,
+		Password:     opts.Password,
+		Database:     opts.DbName,
+		TLSConfig:    tlsConfig,
+		DialTimeout:  postgresTimeout(opts.Timeout),
+		ReadTimeout:  postgresTimeout(opts.Timeout),
+		WriteTimeout: postgresTimeout(opts.Timeout),
 		Dialer: func(dialCtx context.Context, network, addr string) (net.Conn, error) {
 			return dialer.Fastdialer.Dial(dialCtx, network, addr)
 		},
 		IdleCheckFrequency: -1,
-	}).WithTimeout(10 * time.Second)
+	}).WithTimeout(postgresTimeout(opts.Timeout))

 	defer func() {
 		_ = db.Close()
 	}()

-	_, err := db.ExecContext(execCtx, "select 1")
+	_, err = db.ExecContext(execCtx, "select 1")
 	if err != nil {
 		switch true {
 		case strings.Contains(err.Error(), "connect: connection refused"):
@@ -237,3 +299,30 @@ func connect(ctx context.Context, executionId string, host string, port int, use
 	}
 	return true, nil
 }
+
+func postgresTimeout(timeout int) time.Duration {
+	if timeout > 0 {
+		return time.Duration(timeout) * time.Second
+	}
+	return 10 * time.Second
+}
+
+func postgresTLSConfig(sslMode, host string) (*tls.Config, error) {
+	switch sslMode {
+	case "", "disable":
+		return nil, nil
+	case "allow", "prefer":
+		// go-pg cannot implement libpq's ordered plaintext/TLS fallback.
+		return nil, fmt.Errorf("postgres sslmode %q is unsupported: TLS fallback is unavailable", sslMode)
+	case "require", "verify-ca", "verify-full":
+		// Always verify both the certificate chain and hostname. This intentionally
+		// hardens require and verify-ca because the options API has no safe way to
+		// configure a custom CA-only verifier without disabling the standard check.
+		return &tls.Config{
+			ServerName: host,
+			MinVersion: tls.VersionTLS12,
+		}, nil
+	default:
+		return nil, fmt.Errorf("unsupported postgres sslmode %q", sslMode)
+	}
+}
@@ -1,11 +1,14 @@
 package postgres

 import (
+	"context"
 	"net/url"
 	"strings"
 	"testing"

 	"github.com/lib/pq"
+	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
+	"github.com/projectdiscovery/nuclei/v3/pkg/types"
 )

 func TestBuildPostgresConnectionURLDoesNotAllowDBNameQueryInjection(t *testing.T) {
@@ -72,3 +75,82 @@ func TestBuildPostgresConnectionURLEscapesCredentials(t *testing.T) {
 		t.Fatalf("database name = %q, want postgres", got)
 	}
 }
+
+func TestBuildPostgresConnectionURLMapsOptions(t *testing.T) {
+	connStr := buildPostgresConnURLWithOptions(PostgresOptions{
+		Username: "user", Password: "password", DbName: "app", SSLMode: "require",
+	}, "127.0.0.1:5432", "exec-1")
+
+	u, err := url.Parse(connStr)
+	if err != nil {
+		t.Fatalf("parse connection URL: %v", err)
+	}
+	if got := u.Query().Get("sslmode"); got != "require" {
+		t.Fatalf("sslmode = %q, want require", got)
+	}
+	if got := strings.TrimPrefix(u.Path, "/"); got != "app" {
+		t.Fatalf("database name = %q, want app", got)
+	}
+}
+
+func TestPostgresTimeout(t *testing.T) {
+	if got := postgresTimeout(3); got.String() != "3s" {
+		t.Fatalf("timeout = %s, want 3s", got)
+	}
+	if got := postgresTimeout(0); got.String() != "10s" {
+		t.Fatalf("default timeout = %s, want 10s", got)
+	}
+}
+
+func TestPostgresTLSConfigMapsSSLMode(t *testing.T) {
+	tlsConfig, err := postgresTLSConfig("require", "db.example.com")
+	if err != nil {
+		t.Fatalf("map require SSL mode: %v", err)
+	}
+	if tlsConfig == nil || tlsConfig.ServerName != "db.example.com" || tlsConfig.InsecureSkipVerify {
+		t.Fatalf("require SSL mode should enable verified TLS, got %+v", tlsConfig)
+	}
+
+	tlsConfig, err = postgresTLSConfig("disable", "db.example.com")
+	if err != nil {
+		t.Fatalf("map disable SSL mode: %v", err)
+	}
+	if tlsConfig != nil {
+		t.Fatal("disable SSL mode should not configure TLS")
+	}
+	if _, err := postgresTLSConfig("invalid", "db.example.com"); err == nil {
+		t.Fatal("expected unsupported SSL mode error")
+	}
+	for _, mode := range []string{"allow", "prefer"} {
+		if _, err := postgresTLSConfig(mode, "db.example.com"); err == nil {
+			t.Fatalf("expected unsupported %s SSL mode error", mode)
+		}
+	}
+
+	tlsConfig, err = postgresTLSConfig("verify-full", "db.example.com")
+	if err != nil {
+		t.Fatalf("map verify-full SSL mode: %v", err)
+	}
+	if tlsConfig == nil || tlsConfig.ServerName != "db.example.com" || tlsConfig.InsecureSkipVerify {
+		t.Fatalf("verify-full should set ServerName and verify certs, got %+v", tlsConfig)
+	}
+}
+
+func TestConnectWithOptionsDeniesRestrictedLocalHostBeforeDial(t *testing.T) {
+	executionID := t.Name()
+	if err := protocolstate.Init(&types.Options{
+		ExecutionId:                executionID,
+		RestrictLocalNetworkAccess: true,
+	}); err != nil {
+		t.Fatal(err)
+	}
+	t.Cleanup(func() { protocolstate.Close(executionID) })
+
+	ctx := context.WithValue(context.Background(), "executionId", executionID) // nolint:staticcheck
+	connected, err := (&PGClient{}).ConnectWithOptions(ctx, PostgresOptions{
+		Host: "127.0.0.1", Port: 5432, SSLMode: "require",
+	})
+	if connected || err == nil || !strings.Contains(err.Error(), "network policy") {
+		t.Fatalf("expected network-policy denial before dialing, got connected=%t err=%v", connected, err)
+	}
+}
@@ -3,6 +3,7 @@ package redis

 import (
 	"context"
+
 	"errors"

 	"fmt"
@@ -3,12 +3,13 @@ package redis
 import (
 	"bytes"
 	"context"
+	"errors"
 	"fmt"
+	"io"
 	"net"
 	"strconv"
 	"time"

-	"github.com/projectdiscovery/gologger"
 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
 	"github.com/redis/go-redis/v9"

@@ -16,6 +17,26 @@ import (
 	pluginsredis "github.com/praetorian-inc/fingerprintx/pkg/plugins/services/redis"
 )

+// RedisOptions defines the connection options for a Redis server.
+// @example
+// ```javascript
+// const redis = require('nuclei/redis');
+// const opts = new redis.RedisOptions();
+// opts.Host = 'acme.com';
+// opts.Port = 6379;
+// opts.Password = 'password';
+// opts.DB = 0;
+// opts.Timeout = 10;
+// const connected = redis.ConnectWithOptions(opts);
+// ```
+type RedisOptions struct {
+	Host     string // Host is the hostname or IP of the Redis server.
+	Port     int    // Port is the Redis port (usually 6379).
+	Password string // Password is the Redis AUTH password.
+	DB       int    // DB is the Redis database index.
+	Timeout  int    // Timeout is the dial/read/write timeout in seconds.
+}
+
 // GetServerInfo returns the server info for a redis server
 // @example
 // ```javascript
@@ -34,7 +55,7 @@ func getServerInfo(ctx context.Context, executionId string, host string, port in
 		return "", protocolstate.ErrHostDenied.Msgf(host)
 	}
 	// create a new client
-	client := newClient(fmt.Sprintf("%s:%d", host, port), "")
+	client := newClient(executionId, RedisOptions{Host: host, Port: port})
 	defer func() {
 		_ = client.Close()
 	}()
@@ -54,7 +75,9 @@ func getServerInfo(ctx context.Context, executionId string, host string, port in
 	return infoCmd.Val(), nil
 }

-// Connect tries to connect redis server with password
+// Connect tries to connect redis server with password.
+//
+// Deprecated: prefer ConnectWithOptions for new templates.
 // @example
 // ```javascript
 // const redis = require('nuclei/redis');
@@ -65,14 +88,37 @@ func Connect(ctx context.Context, host string, port int, password string) (bool,
 	return memoizedconnect(ctx, executionId, host, port, password)
 }

+// ConnectWithOptions tries to connect to Redis using the supplied options.
+// @example
+// ```javascript
+// const redis = require('nuclei/redis');
+// const opts = new redis.RedisOptions();
+// opts.Host = 'acme.com';
+// opts.Port = 6379;
+// opts.Password = 'password';
+// opts.DB = 1;
+// const connected = redis.ConnectWithOptions(opts);
+// ```
+func ConnectWithOptions(ctx context.Context, opts RedisOptions) (bool, error) {
+	executionId := ctx.Value("executionId").(string)
+	return connectWithOptions(ctx, executionId, opts)
+}
+
 // @memo
 func connect(ctx context.Context, executionId string, host string, port int, password string) (bool, error) {
-	if !protocolstate.IsHostAllowed(executionId, host) {
+	return connectWithOptions(ctx, executionId, RedisOptions{Host: host, Port: port, Password: password})
+}
+
+func connectWithOptions(ctx context.Context, executionId string, opts RedisOptions) (bool, error) {
+	if opts.Host == "" || opts.Port <= 0 {
+		return false, fmt.Errorf("invalid host or port")
+	}
+	if !protocolstate.IsHostAllowed(executionId, opts.Host) {
 		// host is not valid according to network policy
-		return false, protocolstate.ErrHostDenied.Msgf(host)
+		return false, protocolstate.ErrHostDenied.Msgf(opts.Host)
 	}
 	// create a new client
-	client := newClient(fmt.Sprintf("%s:%d", host, port), password)
+	client := newClient(executionId, opts)
 	defer func() {
 		_ = client.Close()
 	}()
@@ -90,6 +136,35 @@ func connect(ctx context.Context, executionId string, host string, port int, pas
 	return true, nil
 }

+func redisClientOptions(executionId string, opts RedisOptions) *redis.Options {
+	clientOpts := &redis.Options{
+		Addr:     fmt.Sprintf("%s:%d", opts.Host, opts.Port),
+		Password: opts.Password,
+		DB:       opts.DB,
+		Dialer:   redisDialer(executionId),
+	}
+	if opts.Timeout > 0 {
+		timeout := time.Duration(opts.Timeout) * time.Second
+		clientOpts.DialTimeout = timeout
+		clientOpts.ReadTimeout = timeout
+		clientOpts.WriteTimeout = timeout
+	}
+	return clientOpts
+}
+
+func redisDialer(executionId string) func(context.Context, string, string) (net.Conn, error) {
+	return func(ctx context.Context, network, address string) (net.Conn, error) {
+		if !protocolstate.IsHostAllowed(executionId, address) {
+			return nil, protocolstate.ErrHostDenied.Msgf(address)
+		}
+		dialers := protocolstate.GetDialersWithId(executionId)
+		if dialers == nil {
+			return nil, fmt.Errorf("dialers not initialized for %s", executionId)
+		}
+		return dialers.Fastdialer.Dial(ctx, network, address)
+	}
+}
+
 // GetServerInfoAuth returns the server info for a redis server
 // @example
 // ```javascript
@@ -108,7 +183,7 @@ func getServerInfoAuth(ctx context.Context, executionId string, host string, por
 		return "", protocolstate.ErrHostDenied.Msgf(host)
 	}
 	// create a new client
-	client := newClient(fmt.Sprintf("%s:%d", host, port), password)
+	client := newClient(executionId, RedisOptions{Host: host, Port: port, Password: password})
 	defer func() {
 		_ = client.Close()
 	}()
@@ -141,6 +216,9 @@ func IsAuthenticated(ctx context.Context, host string, port int) (bool, error) {

 // @memo
 func isAuthenticated(ctx context.Context, executionId string, host string, port int) (bool, error) {
+	if !protocolstate.IsHostAllowed(executionId, host) {
+		return false, protocolstate.ErrHostDenied.Msgf(host)
+	}
 	plugin := pluginsredis.REDISPlugin{}
 	timeout := 5 * time.Second
 	dialer := protocolstate.GetDialersWithId(executionId)
@@ -179,7 +257,7 @@ func RunLuaScript(ctx context.Context, host string, port int, password string, s
 		return false, protocolstate.ErrHostDenied.Msgf(host)
 	}
 	// create a new client
-	client := newClient(fmt.Sprintf("%s:%d", host, port), password)
+	client := newClient(executionId, RedisOptions{Host: host, Port: port, Password: password})
 	defer func() {
 		_ = client.Close()
 	}()
@@ -266,14 +344,9 @@ var errReadLimit = fmt.Errorf("redis: reply exceeds %d bytes", maxReadBytes)

 // newClient is redis.NewClient on the default dialer, with each connection's reads capped at
 // maxReadBytes.
-func newClient(addr, password string) *redis.Client {
-	opts := &redis.Options{
-		Addr:          addr,
-		Password:      password,
-		DB:            0,
-		DialerRetries: dialAttempts,
-	}
-	dial := redis.NewDialer(opts)
+func newClient(executionId string, redisOpts RedisOptions) *redis.Client {
+	opts := redisClientOptions(executionId, redisOpts)
+	dial := opts.Dialer
 	opts.Dialer = func(ctx context.Context, network, addr string) (net.Conn, error) {
 		conn, err := dial(ctx, network, addr)
 		if err != nil {
@@ -285,134 +358,138 @@ func newClient(addr, password string) *redis.Client {
 	return redis.NewClient(opts)
 }

-// maxHeaderLen fits a type byte, any int64, and "\r". Redis never sends a longer length header.
-const maxHeaderLen = 32
-
-// limitedConn fails a read once remaining is spent, and ends a read before the "\n" of a RESP
-// length header whose declared size is over the cap, so go-redis never gets the line to allocate
-// from.
-//
-// It follows the reply's framing as the bytes pass: a bulk payload is skipped by its declared
-// length, so only header lines are checked. A payload line such as "*abc" is data.
+// limitedConn fails a read once remaining is spent, and withholds a RESP length line whose
+// declared size is over the cap so go-redis never allocates it.
 type limitedConn struct {
 	net.Conn
 	remaining int64
-	// payload is how many bytes of the current bulk payload, "\r\n" included, are still to come.
-	payload int64
-	// header is the start of the current header line, without its "\n".
-	header   []byte
-	overlong bool
-	err      error
+	pending   []byte
+	partial   []byte
+	err       error
+	scratch   [32 << 10]byte
 }

 func (c *limitedConn) Read(b []byte) (int, error) {
-	if c.err != nil {
-		return 0, c.err
-	}
-	if c.remaining <= 0 {
-		return 0, errReadLimit
-	}
-	if int64(len(b)) > c.remaining {
-		b = b[:c.remaining]
-	}
-	n, err := c.Conn.Read(b)
-	c.remaining -= int64(n)
-	// Errors from the connection, deadlines included, are returned as they come and not kept: a
-	// read deadline belongs to one call. go-redis peeks for push notifications with a few
-	// microseconds of deadline, and keeping that timeout would fail the command that follows.
-	kept, scanErr := c.scan(b[:n])
-	if scanErr == nil {
-		return n, err
-	}
-	c.err = scanErr
-	if kept == 0 {
-		return 0, scanErr
-	}
-	return kept, nil
-}
-
-// scan follows the RESP framing of p and returns how many of its bytes may be returned.
-func (c *limitedConn) scan(p []byte) (int, error) {
-	for i := 0; i < len(p); {
-		if c.payload > 0 {
-			skip := min(c.payload, int64(len(p)-i))
-			c.payload -= skip
-			i += int(skip)
-			continue
-		}
-		end := bytes.IndexByte(p[i:], '\n')
-		if end < 0 {
-			c.keepHeader(p[i:])
-			return len(p), nil
-		}
-		c.keepHeader(p[i : i+end])
-		payload, err := declaredPayload(c.header, c.overlong)
-		c.header, c.overlong = c.header[:0], false
-		if err != nil {
-			return i + end, err
-		}
-		c.payload = payload
-		i += end + 1
-	}
-	return len(p), nil
-}
-
-func (c *limitedConn) keepHeader(p []byte) {
-	if room := maxHeaderLen - len(c.header); len(p) > room {
-		p = p[:room]
-		c.overlong = true
-	}
-	c.header = append(c.header, p...)
-}
-
-// declaredPayload returns how many payload bytes, "\r\n" included, follow a RESP header line
-// given without its "\n". It returns errReadLimit when go-redis would allocate more than the cap
-// from the line: the declared byte length for bulk strings, one interface per declared element
-// for arrays, sets, maps, attributes, and pushes.
-func declaredPayload(line []byte, overlong bool) (int64, error) {
-	if len(line) == 0 {
+	if len(b) == 0 {
 		return 0, nil
 	}
+	if len(c.pending) == 0 {
+		if err := c.fill(); err != nil {
+			return 0, err
+		}
+	}
+	n := copy(b, c.pending)
+	c.pending = c.pending[n:]
+	return n, nil
+}
+
+func (c *limitedConn) fill() error {
+	if len(c.pending) > 0 {
+		return nil
+	}
+	if c.err != nil {
+		return c.err
+	}
+	for len(c.pending) == 0 {
+		if c.remaining <= 0 {
+			c.err = errReadLimit
+			return c.err
+		}
+		want := int64(len(c.scratch))
+		if want > c.remaining {
+			want = c.remaining
+		}
+		n, err := c.Conn.Read(c.scratch[:want])
+		if n > 0 {
+			c.remaining -= int64(n)
+			if aerr := c.accept(c.scratch[:n]); aerr != nil {
+				c.err = aerr
+				if len(c.pending) > 0 {
+					return nil
+				}
+				return aerr
+			}
+		}
+		if err != nil {
+			// A read deadline belongs to one call. go-redis peeks for push notifications
+			// with a few microseconds of deadline, and on Windows that peek always runs.
+			// Keeping the timeout fails the command that follows.
+			if timeoutErr(err) {
+				if len(c.pending) > 0 {
+					return nil
+				}
+				return err
+			}
+			c.err = err
+			if len(c.pending) > 0 {
+				return nil
+			}
+			return err
+		}
+		if n == 0 {
+			c.err = io.ErrUnexpectedEOF
+			return c.err
+		}
+	}
+	return nil
+}
+
+func (c *limitedConn) accept(p []byte) error {
+	c.partial = append(c.partial, p...)
+	for {
+		i := bytes.IndexByte(c.partial, '\n')
+		if i < 0 {
+			if int64(len(c.partial)) > maxReadBytes {
+				c.partial = nil
+				return errReadLimit
+			}
+			return nil
+		}
+		line := c.partial[:i+1]
+		if lengthTooLarge(line) {
+			c.partial = nil
+			return errReadLimit
+		}
+		copied := make([]byte, len(line))
+		copy(copied, line)
+		c.pending = append(c.pending, copied...)
+		rest := make([]byte, len(c.partial)-(i+1))
+		copy(rest, c.partial[i+1:])
+		c.partial = rest
+	}
+}
+
+// lengthTooLarge reports whether line is a RESP length header go-redis would allocate from.
+// Bulk strings allocate the declared byte length. Arrays, sets, maps, attributes, and pushes
+// allocate one interface per declared element.
+func lengthTooLarge(line []byte) bool {
+	if len(line) < 3 {
+		return false
+	}
 	var limit int64
-	bulk := false
 	switch line[0] {
 	case '$', '=', '!':
-		limit, bulk = maxReadBytes, true
+		limit = maxReadBytes
 	case '*', '~', '>', '%', '|':
 		limit = maxAggregate
 	default:
-		return 0, nil
+		return false
 	}
-	if overlong {
-		return 0, errReadLimit
+	body := line[1 : len(line)-1]
+	if len(body) > 0 && body[len(body)-1] == '\r' {
+		body = body[:len(body)-1]
 	}
-	body := bytes.TrimSuffix(line[1:], []byte("\r"))
 	if len(body) == 0 || body[0] == '-' {
-		return 0, nil
+		return false
 	}
 	n, err := strconv.ParseInt(string(body), 10, 64)
-	if err != nil || n > limit {
-		return 0, errReadLimit
+	if err != nil {
+		return true
 	}
-	if !bulk {
-		return 0, nil
-	}
-	return n + 2, nil
+	return n > limit
 }

-// dialAttempts replaces go-redis's default of 5. The extra attempts run in a goroutine that
-// ignores the caller's context, so they kept dialing a filtered port for ~25s after the
-// template had given up on it.
-const dialAttempts = 1
-
-func init() {
-	redis.SetLogger(warningLogger{})
-}
-
-// warningLogger hands go-redis's logs to gologger as warnings. Its default logger writes them
-// straight to stderr, where a failed dial against the scanned host reads as an error.
-type warningLogger struct{}
-
-func (warningLogger) Printf(_ context.Context, format string, v ...interface{}) {
-	gologger.Warning().Msgf(format, v...)
+func timeoutErr(err error) bool {
+	var netErr net.Error
+	return errors.As(err, &netErr) && netErr.Timeout()
 }
@@ -1,81 +0,0 @@
-package redis
-
-import (
-	"context"
-	"net"
-	"runtime"
-	"strings"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/projectdiscovery/gologger"
-	"github.com/projectdiscovery/gologger/levels"
-	"github.com/projectdiscovery/gologger/writer"
-	"github.com/stretchr/testify/require"
-)
-
-// go-redis retries a failed dial 4 times, 100ms apart, on each of a command's 4 attempts: a closed
-// port took at least 1.6s to fail.
-func TestGetServerInfoFailsFastOnAClosedPort(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("windows takes about a second to report a refused localhost dial")
-	}
-
-	listener, err := net.Listen("tcp", "127.0.0.1:0")
-	require.NoError(t, err)
-	addr, ok := listener.Addr().(*net.TCPAddr)
-	require.True(t, ok)
-	require.NoError(t, listener.Close())
-
-	start := time.Now()
-	_, err = getServerInfo(context.Background(), "redis-closed-port", "127.0.0.1", addr.Port)
-	require.Error(t, err)
-	require.Less(t, time.Since(start), time.Second)
-}
-
-// go-redis's default logger wrote each failed dial straight to stderr, past nuclei's logger and
-// its level.
-func TestGoRedisLogsAreGologgerWarnings(t *testing.T) {
-	logs := &recordingWriter{}
-	gologger.DefaultLogger.SetWriter(logs)
-	gologger.DefaultLogger.SetMaxLevel(levels.LevelWarning)
-	t.Cleanup(func() {
-		// gologger's own defaults: it has no getter to save the previous ones.
-		gologger.DefaultLogger.SetWriter(writer.NewCLI())
-		gologger.DefaultLogger.SetMaxLevel(levels.LevelInfo)
-	})
-
-	listener, err := net.Listen("tcp", "127.0.0.1:0")
-	require.NoError(t, err)
-	addr, ok := listener.Addr().(*net.TCPAddr)
-	require.True(t, ok)
-	require.NoError(t, listener.Close())
-
-	_, err = getServerInfo(context.Background(), "redis-log-level", "127.0.0.1", addr.Port)
-	require.Error(t, err)
-
-	warnings := logs.at(levels.LevelWarning)
-	require.NotEmpty(t, warnings)
-	require.Contains(t, warnings[0], "failed to dial")
-}
-
-type recordingWriter struct {
-	mu    sync.Mutex
-	lines map[levels.Level][]string
-}
-
-func (w *recordingWriter) Write(data []byte, level levels.Level) {
-	w.mu.Lock()
-	defer w.mu.Unlock()
-	if w.lines == nil {
-		w.lines = make(map[levels.Level][]string)
-	}
-	w.lines[level] = append(w.lines[level], strings.TrimSpace(string(data)))
-}
-
-func (w *recordingWriter) at(level levels.Level) []string {
-	w.mu.Lock()
-	defer w.mu.Unlock()
-	return w.lines[level]
-}
@@ -0,0 +1,49 @@
+package redis
+
+import (
+	"context"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
+	"github.com/projectdiscovery/nuclei/v3/pkg/types"
+)
+
+func TestRedisClientOptionsMapsConnectionOptions(t *testing.T) {
+	opts := redisClientOptions("test", RedisOptions{
+		Host: "127.0.0.1", Port: 6379, Password: "secret", DB: 3, Timeout: 4,
+	})
+
+	if opts.Addr != "127.0.0.1:6379" || opts.Password != "secret" || opts.DB != 3 {
+		t.Fatalf("unexpected Redis client options: %#v", opts)
+	}
+	if opts.DialTimeout != 4*time.Second || opts.ReadTimeout != 4*time.Second || opts.WriteTimeout != 4*time.Second {
+		t.Fatalf("timeout mapping failed: %#v", opts)
+	}
+}
+
+func TestConnectWithOptionsValidatesTarget(t *testing.T) {
+	connected, err := connectWithOptions(context.Background(), "test", RedisOptions{Port: 6379})
+	if connected || err == nil || err.Error() != "invalid host or port" {
+		t.Fatalf("expected invalid target error, got connected=%t err=%v", connected, err)
+	}
+}
+
+func TestConnectWithOptionsDeniesRestrictedLocalHostBeforeDial(t *testing.T) {
+	executionID := t.Name()
+	if err := protocolstate.Init(&types.Options{
+		ExecutionId:                executionID,
+		RestrictLocalNetworkAccess: true,
+	}); err != nil {
+		t.Fatal(err)
+	}
+	t.Cleanup(func() { protocolstate.Close(executionID) })
+
+	connected, err := connectWithOptions(context.Background(), executionID, RedisOptions{
+		Host: "127.0.0.1", Port: 6379, Timeout: 1,
+	})
+	if connected || err == nil || !strings.Contains(err.Error(), "network policy") {
+		t.Fatalf("expected network-policy denial before dialing, got connected=%t err=%v", connected, err)
+	}
+}
@@ -5,7 +5,6 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io"
 	"net"
 	"runtime"
 	"strconv"
@@ -91,58 +90,37 @@ func TestGetServerInfoAuthBoundsAReplyWithoutNewline(t *testing.T) {
 }

 func TestGetServerInfoAuthReadsAnInfoReply(t *testing.T) {
-	tests := []struct {
-		name string
-		info string
-	}{
-		{name: "info", info: "# Server\r\nredis_version:7.2.4\r\n"},
-		// A bulk payload's lines are data, even when they start like a RESP length header.
-		{name: "header-like lines", info: "# Server\r\n*abc\r\n$ 5 dollars\r\n%x\r\n$99999999999\r\n"},
-		// Each line used to cost a copy of what was left of the read buffer.
-		{name: "many short lines", info: strings.Repeat("\n", 1<<20)},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			listener, err := net.Listen("tcp", "127.0.0.1:0")
-			require.NoError(t, err)
-			t.Cleanup(func() {
-				_ = listener.Close()
-			})
+	listener, err := net.Listen("tcp", "127.0.0.1:0")
+	require.NoError(t, err)
+	t.Cleanup(func() {
+		_ = listener.Close()
+	})

-			go func() {
-				for {
-					conn, err := listener.Accept()
-					if err != nil {
-						return
-					}
-					go serveRESP(conn, tt.info)
-				}
-			}()
+	const info = "# Server\r\nredis_version:7.2.4\r\n"
+	go func() {
+		for {
+			conn, err := listener.Accept()
+			if err != nil {
+				return
+			}
+			go serveRESP(conn, info)
+		}
+	}()

-			executionID := "redis-" + strings.ReplaceAll(t.Name(), "/", "-")
-			require.NoError(t, protocolstate.Init(&types.Options{ExecutionId: executionID}))
-			t.Cleanup(func() {
-				protocolstate.Close(executionID)
-			})
+	executionID := "redis-" + strings.ReplaceAll(t.Name(), "/", "-")
+	require.NoError(t, protocolstate.Init(&types.Options{ExecutionId: executionID}))
+	t.Cleanup(func() {
+		protocolstate.Close(executionID)
+	})

-			addr, ok := listener.Addr().(*net.TCPAddr)
-			require.True(t, ok)
+	addr, ok := listener.Addr().(*net.TCPAddr)
+	require.True(t, ok)

-			var before runtime.MemStats
-			runtime.ReadMemStats(&before)
-
-			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-			defer cancel()
-			got, err := getServerInfoAuth(ctx, executionID, "127.0.0.1", addr.Port, "")
-
-			var after runtime.MemStats
-			runtime.ReadMemStats(&after)
-			require.NoError(t, err)
-			require.Equal(t, tt.info, got)
-			growth := int64(after.TotalAlloc - before.TotalAlloc)
-			require.Less(t, growth, int64(64<<20), "allocated %d MiB reading one reply", growth>>20)
-		})
-	}
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	got, err := getServerInfoAuth(ctx, executionID, "127.0.0.1", addr.Port, "")
+	require.NoError(t, err)
+	require.Equal(t, info, got)
 }

 // serveRESP answers HELLO as a Redis without RESP3 does, so the client falls back to RESP2, and
@@ -204,85 +182,26 @@ func readRESPCommand(rd *bufio.Reader) (string, error) {
 	return command, nil
 }

-func TestDeclaredPayload(t *testing.T) {
+func TestLengthTooLarge(t *testing.T) {
 	tests := []struct {
-		line     string
-		overlong bool
-		payload  int64
-		tooLarge bool
+		line string
+		want bool
 	}{
-		{line: fmt.Sprintf("$%d\r", maxReadBytes), payload: maxReadBytes + 2},
-		{line: fmt.Sprintf("$%d\r", maxReadBytes+1), tooLarge: true},
-		{line: "=10\r", payload: 12},
-		{line: "$-1\r"},
-		{line: "+OK\r"},
-		{line: "+OK\r", overlong: true},
-		{line: fmt.Sprintf("*%d\r", maxAggregate)},
-		{line: fmt.Sprintf("*%d\r", maxAggregate+1), tooLarge: true},
-		{line: "$999999999999999999999\r", tooLarge: true},
-		{line: "*abc\r", tooLarge: true},
-		{line: "$000000000000000000000000000000", overlong: true, tooLarge: true},
+		{line: fmt.Sprintf("$%d\r\n", maxReadBytes), want: false},
+		{line: fmt.Sprintf("$%d\r\n", maxReadBytes+1), want: true},
+		{line: "$-1\r\n", want: false},
+		{line: "+OK\r\n", want: false},
+		{line: fmt.Sprintf("*%d\r\n", maxAggregate), want: false},
+		{line: fmt.Sprintf("*%d\r\n", maxAggregate+1), want: true},
+		{line: "$999999999999999999999\r\n", want: true},
 	}
 	for _, tt := range tests {
 		t.Run(tt.line, func(t *testing.T) {
-			payload, err := declaredPayload([]byte(tt.line), tt.overlong)
-			if tt.tooLarge {
-				require.ErrorIs(t, err, errReadLimit)
-				return
-			}
-			require.NoError(t, err)
-			require.Equal(t, tt.payload, payload)
+			require.Equal(t, tt.want, lengthTooLarge([]byte(tt.line)))
 		})
 	}
 }

-// The check that rejects a length header has to land on the "\n" when the header arrives over
-// several reads, and payload bytes have to pass whatever they contain.
-func TestLimitedConnFollowsFramingAcrossReads(t *testing.T) {
-	const ok = "*2\r\n$5\r\n*abc\n\r\n$-1\r\n+OK\r\n"
-	tooLarge := fmt.Sprintf("$%d\r\n", maxReadBytes+1)
-
-	tests := []struct {
-		name    string
-		stream  string
-		want    string
-		wantErr error
-	}{
-		{name: "payload passes", stream: ok, want: ok},
-		{name: "header rejected", stream: ok + tooLarge + "x", want: ok + tooLarge[:len(tooLarge)-1], wantErr: errReadLimit},
-	}
-	for _, tt := range tests {
-		for _, size := range []int{1, 3, 64} {
-			t.Run(fmt.Sprintf("%s/%d", tt.name, size), func(t *testing.T) {
-				lc := &limitedConn{Conn: &chunkedConn{data: []byte(tt.stream), size: size}, remaining: maxReadBytes}
-				got, err := io.ReadAll(lc)
-				require.Equal(t, tt.want, string(got))
-				if tt.wantErr != nil {
-					require.ErrorIs(t, err, tt.wantErr)
-					return
-				}
-				require.NoError(t, err)
-			})
-		}
-	}
-}
-
-// chunkedConn returns data at most size bytes per read, then io.EOF.
-type chunkedConn struct {
-	net.Conn
-	data []byte
-	size int
-}
-
-func (c *chunkedConn) Read(b []byte) (int, error) {
-	if len(c.data) == 0 {
-		return 0, io.EOF
-	}
-	n := copy(b[:min(len(b), c.size)], c.data)
-	c.data = c.data[n:]
-	return n, nil
-}
-
 // A short RESP length header used to make go-redis allocate the declared size before reading
 // any of the payload, so the byte cap never applied.
 func TestGetServerInfoAuthRejectsAHugeDeclaredLength(t *testing.T) {
@@ -0,0 +1,70 @@
+package smb
+
+import (
+	"context"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
+	"github.com/projectdiscovery/nuclei/v3/pkg/types"
+	"github.com/stretchr/testify/require"
+)
+
+func TestListSharesWithOptionsRejectsInvalidHostPort(t *testing.T) {
+	_, err := listSharesWithOptions(t.Context(), "exec", SMBOptions{Host: "", Port: 445})
+	require.Error(t, err)
+	require.Contains(t, err.Error(), "invalid host or port")
+
+	_, err = listSharesWithOptions(t.Context(), "exec", SMBOptions{Host: "acme.com", Port: 0})
+	require.Error(t, err)
+	require.Contains(t, err.Error(), "invalid host or port")
+}
+
+func TestListSharesWithOptionsDeniesRestrictedLocalHostBeforeDial(t *testing.T) {
+	executionID := t.Name()
+	require.NoError(t, protocolstate.Init(&types.Options{
+		ExecutionId:                executionID,
+		RestrictLocalNetworkAccess: true,
+	}))
+	t.Cleanup(func() { protocolstate.Close(executionID) })
+
+	_, err := listSharesWithOptions(context.Background(), executionID, SMBOptions{
+		Host: "127.0.0.1", Port: 445, Domain: "ACME", Timeout: 1,
+	})
+	require.Error(t, err)
+	require.True(t, strings.Contains(err.Error(), "network policy") && strings.Contains(err.Error(), "127.0.0.1"))
+}
+
+func TestSMBOptionsFields(t *testing.T) {
+	opts := SMBOptions{
+		Host:     "dc.acme.com",
+		Port:     445,
+		User:     "Administrator",
+		Password: "secret",
+		Hash:     "31d6cfe0d16ae931b73c59d7e0c089c0",
+		Domain:   "ACME",
+		Timeout:  15,
+	}
+	require.Equal(t, "ACME", opts.Domain)
+	require.Equal(t, 15, opts.Timeout)
+	require.Equal(t, "31d6cfe0d16ae931b73c59d7e0c089c0", opts.Hash)
+}
+
+func TestSMBDialContextUsesShorterConfiguredTimeout(t *testing.T) {
+	parent, cancelParent := context.WithTimeout(t.Context(), time.Minute)
+	defer cancelParent()
+
+	start := time.Now()
+	dialCtx, cancelDial := smbDialContext(parent, 20*time.Millisecond)
+	end := time.Now()
+	defer cancelDial()
+
+	parentDeadline, ok := parent.Deadline()
+	require.True(t, ok)
+	dialDeadline, ok := dialCtx.Deadline()
+	require.True(t, ok)
+	require.True(t, dialDeadline.Before(parentDeadline))
+	require.False(t, dialDeadline.Before(start.Add(20*time.Millisecond)))
+	require.False(t, dialDeadline.After(end.Add(20*time.Millisecond)))
+}
@@ -191,6 +191,8 @@ func (c *SMBClient) Authenticate(ctx context.Context, host string, port int, use
 // and list shares by using given credentials.
 // Credentials cannot be blank. guest or anonymous credentials
 // can be used by providing empty password.
+//
+// Deprecated: prefer ListSharesWithOptions for new templates.
 // @example
 // ```javascript
 // const smb = require('nuclei/smb');
@@ -207,6 +209,50 @@ func (c *SMBClient) ListShares(ctx context.Context, host string, port int, user,
 	return memoizedlistShares(ctx, executionId, host, port, user, password)
 }

+type (
+	// SMBOptions represents configuration for authenticated SMB operations.
+	// @example
+	// ```javascript
+	// const smb = require('nuclei/smb');
+	// const client = new smb.SMBClient();
+	// const opts = new smb.SMBOptions();
+	// opts.Host = 'acme.com';
+	// opts.Port = 445;
+	// opts.User = 'Administrator';
+	// opts.Password = 'password';
+	// opts.Domain = 'ACME';
+	// const shares = client.ListSharesWithOptions(opts);
+	// ```
+	SMBOptions struct {
+		Host     string // Host is the hostname or IP of the SMB server.
+		Port     int    // Port is the SMB port (usually 445).
+		User     string // User is the username for NTLM authentication.
+		Password string // Password is the password for NTLM authentication.
+		Hash     string // Hash is an optional hex-encoded NTLM hash (pass-the-hash).
+		Domain   string // Domain is the NTLM domain / workgroup.
+		Timeout  int    // Timeout is the dial timeout in seconds (default 10).
+	}
+)
+
+// ListSharesWithOptions lists SMB share names using SMBOptions.
+// Supports domain and pass-the-hash via smbsession.
+// @example
+// ```javascript
+// const smb = require('nuclei/smb');
+// const client = new smb.SMBClient();
+// const opts = new smb.SMBOptions();
+// opts.Host = 'acme.com';
+// opts.Port = 445;
+// opts.User = 'Administrator';
+// opts.Hash = 'aad3b435b51404eeaad3b435b51404ee:31d6cfe0d16ae931b73c59d7e0c089c0';
+// opts.Domain = 'ACME';
+// const shares = client.ListSharesWithOptions(opts);
+// ```
+func (c *SMBClient) ListSharesWithOptions(ctx context.Context, opts SMBOptions) ([]string, error) {
+	executionId := ctx.Value("executionId").(string)
+	return listSharesWithOptions(ctx, executionId, opts)
+}
+
 // ListDir lists files and directories under path on the given share
 // (nmap smb-ls). path may be empty or "." for the share root.
 // user may be "DOMAIN\\user" or "user@domain".
@@ -2,6 +2,9 @@ package smb

 import (
 	"context"
+	"fmt"
+	"strings"
+	"time"

 	"github.com/projectdiscovery/nuclei/v3/pkg/js/libs/smbsession"
 )
@@ -11,12 +14,46 @@ type ShareEntry = smbsession.Entry

 // @memo
 func listShares(ctx context.Context, executionId string, host string, port int, user string, password string) ([]string, error) {
-	sess, err := smbsession.Dial(ctx, executionId, host, port, smbsession.Creds{User: user, Password: password})
+	return listSharesWithOptions(ctx, executionId, SMBOptions{
+		Host:     host,
+		Port:     port,
+		User:     user,
+		Password: password,
+	})
+}
+
+func listSharesWithOptions(ctx context.Context, executionId string, opts SMBOptions) ([]string, error) {
+	if opts.Host == "" || opts.Port <= 0 {
+		return nil, fmt.Errorf("invalid host or port")
+	}
+
+	timeout := 10 * time.Second
+	if opts.Timeout > 0 {
+		timeout = time.Duration(opts.Timeout) * time.Second
+	}
+	dialCtx, cancel := smbDialContext(ctx, timeout)
+	defer cancel()
+
+	hash := opts.Hash
+	if i := strings.LastIndex(hash, ":"); i >= 0 {
+		hash = hash[i+1:]
+	}
+
+	sess, err := smbsession.Dial(dialCtx, executionId, opts.Host, opts.Port, smbsession.Creds{
+		User:     opts.User,
+		Password: opts.Password,
+		Domain:   opts.Domain,
+		Hash:     hash,
+	})
 	if err != nil {
 		return nil, err
 	}
 	defer sess.Close()
-	return sess.ListShares()
+	return sess.ListSharesContext(dialCtx)
+}
+
+func smbDialContext(ctx context.Context, timeout time.Duration) (context.Context, context.CancelFunc) {
+	return context.WithTimeout(ctx, timeout)
 }

 // @memo
@@ -154,6 +154,18 @@ func (s *Session) ListShares() ([]string, error) {
 	return ops.ListShares()
 }

+// ListSharesContext enumerates share names and stops waiting when ctx is
+// cancelled by closing the session, matching Dial.
+func (s *Session) ListSharesContext(ctx context.Context) ([]string, error) {
+	ops := s.ops()
+	if ops == nil {
+		return nil, fmt.Errorf("smb session not connected")
+	}
+	return await(ctx, s, func(context.Context) ([]string, error) {
+		return ops.ListShares()
+	})
+}
+
 // ListDir lists one directory on share (share-relative path).
 func (s *Session) ListDir(share, dir string) ([]Entry, error) {
 	return s.ListDirContext(context.Background(), share, dir)
@@ -166,7 +178,7 @@ func (s *Session) ListDirContext(ctx context.Context, share, dir string) ([]Entr
 	if ops == nil {
 		return nil, fmt.Errorf("smb session not connected")
 	}
-	return s.awaitEntries(ctx, func(ctx context.Context) ([]Entry, error) {
+	return await(ctx, s, func(ctx context.Context) ([]Entry, error) {
 		return listDir(ctx, ops, share, dir)
 	})
 }
@@ -192,34 +204,37 @@ func (s *Session) ListTreeContext(ctx context.Context, share, root string, maxDe
 	if ops == nil {
 		return nil, fmt.Errorf("smb session not connected")
 	}
-	return s.awaitEntries(ctx, func(ctx context.Context) ([]Entry, error) {
+	return await(ctx, s, func(ctx context.Context) ([]Entry, error) {
 		return listTree(ctx, ops, share, root, maxDepth, maxEntries)
 	})
 }

-func (s *Session) awaitEntries(ctx context.Context, fn func(context.Context) ([]Entry, error)) ([]Entry, error) {
+// await runs fn and closes the session when ctx is cancelled first, which
+// unblocks the pending SMB call.
+func await[T any](ctx context.Context, s *Session, fn func(context.Context) (T, error)) (T, error) {
+	var zero T
 	if ctx == nil {
 		ctx = context.Background()
 	}
 	if err := ctx.Err(); err != nil {
-		return nil, err
+		return zero, err
 	}
 	type rec struct {
-		entries []Entry
-		err     error
+		value T
+		err   error
 	}
 	ch := make(chan rec, 1)
 	go func() {
-		entries, err := fn(ctx)
-		ch <- rec{entries, err}
+		value, err := fn(ctx)
+		ch <- rec{value, err}
 	}()
 	select {
 	case <-ctx.Done():
 		s.Close()
 		<-ch
-		return nil, ctx.Err()
+		return zero, ctx.Err()
 	case r := <-ch:
-		return r.entries, r.err
+		return r.value, r.err
 	}
 }
Author	SHA1	Message	Date
Mzack9999	4e80959022	Merge dev	2026-10-26 13:48:11 +01:00
Mzack9999	17e6a46cba	Bound timeouts	2026-10-26 07:54:40 +01:00
Mzack9999	a03e867be0	Fix review	2026-10-26 07:50:51 +01:00
Mzack9999	38133c1d7b	Merge dev	2026-10-26 07:46:56 +01:00
Mzack9999	c53042cfb3	fix options	2026-08-26 12:56:54 +04:00
Mzack9999	b7fde879cf	Merge remote-tracking branch 'origin/dev' into 6447-js-connect-options	2026-08-26 12:55:13 +04:00
Mzack9999	1e5dada8d5	fix timeout	2026-08-17 13:46:39 +04:00
Mzack9999	8b3dbfd1c9	address review	2026-08-17 13:46:05 +04:00
Mzack9999	15b7ee0d6c	merge dev	2026-08-17 13:43:00 +04:00
Mzack9999	f28691ad59	lint review	2026-07-26 13:23:23 +04:00
Mzack9999	54e6279130	js options	2026-07-26 13:23:12 +04:00
				`@@ -1 +0,0 @@`
				`{"openapi":"3.0.0","info":{"title":"t","version":"1"},"servers":[{"url":"http://example.com"}],"paths":{"/a":{"post":{"requestBody":{"content":{"application/json":{"schema":{"type":"object","properties":{"k":{"type":"string"}}}}}},"responses":{"200":{"description":"ok"}}}}}}`