diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index dbe5721d..fe641f88 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -8,7 +8,7 @@ updates:
# Maintain dependencies for go modules
- package-ecosystem: "gomod"
- directory: "v2/"
+ directory: "/"
schedule:
interval: "weekly"
target-branch: "dev"
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 252203d0..7ebdaee1 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -34,17 +34,15 @@ jobs:
run: |
go clean -modcache
go mod tidy
- working-directory: v2/
- name: Build
run: go build .
- working-directory: v2/cmd/nuclei/
+ working-directory: cmd/nuclei/
- name: Test
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
run: go test ./...
- working-directory: v2/
- name: Integration Tests
timeout-minutes: 50
@@ -59,12 +57,12 @@ jobs:
- name: Race Condition Tests
if: ${{ matrix.os != 'windows-latest' }} # known issue: https://github.com/golang/go/issues/46099
run: go run -race . -l ../functional-test/targets.txt -id tech-detect,tls-version
- working-directory: v2/cmd/nuclei/
+ working-directory: cmd/nuclei/
- name: Example SDK Simple
run: go run .
- working-directory: v2/examples/simple/
+ working-directory: examples/simple/
- name: Example SDK Advanced
run: go run .
- working-directory: v2/examples/advanced/
+ working-directory: examples/advanced/
diff --git a/.github/workflows/functional-test.yml b/.github/workflows/functional-test.yml
index a6bafd84..912080d8 100644
--- a/.github/workflows/functional-test.yml
+++ b/.github/workflows/functional-test.yml
@@ -30,4 +30,4 @@ jobs:
run: |
chmod +x run.sh
bash run.sh ${{ matrix.os }}
- working-directory: v2/cmd/functional-test
+ working-directory: cmd/functional-test
diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml
index 24ba452e..4292a42f 100644
--- a/.github/workflows/lint-test.yml
+++ b/.github/workflows/lint-test.yml
@@ -24,5 +24,4 @@ jobs:
uses: golangci/golangci-lint-action@v3.6.0
with:
version: latest
- args: --timeout 5m
- working-directory: v2/
\ No newline at end of file
+ args: --timeout 5m
\ No newline at end of file
diff --git a/.github/workflows/performance-test.yaml b/.github/workflows/performance-test.yaml
index 2e597723..65ca4f70 100644
--- a/.github/workflows/performance-test.yaml
+++ b/.github/workflows/performance-test.yaml
@@ -28,9 +28,8 @@ jobs:
run: |
go clean -modcache
go mod tidy
- working-directory: v2/
# Max GH exection time 6H => timeout after that
- name: Running performance with big list
run: go run -race . -l ../functional-test/targets-150.txt
- working-directory: v2/cmd/nuclei/
\ No newline at end of file
+ working-directory: cmd/nuclei/
\ No newline at end of file
diff --git a/.github/workflows/publish-docs.yaml b/.github/workflows/publish-docs.yaml
index 2fca548a..2e30c3cb 100644
--- a/.github/workflows/publish-docs.yaml
+++ b/.github/workflows/publish-docs.yaml
@@ -31,7 +31,6 @@ jobs:
go build -o "cmd/docgen/docgen" cmd/docgen/docgen.go
./cmd/docgen/docgen ../SYNTAX-REFERENCE.md ../nuclei-jsonschema.json
git status -s | wc -l | xargs -I {} echo CHANGES={} >> $GITHUB_OUTPUT
- working-directory: v2
- name: Commit files
if: steps.generate-docs.outputs.CHANGES > 0
diff --git a/.github/workflows/release-binary.yml b/.github/workflows/release-binary.yml
index 314d7b06..9622650d 100644
--- a/.github/workflows/release-binary.yml
+++ b/.github/workflows/release-binary.yml
@@ -23,7 +23,6 @@ jobs:
with:
args: "release --rm-dist"
version: latest
- workdir: v2/
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
SLACK_WEBHOOK: "${{ secrets.RELEASE_SLACK_WEBHOOK }}"
diff --git a/.github/workflows/release-test.yml b/.github/workflows/release-test.yml
index df645d6e..4a13baae 100644
--- a/.github/workflows/release-test.yml
+++ b/.github/workflows/release-test.yml
@@ -25,5 +25,4 @@ jobs:
uses: goreleaser/goreleaser-action@v4
with:
args: "release --clean --snapshot"
- version: latest
- workdir: v2/
\ No newline at end of file
+ version: latest
\ No newline at end of file
diff --git a/.github/workflows/template-validate.yml b/.github/workflows/template-validate.yml
index 566e5ed3..a3ca5bd9 100644
--- a/.github/workflows/template-validate.yml
+++ b/.github/workflows/template-validate.yml
@@ -20,4 +20,4 @@ jobs:
go run . -ut
go run . -validate
go run . -validate -w workflows
- working-directory: v2/cmd/nuclei/
\ No newline at end of file
+ working-directory: cmd/nuclei/
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index ea395911..99221d2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,27 +1,27 @@
.idea
.vscode
.devcontainer
-v2/vendor
-v2/dist
+vendor
+dist
integration_tests/nuclei
integration_tests/integration-test
-v2/cmd/nuclei/main
-v2/cmd/nuclei/nuclei
-v2/cmd/integration-test/nuclei
-v2/cmd/functional-test/nuclei_dev
-v2/cmd/functional-test/nuclei_main
-v2/cmd/functional-test/functional-test
-v2/cmd/docgen/docgen
-v2/pkg/protocols/common/helpers/deserialization/testdata/Deserialize.class
-v2/pkg/protocols/common/helpers/deserialization/testdata/ValueObject.class
-v2/pkg/protocols/common/helpers/deserialization/testdata/ValueObject2.ser
+cmd/nuclei/main
+cmd/nuclei/nuclei
+cmd/integration-test/nuclei
+cmd/functional-test/nuclei_dev
+cmd/functional-test/nuclei_main
+cmd/functional-test/functional-test
+cmd/docgen/docgen
+pkg/protocols/common/helpers/deserialization/testdata/Deserialize.class
+pkg/protocols/common/helpers/deserialization/testdata/ValueObject.class
+pkg/protocols/common/helpers/deserialization/testdata/ValueObject2.ser
*.exe
-v2/.gitignore
-v2/pkg/js/devtools/bindgen/cmd/bindgen
-v2/pkg/js/devtools/jsdocgen/jsdocgen
-bindgen
-jsdocgen
-nuclei
-v2/scrapefuncs
+.gitignore
+pkg/js/devtools/bindgen/cmd/bindgen
+pkg/js/devtools/jsdocgen/jsdocgen
+./bindgen
+./jsdocgen
+./scrapefuncs
*.DS_Store
-v2/pkg/protocols/headless/engine/.cache
+pkg/protocols/headless/engine/.cache
+./nuclei
diff --git a/v2/.goreleaser.yml b/.goreleaser.yml
similarity index 100%
rename from v2/.goreleaser.yml
rename to .goreleaser.yml
diff --git a/.run/DSLFunctionsIT.run.xml b/.run/DSLFunctionsIT.run.xml
index ca4f6c11..49cf9c58 100644
--- a/.run/DSLFunctionsIT.run.xml
+++ b/.run/DSLFunctionsIT.run.xml
@@ -7,9 +7,9 @@
-
+
-
+
\ No newline at end of file
diff --git a/.run/RegressionTests.run.xml b/.run/RegressionTests.run.xml
index f6f789b5..70229deb 100644
--- a/.run/RegressionTests.run.xml
+++ b/.run/RegressionTests.run.xml
@@ -2,10 +2,10 @@
-
+
-
+
diff --git a/.run/UnitTests.run.xml b/.run/UnitTests.run.xml
index edc05c22..909197ee 100644
--- a/.run/UnitTests.run.xml
+++ b/.run/UnitTests.run.xml
@@ -4,7 +4,7 @@
-
+
diff --git a/DESIGN.md b/DESIGN.md
index b02067f2..9d92e28f 100644
--- a/DESIGN.md
+++ b/DESIGN.md
@@ -82,9 +82,9 @@ A brief overview of the methods is provided below -
For reference protocol requests implementations, one can look at the below packages -
-1. [pkg/protocols/http](./v2/pkg/protocols/http)
-2. [pkg/protocols/dns](./v2/pkg/protocols/dns)
-3. [pkg/protocols/network](./v2/pkg/protocols/network)
+1. [pkg/protocols/http](./pkg/protocols/http)
+2. [pkg/protocols/dns](./pkg/protocols/dns)
+3. [pkg/protocols/network](./pkg/protocols/network)
### Executer
@@ -189,9 +189,9 @@ Polling for interactions and server registration only starts when a template use
Next we arrive in the `RunEnumeration` function of the runner.
-`HostErrorsCache` is initialised which is used throughout the run of Nuclei enumeration to keep track of errors per host and skip further requests if the errors are greater than the provided threshold. The functionality for the error tracking cache is defined in [hosterrorscache.go](https://github.com/projectdiscovery/nuclei/blob/main/v2/pkg/protocols/common/hosterrorscache/hosterrorscache.go) and is pretty simplistic in nature.
+`HostErrorsCache` is initialised which is used throughout the run of Nuclei enumeration to keep track of errors per host and skip further requests if the errors are greater than the provided threshold. The functionality for the error tracking cache is defined in [hosterrorscache.go](https://github.com/projectdiscovery/nuclei/blob/main/pkg/protocols/common/hosterrorscache/hosterrorscache.go) and is pretty simplistic in nature.
-Next the `WorkflowLoader` is initialised which used to load workflows. It exists in `v2/pkg/parsers/workflow_loader.go`
+Next the `WorkflowLoader` is initialised which used to load workflows. It exists in `pkg/parsers/workflow_loader.go`
The loader is initialised moving forward which is responsible for Using Catalog, Passed Tags, Filters, Paths, etc. to return compiled `Templates` and `Workflows`.
@@ -387,7 +387,7 @@ Almost all of these protocols have boilerplate functions for which default imple
Step by step description of how to add a new protocol to Nuclei -
-1. Add the protocol implementation in `pkg/protocols` directory. If it's a small protocol with fewer options, considering adding it to the `pkg/protocols/others` directory. Add the enum for the new protocol to `v2/pkg/templates/types/types.go`.
+1. Add the protocol implementation in `pkg/protocols` directory. If it's a small protocol with fewer options, considering adding it to the `pkg/protocols/others` directory. Add the enum for the new protocol to `pkg/templates/types/types.go`.
2. Add the protocol request structure to the `Template` structure fields. This is done in `pkg/templates/templates.go` with the corresponding import line.
@@ -395,7 +395,7 @@ Step by step description of how to add a new protocol to Nuclei -
import (
...
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/others/websocket"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/others/websocket"
)
// Template is a YAML input file which defines all the requests and
@@ -479,52 +479,52 @@ $ go tool pprof -http=:8081 mem.pprof
## Project Structure
-- [v2/pkg/reporting](./v2/pkg/reporting) - Reporting modules for nuclei.
-- [v2/pkg/reporting/exporters/sarif](./v2/pkg/reporting/exporters/sarif) - Sarif Result Exporter
-- [v2/pkg/reporting/exporters/markdown](./v2/pkg/reporting/exporters/markdown) - Markdown Result Exporter
-- [v2/pkg/reporting/exporters/es](./v2/pkg/reporting/exporters/es) - Elasticsearch Result Exporter
-- [v2/pkg/reporting/dedupe](./v2/pkg/reporting/dedupe) - Dedupe module for Results
-- [v2/pkg/reporting/trackers/gitlab](./v2/pkg/reporting/trackers/gitlab) - GitLab Issue Tracker Exporter
-- [v2/pkg/reporting/trackers/jira](./v2/pkg/reporting/trackers/jira) - Jira Issue Tracker Exporter
-- [v2/pkg/reporting/trackers/github](./v2/pkg/reporting/trackers/github) - GitHub Issue Tracker Exporter
-- [v2/pkg/reporting/format](./v2/pkg/reporting/format) - Result Formatting Functions
-- [v2/pkg/parsers](./v2/pkg/parsers) - Implements template as well as workflow loader for initial template discovery, validation and - loading.
-- [v2/pkg/types](./v2/pkg/types) - Contains CLI options as well as misc helper functions.
-- [v2/pkg/progress](./v2/pkg/progress) - Progress tracking
-- [v2/pkg/operators](./v2/pkg/operators) - Operators for Nuclei
-- [v2/pkg/operators/common/dsl](./v2/pkg/operators/common/dsl) - DSL functions for Nuclei YAML Syntax
-- [v2/pkg/operators/matchers](./v2/pkg/operators/matchers) - Matchers implementation
-- [v2/pkg/operators/extractors](./v2/pkg/operators/extractors) - Extractors implementation
-- [v2/pkg/catalog](./v2/pkg/catalog) - Template loading from disk helpers
-- [v2/pkg/catalog/config](./v2/pkg/catalog/config) - Internal configuration management
-- [v2/pkg/catalog/loader](./v2/pkg/catalog/loader) - Implements loading and validation of templates and workflows.
-- [v2/pkg/catalog/loader/filter](./v2/pkg/catalog/loader/filter) - Filter filters templates based on tags and paths
-- [v2/pkg/output](./v2/pkg/output) - Output module for nuclei
-- [v2/pkg/workflows](./v2/pkg/workflows) - Workflow execution logic + declarations
-- [v2/pkg/utils](./v2/pkg/utils) - Utility functions
-- [v2/pkg/model](./v2/pkg/model) - Template Info + misc
-- [v2/pkg/templates](./v2/pkg/templates) - Templates core starting point
-- [v2/pkg/templates/cache](./v2/pkg/templates/cache) - Templates cache
-- [v2/pkg/protocols](./v2/pkg/protocols) - Protocol Specification
-- [v2/pkg/protocols/file](./v2/pkg/protocols/file) - File protocol
-- [v2/pkg/protocols/network](./v2/pkg/protocols/network) - Network protocol
-- [v2/pkg/protocols/common/expressions](./v2/pkg/protocols/common/expressions) - Expression evaluation + Templating Support
-- [v2/pkg/protocols/common/interactsh](./v2/pkg/protocols/common/interactsh) - Interactsh integration
-- [v2/pkg/protocols/common/generators](./v2/pkg/protocols/common/generators) - Payload support for Requests (Sniper, etc.)
-- [v2/pkg/protocols/common/executer](./v2/pkg/protocols/common/executer) - Default Template Executer
-- [v2/pkg/protocols/common/replacer](./v2/pkg/protocols/common/replacer) - Template replacement helpers
-- [v2/pkg/protocols/common/helpers/eventcreator](./v2/pkg/protocols/common/helpers/eventcreator) - Result event creator
-- [v2/pkg/protocols/common/helpers/responsehighlighter](./v2/pkg/protocols/common/helpers/responsehighlighter) - Debug response highlighter
-- [v2/pkg/protocols/common/helpers/deserialization](./v2/pkg/protocols/common/helpers/deserialization) - Deserialization helper functions
-- [v2/pkg/protocols/common/hosterrorscache](./v2/pkg/protocols/common/hosterrorscache) - Host errors cache for tracking erroring hosts
-- [v2/pkg/protocols/offlinehttp](./v2/pkg/protocols/offlinehttp) - Offline http protocol
-- [v2/pkg/protocols/http](./v2/pkg/protocols/http) - HTTP protocol
-- [v2/pkg/protocols/http/race](./v2/pkg/protocols/http/race) - HTTP Race Module
-- [v2/pkg/protocols/http/raw](./v2/pkg/protocols/http/raw) - HTTP Raw Request Support
-- [v2/pkg/protocols/headless](./v2/pkg/protocols/headless) - Headless Module
-- [v2/pkg/protocols/headless/engine](./v2/pkg/protocols/headless/engine) - Internal Headless implementation
-- [v2/pkg/protocols/dns](./v2/pkg/protocols/dns) - DNS protocol
-- [v2/pkg/projectfile](./v2/pkg/projectfile) - Project File Implementation
+- [pkg/reporting](./pkg/reporting) - Reporting modules for nuclei.
+- [pkg/reporting/exporters/sarif](./pkg/reporting/exporters/sarif) - Sarif Result Exporter
+- [pkg/reporting/exporters/markdown](./pkg/reporting/exporters/markdown) - Markdown Result Exporter
+- [pkg/reporting/exporters/es](./pkg/reporting/exporters/es) - Elasticsearch Result Exporter
+- [pkg/reporting/dedupe](./pkg/reporting/dedupe) - Dedupe module for Results
+- [pkg/reporting/trackers/gitlab](./pkg/reporting/trackers/gitlab) - GitLab Issue Tracker Exporter
+- [pkg/reporting/trackers/jira](./pkg/reporting/trackers/jira) - Jira Issue Tracker Exporter
+- [pkg/reporting/trackers/github](./pkg/reporting/trackers/github) - GitHub Issue Tracker Exporter
+- [pkg/reporting/format](./pkg/reporting/format) - Result Formatting Functions
+- [pkg/parsers](./pkg/parsers) - Implements template as well as workflow loader for initial template discovery, validation and - loading.
+- [pkg/types](./pkg/types) - Contains CLI options as well as misc helper functions.
+- [pkg/progress](./pkg/progress) - Progress tracking
+- [pkg/operators](./pkg/operators) - Operators for Nuclei
+- [pkg/operators/common/dsl](./pkg/operators/common/dsl) - DSL functions for Nuclei YAML Syntax
+- [pkg/operators/matchers](./pkg/operators/matchers) - Matchers implementation
+- [pkg/operators/extractors](./pkg/operators/extractors) - Extractors implementation
+- [pkg/catalog](./pkg/catalog) - Template loading from disk helpers
+- [pkg/catalog/config](./pkg/catalog/config) - Internal configuration management
+- [pkg/catalog/loader](./pkg/catalog/loader) - Implements loading and validation of templates and workflows.
+- [pkg/catalog/loader/filter](./pkg/catalog/loader/filter) - Filter filters templates based on tags and paths
+- [pkg/output](./pkg/output) - Output module for nuclei
+- [pkg/workflows](./pkg/workflows) - Workflow execution logic + declarations
+- [pkg/utils](./pkg/utils) - Utility functions
+- [pkg/model](./pkg/model) - Template Info + misc
+- [pkg/templates](./pkg/templates) - Templates core starting point
+- [pkg/templates/cache](./pkg/templates/cache) - Templates cache
+- [pkg/protocols](./pkg/protocols) - Protocol Specification
+- [pkg/protocols/file](./pkg/protocols/file) - File protocol
+- [pkg/protocols/network](./pkg/protocols/network) - Network protocol
+- [pkg/protocols/common/expressions](./pkg/protocols/common/expressions) - Expression evaluation + Templating Support
+- [pkg/protocols/common/interactsh](./pkg/protocols/common/interactsh) - Interactsh integration
+- [pkg/protocols/common/generators](./pkg/protocols/common/generators) - Payload support for Requests (Sniper, etc.)
+- [pkg/protocols/common/executer](./pkg/protocols/common/executer) - Default Template Executer
+- [pkg/protocols/common/replacer](./pkg/protocols/common/replacer) - Template replacement helpers
+- [pkg/protocols/common/helpers/eventcreator](./pkg/protocols/common/helpers/eventcreator) - Result event creator
+- [pkg/protocols/common/helpers/responsehighlighter](./pkg/protocols/common/helpers/responsehighlighter) - Debug response highlighter
+- [pkg/protocols/common/helpers/deserialization](./pkg/protocols/common/helpers/deserialization) - Deserialization helper functions
+- [pkg/protocols/common/hosterrorscache](./pkg/protocols/common/hosterrorscache) - Host errors cache for tracking erroring hosts
+- [pkg/protocols/offlinehttp](./pkg/protocols/offlinehttp) - Offline http protocol
+- [pkg/protocols/http](./pkg/protocols/http) - HTTP protocol
+- [pkg/protocols/http/race](./pkg/protocols/http/race) - HTTP Race Module
+- [pkg/protocols/http/raw](./pkg/protocols/http/raw) - HTTP Raw Request Support
+- [pkg/protocols/headless](./pkg/protocols/headless) - Headless Module
+- [pkg/protocols/headless/engine](./pkg/protocols/headless/engine) - Internal Headless implementation
+- [pkg/protocols/dns](./pkg/protocols/dns) - DNS protocol
+- [pkg/projectfile](./pkg/projectfile) - Project File Implementation
### Notes
diff --git a/Dockerfile b/Dockerfile
index 1c609082..61caa5a7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ FROM golang:1.21-alpine AS build-env
RUN apk add build-base
WORKDIR /app
COPY . /app
-WORKDIR /app/v2
+WORKDIR /app
RUN go mod download
RUN go build ./cmd/nuclei
@@ -11,6 +11,6 @@ RUN go build ./cmd/nuclei
FROM alpine:3.18.2
RUN apk -U upgrade --no-cache \
&& apk add --no-cache bind-tools chromium ca-certificates
-COPY --from=build-env /app/v2/nuclei /usr/local/bin/
+COPY --from=build-env /app/nuclei /usr/local/bin/
ENTRYPOINT ["nuclei"]
\ No newline at end of file
diff --git a/v2/Makefile b/Makefile
similarity index 96%
rename from v2/Makefile
rename to Makefile
index 966bdefe..6de70c7b 100644
--- a/v2/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ docs:
test:
$(GOTEST) $(GOFLAGS) ./...
integration:
- cd ../integration_tests; bash run.sh
+ cd integration_tests; bash run.sh
functional:
cd cmd/functional-test; bash run.sh
tidy:
diff --git a/README.md b/README.md
index 49f6dc0e..0bc63efd 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ We have a [dedicated repository](https://github.com/projectdiscovery/nuclei-temp
Nuclei requires **go1.21** to install successfully. Run the following command to install the latest version -
```sh
-go install -v github.com/projectdiscovery/nuclei/v2/cmd/nuclei@latest
+go install -v github.com/projectdiscovery/nuclei/v3/cmd/nuclei@latest
```
@@ -379,7 +379,7 @@ We have [a discussion thread around this](https://github.com/projectdiscovery/nu
### Using Nuclei From Go Code
-Complete guide of using Nuclei as Library/SDK is available at [lib](v2/lib/README.md)
+Complete guide of using Nuclei as Library/SDK is available at [godoc](https://pkg.go.dev/github.com/projectdiscovery/nuclei/v3/lib#section-readme)
### Resources
diff --git a/README_CN.md b/README_CN.md
index 79c4aaa2..ae00fc15 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -55,7 +55,7 @@ Nuclei使用零误报的定制模板向目标发送请求,同时可以对主
Nuclei需要**go1**才能安装成功。执行下列命令安装最新版本的Nuclei
```sh
-go install -v github.com/projectdiscovery/nuclei/v2/cmd/nuclei@latest
+go install -v github.com/projectdiscovery/nuclei/v3/cmd/nuclei@latest
```
**更多的安装方式 [请点击此处](https://nuclei.projectdiscovery.io/nuclei/get-started/).**
diff --git a/README_ID.md b/README_ID.md
index 55bc9584..4c0a6c10 100644
--- a/README_ID.md
+++ b/README_ID.md
@@ -55,7 +55,7 @@ Kami memiliki [repositori khusus](https://github.com/projectdiscovery/nuclei-tem
Nuclei membutuhkan **go1.21** agar dapat diinstall. Jalankan perintah berikut untuk menginstal versi terbaru -
```sh
-go install -v github.com/projectdiscovery/nuclei/v2/cmd/nuclei@latest
+go install -v github.com/projectdiscovery/nuclei/v3/cmd/nuclei@latest
```
**Metode [instalasi lain dapat ditemukan di sini](https://nuclei.projectdiscovery.io/nuclei/get-started/).**
diff --git a/README_KR.md b/README_KR.md
index 49e874ee..b9199834 100644
--- a/README_KR.md
+++ b/README_KR.md
@@ -53,7 +53,7 @@ Nuclei는 템플릿을 기반으로 대상 간에 요청을 보내기 위해 사
Nuclei를 성공적으로 설치하기 위해서 **go1.21**가 필요합니다. 다음 명령을 실행하여 최신 버전을 설치합니다.
```sh
-go install -v github.com/projectdiscovery/nuclei/v2/cmd/nuclei@latest
+go install -v github.com/projectdiscovery/nuclei/v3/cmd/nuclei@latest
```
**자세한 설치 방법은 [여기](https://nuclei.projectdiscovery.io/nuclei/get-started/)에서 찾을 수 있습니다.**
diff --git a/v2/cmd/docgen/docgen.go b/cmd/docgen/docgen.go
similarity index 91%
rename from v2/cmd/docgen/docgen.go
rename to cmd/docgen/docgen.go
index 97507952..dc0ac714 100644
--- a/v2/cmd/docgen/docgen.go
+++ b/cmd/docgen/docgen.go
@@ -10,10 +10,10 @@ import (
"github.com/alecthomas/jsonschema"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates"
)
-var pathRegex = regexp.MustCompile(`github\.com/projectdiscovery/nuclei/v2/(?:internal|pkg)/(?:.*/)?([A-Za-z.]+)`)
+var pathRegex = regexp.MustCompile(`github\.com/projectdiscovery/nuclei/v3/(?:internal|pkg)/(?:.*/)?([A-Za-z.]+)`)
func main() {
// Generate yaml syntax documentation
diff --git a/v2/cmd/functional-test/main.go b/cmd/functional-test/main.go
similarity index 98%
rename from v2/cmd/functional-test/main.go
rename to cmd/functional-test/main.go
index c7b716eb..73308a31 100644
--- a/v2/cmd/functional-test/main.go
+++ b/cmd/functional-test/main.go
@@ -11,7 +11,7 @@ import (
"github.com/logrusorgru/aurora"
"github.com/pkg/errors"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
)
var (
diff --git a/v2/cmd/functional-test/run.sh b/cmd/functional-test/run.sh
similarity index 97%
rename from v2/cmd/functional-test/run.sh
rename to cmd/functional-test/run.sh
index f204e433..a3caf722 100755
--- a/v2/cmd/functional-test/run.sh
+++ b/cmd/functional-test/run.sh
@@ -20,7 +20,7 @@ echo "::group::Installing nuclei templates"
echo "::endgroup::"
echo "::group::Building latest release of nuclei"
-go build -o nuclei$extension -v github.com/projectdiscovery/nuclei/v2/cmd/nuclei
+go build -o nuclei$extension -v github.com/projectdiscovery/nuclei/v3/cmd/nuclei
echo "::endgroup::"
echo 'Starting Nuclei functional test'
diff --git a/v2/cmd/functional-test/targets-1000.txt b/cmd/functional-test/targets-1000.txt
similarity index 100%
rename from v2/cmd/functional-test/targets-1000.txt
rename to cmd/functional-test/targets-1000.txt
diff --git a/v2/cmd/functional-test/targets-150.txt b/cmd/functional-test/targets-150.txt
similarity index 100%
rename from v2/cmd/functional-test/targets-150.txt
rename to cmd/functional-test/targets-150.txt
diff --git a/v2/cmd/functional-test/targets-250.txt b/cmd/functional-test/targets-250.txt
similarity index 100%
rename from v2/cmd/functional-test/targets-250.txt
rename to cmd/functional-test/targets-250.txt
diff --git a/v2/cmd/functional-test/targets.txt b/cmd/functional-test/targets.txt
similarity index 100%
rename from v2/cmd/functional-test/targets.txt
rename to cmd/functional-test/targets.txt
diff --git a/v2/cmd/functional-test/testcases.txt b/cmd/functional-test/testcases.txt
similarity index 100%
rename from v2/cmd/functional-test/testcases.txt
rename to cmd/functional-test/testcases.txt
diff --git a/v2/cmd/generate-checksum/main.go b/cmd/generate-checksum/main.go
similarity index 100%
rename from v2/cmd/generate-checksum/main.go
rename to cmd/generate-checksum/main.go
diff --git a/v2/cmd/integration-test/code.go b/cmd/integration-test/code.go
similarity index 95%
rename from v2/cmd/integration-test/code.go
rename to cmd/integration-test/code.go
index 63362fbc..c57af85a 100644
--- a/v2/cmd/integration-test/code.go
+++ b/cmd/integration-test/code.go
@@ -7,9 +7,9 @@ import (
osutils "github.com/projectdiscovery/utils/os"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates/signer"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates/signer"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
)
var codeTestCases = []TestCaseInfo{
diff --git a/v2/cmd/integration-test/custom-dir.go b/cmd/integration-test/custom-dir.go
similarity index 94%
rename from v2/cmd/integration-test/custom-dir.go
rename to cmd/integration-test/custom-dir.go
index 7c6f8cc1..550027f0 100644
--- a/v2/cmd/integration-test/custom-dir.go
+++ b/cmd/integration-test/custom-dir.go
@@ -3,7 +3,7 @@ package main
import (
"os"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
)
type customConfigDirTest struct{}
diff --git a/v2/cmd/integration-test/dns.go b/cmd/integration-test/dns.go
similarity index 98%
rename from v2/cmd/integration-test/dns.go
rename to cmd/integration-test/dns.go
index d0035e8a..982aab98 100644
--- a/v2/cmd/integration-test/dns.go
+++ b/cmd/integration-test/dns.go
@@ -1,7 +1,7 @@
package main
import (
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
)
var dnsTestCases = []TestCaseInfo{
diff --git a/v2/cmd/integration-test/dsl.go b/cmd/integration-test/dsl.go
similarity index 96%
rename from v2/cmd/integration-test/dsl.go
rename to cmd/integration-test/dsl.go
index 6a1666d7..4e4a275e 100644
--- a/v2/cmd/integration-test/dsl.go
+++ b/cmd/integration-test/dsl.go
@@ -6,7 +6,7 @@ import (
"net/http/httptest"
"github.com/julienschmidt/httprouter"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
)
var dslTestcases = []TestCaseInfo{
diff --git a/v2/cmd/integration-test/file.go b/cmd/integration-test/file.go
similarity index 96%
rename from v2/cmd/integration-test/file.go
rename to cmd/integration-test/file.go
index c7c4b669..66f5b225 100644
--- a/v2/cmd/integration-test/file.go
+++ b/cmd/integration-test/file.go
@@ -1,7 +1,7 @@
package main
import (
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
)
var fileTestcases = []TestCaseInfo{
diff --git a/v2/cmd/integration-test/flow.go b/cmd/integration-test/flow.go
similarity index 97%
rename from v2/cmd/integration-test/flow.go
rename to cmd/integration-test/flow.go
index 67d4b749..e57ede37 100644
--- a/v2/cmd/integration-test/flow.go
+++ b/cmd/integration-test/flow.go
@@ -7,7 +7,7 @@ import (
"net/http/httptest"
"github.com/julienschmidt/httprouter"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
)
var flowTestcases = []TestCaseInfo{
diff --git a/v2/cmd/integration-test/fuzz.go b/cmd/integration-test/fuzz.go
similarity index 98%
rename from v2/cmd/integration-test/fuzz.go
rename to cmd/integration-test/fuzz.go
index 93dc6162..276f8550 100644
--- a/v2/cmd/integration-test/fuzz.go
+++ b/cmd/integration-test/fuzz.go
@@ -8,8 +8,8 @@ import (
"net/url"
"github.com/julienschmidt/httprouter"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
)
var fuzzingTestCases = []TestCaseInfo{
diff --git a/v2/cmd/integration-test/generic.go b/cmd/integration-test/generic.go
similarity index 98%
rename from v2/cmd/integration-test/generic.go
rename to cmd/integration-test/generic.go
index 92fe510f..95ab5694 100644
--- a/v2/cmd/integration-test/generic.go
+++ b/cmd/integration-test/generic.go
@@ -10,7 +10,7 @@ import (
"github.com/julienschmidt/httprouter"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
permissionutil "github.com/projectdiscovery/utils/permission"
)
diff --git a/v2/cmd/integration-test/headless.go b/cmd/integration-test/headless.go
similarity index 99%
rename from v2/cmd/integration-test/headless.go
rename to cmd/integration-test/headless.go
index 3ae57a93..bd2c273c 100644
--- a/v2/cmd/integration-test/headless.go
+++ b/cmd/integration-test/headless.go
@@ -7,7 +7,7 @@ import (
"github.com/julienschmidt/httprouter"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
)
var headlessTestcases = []TestCaseInfo{
diff --git a/v2/cmd/integration-test/http.go b/cmd/integration-test/http.go
similarity index 99%
rename from v2/cmd/integration-test/http.go
rename to cmd/integration-test/http.go
index 71a0097b..79d718fa 100644
--- a/v2/cmd/integration-test/http.go
+++ b/cmd/integration-test/http.go
@@ -17,7 +17,7 @@ import (
"github.com/julienschmidt/httprouter"
"gopkg.in/yaml.v2"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
"github.com/projectdiscovery/retryablehttp-go"
errorutil "github.com/projectdiscovery/utils/errors"
fileutil "github.com/projectdiscovery/utils/file"
diff --git a/v2/cmd/integration-test/integration-test.go b/cmd/integration-test/integration-test.go
similarity index 99%
rename from v2/cmd/integration-test/integration-test.go
rename to cmd/integration-test/integration-test.go
index 61f82daf..697269b8 100644
--- a/v2/cmd/integration-test/integration-test.go
+++ b/cmd/integration-test/integration-test.go
@@ -9,7 +9,7 @@ import (
"github.com/logrusorgru/aurora"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
sliceutil "github.com/projectdiscovery/utils/slice"
)
diff --git a/v2/cmd/integration-test/interactsh.go b/cmd/integration-test/interactsh.go
similarity index 100%
rename from v2/cmd/integration-test/interactsh.go
rename to cmd/integration-test/interactsh.go
diff --git a/v2/cmd/integration-test/javascript.go b/cmd/integration-test/javascript.go
similarity index 98%
rename from v2/cmd/integration-test/javascript.go
rename to cmd/integration-test/javascript.go
index d0caafc6..bdb511b0 100644
--- a/v2/cmd/integration-test/javascript.go
+++ b/cmd/integration-test/javascript.go
@@ -5,7 +5,7 @@ import (
"time"
"github.com/ory/dockertest/v3"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
osutils "github.com/projectdiscovery/utils/os"
"go.uber.org/multierr"
)
diff --git a/v2/cmd/integration-test/library.go b/cmd/integration-test/library.go
similarity index 79%
rename from v2/cmd/integration-test/library.go
rename to cmd/integration-test/library.go
index 0dbce872..b16744dd 100644
--- a/v2/cmd/integration-test/library.go
+++ b/cmd/integration-test/library.go
@@ -15,22 +15,22 @@ import (
"github.com/logrusorgru/aurora"
"github.com/pkg/errors"
"github.com/projectdiscovery/goflags"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/disk"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/loader"
- "github.com/projectdiscovery/nuclei/v2/pkg/core"
- "github.com/projectdiscovery/nuclei/v2/pkg/core/inputs"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/parsers"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/hosterrorscache"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/interactsh"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolinit"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "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/core"
+ "github.com/projectdiscovery/nuclei/v3/pkg/core/inputs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/parsers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/hosterrorscache"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/interactsh"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolinit"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
"github.com/projectdiscovery/ratelimit"
)
diff --git a/v2/cmd/integration-test/loader.go b/cmd/integration-test/loader.go
similarity index 99%
rename from v2/cmd/integration-test/loader.go
rename to cmd/integration-test/loader.go
index 2c3bdc1f..068eeee8 100644
--- a/v2/cmd/integration-test/loader.go
+++ b/cmd/integration-test/loader.go
@@ -9,7 +9,7 @@ import (
"github.com/julienschmidt/httprouter"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
permissionutil "github.com/projectdiscovery/utils/permission"
)
diff --git a/v2/cmd/integration-test/multi.go b/cmd/integration-test/multi.go
similarity index 92%
rename from v2/cmd/integration-test/multi.go
rename to cmd/integration-test/multi.go
index a9ff58ff..ff2aed8e 100644
--- a/v2/cmd/integration-test/multi.go
+++ b/cmd/integration-test/multi.go
@@ -1,7 +1,7 @@
package main
import (
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
)
var multiProtoTestcases = []TestCaseInfo{
diff --git a/v2/cmd/integration-test/network.go b/cmd/integration-test/network.go
similarity index 98%
rename from v2/cmd/integration-test/network.go
rename to cmd/integration-test/network.go
index 73aef67c..5fd2d0fb 100644
--- a/v2/cmd/integration-test/network.go
+++ b/cmd/integration-test/network.go
@@ -4,7 +4,7 @@ import (
"net"
"strings"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
osutils "github.com/projectdiscovery/utils/os"
)
diff --git a/v2/cmd/integration-test/offline-http.go b/cmd/integration-test/offline-http.go
similarity index 96%
rename from v2/cmd/integration-test/offline-http.go
rename to cmd/integration-test/offline-http.go
index 0a9500ca..147a1bf5 100644
--- a/v2/cmd/integration-test/offline-http.go
+++ b/cmd/integration-test/offline-http.go
@@ -3,7 +3,7 @@ package main
import (
"fmt"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
)
var offlineHttpTestcases = []TestCaseInfo{
diff --git a/v2/cmd/integration-test/ssl.go b/cmd/integration-test/ssl.go
similarity index 98%
rename from v2/cmd/integration-test/ssl.go
rename to cmd/integration-test/ssl.go
index ecb79066..70b8c484 100644
--- a/v2/cmd/integration-test/ssl.go
+++ b/cmd/integration-test/ssl.go
@@ -4,7 +4,7 @@ import (
"crypto/tls"
"net"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
)
var sslTestcases = []TestCaseInfo{
diff --git a/v2/cmd/integration-test/template-dir.go b/cmd/integration-test/template-dir.go
similarity index 93%
rename from v2/cmd/integration-test/template-dir.go
rename to cmd/integration-test/template-dir.go
index fb2f74c0..2c60cc60 100644
--- a/v2/cmd/integration-test/template-dir.go
+++ b/cmd/integration-test/template-dir.go
@@ -3,7 +3,7 @@ package main
import (
"os"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
errorutil "github.com/projectdiscovery/utils/errors"
)
diff --git a/v2/cmd/integration-test/template-path.go b/cmd/integration-test/template-path.go
similarity index 92%
rename from v2/cmd/integration-test/template-path.go
rename to cmd/integration-test/template-path.go
index c5943aef..0dbaa60e 100644
--- a/v2/cmd/integration-test/template-path.go
+++ b/cmd/integration-test/template-path.go
@@ -4,8 +4,8 @@ import (
"fmt"
"strings"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
)
func getTemplatePath() string {
@@ -27,7 +27,7 @@ type cwdTemplateTest struct{}
// Execute executes a test case and returns an error if occurred
func (h *cwdTemplateTest) Execute(filePath string) error {
- results, err := testutils.RunNucleiTemplateAndGetResults(filePath, "8x8exch02.8x8.com", debug)
+ results, err := testutils.RunNucleiTemplateAndGetResults(filePath, "8x8exch02.8x8.com", debug, "-ms")
if err != nil {
return err
}
diff --git a/v2/cmd/integration-test/websocket.go b/cmd/integration-test/websocket.go
similarity index 98%
rename from v2/cmd/integration-test/websocket.go
rename to cmd/integration-test/websocket.go
index fc6508e0..b7d35aa7 100644
--- a/v2/cmd/integration-test/websocket.go
+++ b/cmd/integration-test/websocket.go
@@ -6,7 +6,7 @@ import (
"github.com/gobwas/ws/wsutil"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
)
var websocketTestCases = []TestCaseInfo{
diff --git a/v2/cmd/integration-test/whois.go b/cmd/integration-test/whois.go
similarity index 89%
rename from v2/cmd/integration-test/whois.go
rename to cmd/integration-test/whois.go
index 8e3954e5..1d39214e 100644
--- a/v2/cmd/integration-test/whois.go
+++ b/cmd/integration-test/whois.go
@@ -1,7 +1,7 @@
package main
import (
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
)
var whoisTestCases = []TestCaseInfo{
diff --git a/v2/cmd/integration-test/workflow.go b/cmd/integration-test/workflow.go
similarity index 98%
rename from v2/cmd/integration-test/workflow.go
rename to cmd/integration-test/workflow.go
index 4cfb95b1..c0ccb8ee 100644
--- a/v2/cmd/integration-test/workflow.go
+++ b/cmd/integration-test/workflow.go
@@ -8,7 +8,7 @@ import (
"github.com/julienschmidt/httprouter"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
)
var workflowTestcases = []TestCaseInfo{
diff --git a/v2/cmd/nuclei/issue-tracker-config.yaml b/cmd/nuclei/issue-tracker-config.yaml
similarity index 100%
rename from v2/cmd/nuclei/issue-tracker-config.yaml
rename to cmd/nuclei/issue-tracker-config.yaml
diff --git a/v2/cmd/nuclei/main.go b/cmd/nuclei/main.go
similarity index 97%
rename from v2/cmd/nuclei/main.go
rename to cmd/nuclei/main.go
index 4f4e3f9f..88c838aa 100644
--- a/v2/cmd/nuclei/main.go
+++ b/cmd/nuclei/main.go
@@ -16,20 +16,20 @@ import (
"github.com/projectdiscovery/gologger"
"github.com/projectdiscovery/gologger/levels"
"github.com/projectdiscovery/interactsh/pkg/client"
- "github.com/projectdiscovery/nuclei/v2/internal/installer"
- "github.com/projectdiscovery/nuclei/v2/internal/runner"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/common/dsl"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/uncover"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/http"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates/extensions"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates/signer"
- templateTypes "github.com/projectdiscovery/nuclei/v2/pkg/templates/types"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
- "github.com/projectdiscovery/nuclei/v2/pkg/types/scanstrategy"
- "github.com/projectdiscovery/nuclei/v2/pkg/utils/monitor"
+ "github.com/projectdiscovery/nuclei/v3/internal/installer"
+ "github.com/projectdiscovery/nuclei/v3/internal/runner"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/common/dsl"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/uncover"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/http"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates/extensions"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates/signer"
+ templateTypes "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types/scanstrategy"
+ "github.com/projectdiscovery/nuclei/v3/pkg/utils/monitor"
errorutil "github.com/projectdiscovery/utils/errors"
fileutil "github.com/projectdiscovery/utils/file"
)
@@ -54,6 +54,8 @@ func main() {
// sign the templates if requested - only glob syntax is supported
if options.SignTemplates {
+ // use parsed options when initializing signer instead of default options
+ templates.UseOptionsForSigner(options)
tsigner, err := signer.NewTemplateSigner(nil, nil) // will read from env , config or generate new keys
if err != nil {
gologger.Fatal().Msgf("couldn't initialize signer crypto engine: %s\n", err)
diff --git a/v2/cmd/tmc/main.go b/cmd/tmc/main.go
similarity index 97%
rename from v2/cmd/tmc/main.go
rename to cmd/tmc/main.go
index 850ef552..2677e056 100644
--- a/v2/cmd/tmc/main.go
+++ b/cmd/tmc/main.go
@@ -15,13 +15,13 @@ import (
"github.com/projectdiscovery/goflags"
"github.com/projectdiscovery/gologger"
"github.com/projectdiscovery/gologger/levels"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/disk"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolinit"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/disk"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolinit"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
"github.com/projectdiscovery/retryablehttp-go"
errorutil "github.com/projectdiscovery/utils/errors"
"gopkg.in/yaml.v3"
diff --git a/v2/cmd/tmc/types.go b/cmd/tmc/types.go
similarity index 100%
rename from v2/cmd/tmc/types.go
rename to cmd/tmc/types.go
diff --git a/v2/cmd/tools/fuzzplayground/main.go b/cmd/tools/fuzzplayground/main.go
similarity index 100%
rename from v2/cmd/tools/fuzzplayground/main.go
rename to cmd/tools/fuzzplayground/main.go
diff --git a/docs/getting-started/install.mdx b/docs/getting-started/install.mdx
index 836854ed..3283ffca 100644
--- a/docs/getting-started/install.mdx
+++ b/docs/getting-started/install.mdx
@@ -6,7 +6,7 @@ title: 'Install'
```bash
- go install -v github.com/projectdiscovery/nuclei/v2/cmd/nuclei@latest
+ go install -v github.com/projectdiscovery/nuclei/v3/cmd/nuclei@latest
```
Nuclei require latest **GO** version to install successfully.
@@ -30,7 +30,7 @@ title: 'Install'
```bash
git clone https://github.com/projectdiscovery/nuclei.git; \
- cd nuclei/v2/cmd/nuclei; \
+ cd nuclei/cmd/nuclei; \
go build; \
mv nuclei /usr/local/bin/; \
nuclei -version;
diff --git a/docs/getting-started/running.mdx b/docs/getting-started/running.mdx
index 6b546a94..a754a29e 100644
--- a/docs/getting-started/running.mdx
+++ b/docs/getting-started/running.mdx
@@ -694,7 +694,7 @@ Nuclei comes with reporting module support with the release of [v2.3.0](https://
| ------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| **Support** | | | | | | | |
-`-rc, -report-config` flag can be used to provide a config file to read configuration details of the platform to integrate. Here is an [example config file](https://github.com/projectdiscovery/nuclei/blob/master/v2/cmd/nuclei/issue-tracker-config.yaml) for all supported platforms.
+`-rc, -report-config` flag can be used to provide a config file to read configuration details of the platform to integrate. Here is an [example config file](https://github.com/projectdiscovery/nuclei/blob/main/cmd/nuclei/issue-tracker-config.yaml) for all supported platforms.
For example, to create tickets on GitHub, create a config file with the following content and replace the appropriate values:
diff --git a/docs/template-guide/javascript.mdx b/docs/template-guide/javascript.mdx
index bb82aa98..f5d1691f 100644
--- a/docs/template-guide/javascript.mdx
+++ b/docs/template-guide/javascript.mdx
@@ -215,4 +215,4 @@ A collection of javascript protocol templates can be found [here](https://github
## Contributing
-If you want to add a new module or function to nuclei javascript runtime please open a PR with your changes, refer [Contributing](https://github.com/projectdiscovery/nuclei/blob/7085b47c19dbe3a70b3d4eb23177995bda5c285a/v2/pkg/js/CONTRIBUTE.md) for more details.
+If you want to add a new module or function to nuclei javascript runtime please open a PR with your changes, refer [Contributing](https://github.com/projectdiscovery/nuclei/blob/7085b47c19dbe3a70b3d4eb23177995bda5c285a/pkg/js/CONTRIBUTE.md) for more details.
diff --git a/v2/examples/advanced/advanced.go b/examples/advanced/advanced.go
similarity index 95%
rename from v2/examples/advanced/advanced.go
rename to examples/advanced/advanced.go
index 86a871a2..f2f3da16 100644
--- a/v2/examples/advanced/advanced.go
+++ b/examples/advanced/advanced.go
@@ -1,7 +1,7 @@
package main
import (
- nuclei "github.com/projectdiscovery/nuclei/v2/lib"
+ nuclei "github.com/projectdiscovery/nuclei/v3/lib"
"github.com/remeh/sizedwaitgroup"
)
diff --git a/v2/examples/simple/simple.go b/examples/simple/simple.go
similarity index 90%
rename from v2/examples/simple/simple.go
rename to examples/simple/simple.go
index e9a881dd..42d3fe43 100644
--- a/v2/examples/simple/simple.go
+++ b/examples/simple/simple.go
@@ -1,6 +1,6 @@
package main
-import nuclei "github.com/projectdiscovery/nuclei/v2/lib"
+import nuclei "github.com/projectdiscovery/nuclei/v3/lib"
func main() {
ne, err := nuclei.NewNucleiEngine(
diff --git a/v2/gh_retry.sh b/gh_retry.sh
similarity index 100%
rename from v2/gh_retry.sh
rename to gh_retry.sh
diff --git a/v2/go.mod b/go.mod
similarity index 99%
rename from v2/go.mod
rename to go.mod
index 55e0b345..642ad312 100644
--- a/v2/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/projectdiscovery/nuclei/v2
+module github.com/projectdiscovery/nuclei/v3
go 1.21
@@ -89,7 +89,7 @@ require (
github.com/projectdiscovery/ratelimit v0.0.11
github.com/projectdiscovery/rdap v0.9.1-0.20221108103045-9865884d1917
github.com/projectdiscovery/sarif v0.0.1
- github.com/projectdiscovery/tlsx v1.1.5
+ github.com/projectdiscovery/tlsx v1.1.6-0.20231016194953-a3ff9518c766
github.com/projectdiscovery/uncover v1.0.6-0.20230601103158-bfd7e02a5bb1
github.com/projectdiscovery/utils v0.0.58
github.com/projectdiscovery/wappalyzergo v0.0.109
diff --git a/v2/go.sum b/go.sum
similarity index 99%
rename from v2/go.sum
rename to go.sum
index bbaaaca2..9d03d41f 100644
--- a/v2/go.sum
+++ b/go.sum
@@ -833,8 +833,8 @@ github.com/projectdiscovery/sarif v0.0.1 h1:C2Tyj0SGOKbCLgHrx83vaE6YkzXEVrMXYRGL
github.com/projectdiscovery/sarif v0.0.1/go.mod h1:cEYlDu8amcPf6b9dSakcz2nNnJsoz4aR6peERwV+wuQ=
github.com/projectdiscovery/stringsutil v0.0.2 h1:uzmw3IVLJSMW1kEg8eCStG/cGbYYZAja8BH3LqqJXMA=
github.com/projectdiscovery/stringsutil v0.0.2/go.mod h1:EJ3w6bC5fBYjVou6ryzodQq37D5c6qbAYQpGmAy+DC0=
-github.com/projectdiscovery/tlsx v1.1.5 h1:S8KV2ckcjW3hDBa/REmDdsZfHwYJ9eKoZ7rtgETkwkM=
-github.com/projectdiscovery/tlsx v1.1.5/go.mod h1:0a0TdWb3fYeVpuPsJuf5AGtwZIKwkY0kxdO9lojU6S4=
+github.com/projectdiscovery/tlsx v1.1.6-0.20231016194953-a3ff9518c766 h1:wa2wak7RAPA9QfCKZYXVvJCggbrIptc4ZkPjEvCKAKo=
+github.com/projectdiscovery/tlsx v1.1.6-0.20231016194953-a3ff9518c766/go.mod h1:bFATagikCvdPOsmaN1h5VQSbZjTW8bCQ6bjoQEePUq8=
github.com/projectdiscovery/uncover v1.0.6-0.20230601103158-bfd7e02a5bb1 h1:Pu6LvDqn+iSlhCDKKWm1ItPc++kqqlU8OntZeB/Prak=
github.com/projectdiscovery/uncover v1.0.6-0.20230601103158-bfd7e02a5bb1/go.mod h1:Drl/CWD392mKtdXJhCBPlMkM0I6671pqedFphcnK5f8=
github.com/projectdiscovery/utils v0.0.58 h1:kk2AkSO84QZc9rDRI8jWA2Iia4uzb4sUcfh4h0xA20I=
diff --git a/integration_tests/debug.sh b/integration_tests/debug.sh
index 57bfd038..f5212735 100755
--- a/integration_tests/debug.sh
+++ b/integration_tests/debug.sh
@@ -17,11 +17,11 @@ export GORACE="halt_on_error=1"
echo "::group::Build nuclei"
rm nuclei 2>/dev/null
-cd ../v2/cmd/nuclei
+cd ../cmd/nuclei
go build -race .
-mv nuclei ../../../integration_tests/nuclei
+mv nuclei ../../integration_tests/nuclei
echo -e "::endgroup::\n"
-cd ../../../integration_tests
+cd ../../integration_tests
cmdstring=""
if [ -n "$1" ]; then
diff --git a/integration_tests/protocols/code/py-env-var.yaml b/integration_tests/protocols/code/py-env-var.yaml
index d76ca02e..e3487bd9 100644
--- a/integration_tests/protocols/code/py-env-var.yaml
+++ b/integration_tests/protocols/code/py-env-var.yaml
@@ -20,4 +20,4 @@ code:
- type: word
words:
- "hello from input baz"
-# digest: 4a0a00473045022100eb01da6b97893e7868c584f330a0cd52df9bddac005860bb8595ba5b8aed58c9022050043feac68d69045cf320cba9298a2eb2e792ea4720d045d01e803de1943e7d:4a3eb6b4988d95847d4203be25ed1d46
\ No newline at end of file
+# digest: 4a0a00473045022100d407a3b848664b4c271abb4462a89a53fa2da6c21fd66011974ac395e2dc041c0220129a752a792337f6efe2e96562989016fe2709820b9583fd933f02be3b9d074f:4a3eb6b4988d95847d4203be25ed1d46
\ No newline at end of file
diff --git a/integration_tests/protocols/code/py-file.yaml b/integration_tests/protocols/code/py-file.yaml
index 790daeb0..f18b7bb2 100644
--- a/integration_tests/protocols/code/py-file.yaml
+++ b/integration_tests/protocols/code/py-file.yaml
@@ -18,4 +18,4 @@ code:
- type: word
words:
- "hello from input"
-# digest: 4a0a00473045022100863e07e45c5fa8d808022dfd60679145e17b4ad6c97b493ef28adaf586407dc3022001f2b2d6e565123c0ef51921862352b0b5499b4adfbf5a92af20eb77107c4920:4a3eb6b4988d95847d4203be25ed1d46
\ No newline at end of file
+# digest: 4b0a004830460221009db4541aa2af10aae5f39fe6e8789e2717c96ebbdadfdf33114ec0e82ec4da73022100fa98ee6611b606befc139946a169cca717f16ebf71beac97fdde1fe0c7fba774:4a3eb6b4988d95847d4203be25ed1d46
\ No newline at end of file
diff --git a/integration_tests/protocols/code/py-interactsh.yaml b/integration_tests/protocols/code/py-interactsh.yaml
index 173c3db5..96e16e98 100644
--- a/integration_tests/protocols/code/py-interactsh.yaml
+++ b/integration_tests/protocols/code/py-interactsh.yaml
@@ -26,4 +26,4 @@ code:
part: interactsh_protocol
words:
- "http"
-# digest: 4a0a004730450220785cbdcb0925c922fb34055b3b9277dec165e2f3ba938f5fd7488d400b11a1f5022100dc67027e9e8d6f249c8fc68d61866d636b137bd28e6870a716fbbe969f8b672b:4a3eb6b4988d95847d4203be25ed1d46
\ No newline at end of file
+# digest: 4a0a0047304502205ebee72972ea0005ecdbcf7cd676ab861f3a44477a4b85dc1e745b7a628d2d7a022100ec4604673a1d43311ab343005464be5d4ee26b5a1f39206aa841056f3e2057dd:4a3eb6b4988d95847d4203be25ed1d46
\ No newline at end of file
diff --git a/integration_tests/protocols/code/py-snippet.yaml b/integration_tests/protocols/code/py-snippet.yaml
index b0e0971e..7a6a1781 100644
--- a/integration_tests/protocols/code/py-snippet.yaml
+++ b/integration_tests/protocols/code/py-snippet.yaml
@@ -21,4 +21,4 @@ code:
- type: word
words:
- "hello from input"
-# digest: 4a0a00473045022067a69eb337ffa56d1c8e2cc57b7f74a5eb3294e6f366c9074778b2da3f1d795d02210096d6acda6acd2fe0ff005b08a9c0b72b63f599532ec6493f44b8518265d0e5fd:4a3eb6b4988d95847d4203be25ed1d46
\ No newline at end of file
+# digest: 4b0a004830460221009a87b77e770e688bb1ce05e75ac075cdb3f318aad18a6dbc3fc2ec729a8ba5990221009020d69ba3baf47f9d835d4b6bd644a9e4f2d699369acc2a15983f5c270d2e79:4a3eb6b4988d95847d4203be25ed1d46
\ No newline at end of file
diff --git a/integration_tests/run.sh b/integration_tests/run.sh
index f273166e..92b76ab1 100755
--- a/integration_tests/run.sh
+++ b/integration_tests/run.sh
@@ -2,16 +2,16 @@
echo "::group::Build nuclei"
rm integration-test nuclei 2>/dev/null
-cd ../v2/cmd/nuclei
+cd ../cmd/nuclei
go build -race .
-mv nuclei ../../../integration_tests/nuclei
+mv nuclei ../../integration_tests/nuclei
echo "::endgroup::"
echo "::group::Build nuclei integration-test"
cd ../integration-test
go build
-mv integration-test ../../../integration_tests/integration-test
-cd ../../../integration_tests
+mv integration-test ../../integration_tests/integration-test
+cd ../../integration_tests
echo "::endgroup::"
echo "::group::Installing nuclei templates"
diff --git a/v2/internal/colorizer/colorizer.go b/internal/colorizer/colorizer.go
similarity index 92%
rename from v2/internal/colorizer/colorizer.go
rename to internal/colorizer/colorizer.go
index f9a32e86..3e369349 100644
--- a/v2/internal/colorizer/colorizer.go
+++ b/internal/colorizer/colorizer.go
@@ -5,7 +5,7 @@ import (
"github.com/logrusorgru/aurora"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
)
const (
diff --git a/v2/internal/installer/doc.go b/internal/installer/doc.go
similarity index 100%
rename from v2/internal/installer/doc.go
rename to internal/installer/doc.go
diff --git a/v2/internal/installer/template.go b/internal/installer/template.go
similarity index 99%
rename from v2/internal/installer/template.go
rename to internal/installer/template.go
index 3db4924c..37a959cf 100644
--- a/v2/internal/installer/template.go
+++ b/internal/installer/template.go
@@ -15,8 +15,8 @@ import (
"github.com/charmbracelet/glamour"
"github.com/olekukonko/tablewriter"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- "github.com/projectdiscovery/nuclei/v2/pkg/external/customtemplates"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/external/customtemplates"
errorutil "github.com/projectdiscovery/utils/errors"
fileutil "github.com/projectdiscovery/utils/file"
stringsutil "github.com/projectdiscovery/utils/strings"
diff --git a/v2/internal/installer/template_test.go b/internal/installer/template_test.go
similarity index 96%
rename from v2/internal/installer/template_test.go
rename to internal/installer/template_test.go
index 95f44f85..0f277db6 100644
--- a/v2/internal/installer/template_test.go
+++ b/internal/installer/template_test.go
@@ -6,7 +6,7 @@ import (
"strings"
"testing"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
"github.com/stretchr/testify/require"
)
diff --git a/v2/internal/installer/util.go b/internal/installer/util.go
similarity index 98%
rename from v2/internal/installer/util.go
rename to internal/installer/util.go
index 57ae05bb..c0f7520d 100644
--- a/v2/internal/installer/util.go
+++ b/internal/installer/util.go
@@ -13,7 +13,7 @@ import (
"github.com/Masterminds/semver/v3"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
errorutil "github.com/projectdiscovery/utils/errors"
)
diff --git a/v2/internal/installer/versioncheck.go b/internal/installer/versioncheck.go
similarity index 98%
rename from v2/internal/installer/versioncheck.go
rename to internal/installer/versioncheck.go
index fa920524..54d66188 100644
--- a/v2/internal/installer/versioncheck.go
+++ b/internal/installer/versioncheck.go
@@ -8,7 +8,7 @@ import (
"runtime"
"sync"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
"github.com/projectdiscovery/retryablehttp-go"
updateutils "github.com/projectdiscovery/utils/update"
)
diff --git a/v2/internal/installer/versioncheck_test.go b/internal/installer/versioncheck_test.go
similarity index 90%
rename from v2/internal/installer/versioncheck_test.go
rename to internal/installer/versioncheck_test.go
index dca1665b..8b8dccc3 100644
--- a/v2/internal/installer/versioncheck_test.go
+++ b/internal/installer/versioncheck_test.go
@@ -3,7 +3,7 @@ package installer
import (
"testing"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
"github.com/projectdiscovery/utils/generic"
"github.com/stretchr/testify/require"
)
diff --git a/v2/internal/installer/zipslip_unix_test.go b/internal/installer/zipslip_unix_test.go
similarity index 100%
rename from v2/internal/installer/zipslip_unix_test.go
rename to internal/installer/zipslip_unix_test.go
diff --git a/v2/internal/runner/banner.go b/internal/runner/banner.go
similarity index 91%
rename from v2/internal/runner/banner.go
rename to internal/runner/banner.go
index 03725ec1..d5157d98 100644
--- a/v2/internal/runner/banner.go
+++ b/internal/runner/banner.go
@@ -4,7 +4,7 @@ import (
"fmt"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
updateutils "github.com/projectdiscovery/utils/update"
)
diff --git a/v2/internal/runner/cloud.go b/internal/runner/cloud.go
similarity index 98%
rename from v2/internal/runner/cloud.go
rename to internal/runner/cloud.go
index 4d173bf2..da58f15d 100644
--- a/v2/internal/runner/cloud.go
+++ b/internal/runner/cloud.go
@@ -13,9 +13,9 @@ import (
"github.com/olekukonko/tablewriter"
"github.com/pkg/errors"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/internal/runner/nucleicloud"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates/extensions"
+ "github.com/projectdiscovery/nuclei/v3/internal/runner/nucleicloud"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates/extensions"
)
// Get all the scan lists for a user/apikey.
diff --git a/v2/internal/runner/defaults.go b/internal/runner/defaults.go
similarity index 100%
rename from v2/internal/runner/defaults.go
rename to internal/runner/defaults.go
diff --git a/v2/internal/runner/doc.go b/internal/runner/doc.go
similarity index 100%
rename from v2/internal/runner/doc.go
rename to internal/runner/doc.go
diff --git a/v2/internal/runner/enumerate.go b/internal/runner/enumerate.go
similarity index 92%
rename from v2/internal/runner/enumerate.go
rename to internal/runner/enumerate.go
index e0a00ddc..31c079a4 100644
--- a/v2/internal/runner/enumerate.go
+++ b/internal/runner/enumerate.go
@@ -17,13 +17,13 @@ import (
"github.com/klauspost/compress/zlib"
"github.com/pkg/errors"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/internal/runner/nucleicloud"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/loader"
- "github.com/projectdiscovery/nuclei/v2/pkg/core"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/internal/runner/nucleicloud"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/loader"
+ "github.com/projectdiscovery/nuclei/v3/pkg/core"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
)
// runStandardEnumeration runs standard enumeration
diff --git a/v2/internal/runner/healthcheck.go b/internal/runner/healthcheck.go
similarity index 95%
rename from v2/internal/runner/healthcheck.go
rename to internal/runner/healthcheck.go
index abeb51ec..da85bd5a 100644
--- a/v2/internal/runner/healthcheck.go
+++ b/internal/runner/healthcheck.go
@@ -6,8 +6,8 @@ import (
"runtime"
"strings"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
fileutil "github.com/projectdiscovery/utils/file"
)
diff --git a/v2/internal/runner/inputs.go b/internal/runner/inputs.go
similarity index 93%
rename from v2/internal/runner/inputs.go
rename to internal/runner/inputs.go
index 191972a0..406986d9 100644
--- a/v2/internal/runner/inputs.go
+++ b/internal/runner/inputs.go
@@ -8,8 +8,8 @@ import (
"github.com/projectdiscovery/gologger"
"github.com/projectdiscovery/hmap/store/hybrid"
"github.com/projectdiscovery/httpx/common/httpx"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/utils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/utils"
stringsutil "github.com/projectdiscovery/utils/strings"
"github.com/remeh/sizedwaitgroup"
)
diff --git a/v2/internal/runner/nucleicloud/cloud.go b/internal/runner/nucleicloud/cloud.go
similarity index 99%
rename from v2/internal/runner/nucleicloud/cloud.go
rename to internal/runner/nucleicloud/cloud.go
index 09a793b3..54b21640 100644
--- a/v2/internal/runner/nucleicloud/cloud.go
+++ b/internal/runner/nucleicloud/cloud.go
@@ -17,7 +17,7 @@ import (
jsoniter "github.com/json-iterator/go"
"github.com/pkg/errors"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
"github.com/projectdiscovery/retryablehttp-go"
)
diff --git a/v2/internal/runner/nucleicloud/types.go b/internal/runner/nucleicloud/types.go
similarity index 97%
rename from v2/internal/runner/nucleicloud/types.go
rename to internal/runner/nucleicloud/types.go
index a97ff660..6eaa7237 100644
--- a/v2/internal/runner/nucleicloud/types.go
+++ b/internal/runner/nucleicloud/types.go
@@ -4,8 +4,8 @@ import (
"encoding/json"
"time"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
)
// AddScanRequest is a nuclei scan input item.
diff --git a/v2/internal/runner/nucleicloud/utils.go b/internal/runner/nucleicloud/utils.go
similarity index 95%
rename from v2/internal/runner/nucleicloud/utils.go
rename to internal/runner/nucleicloud/utils.go
index 5586937c..628d9715 100644
--- a/v2/internal/runner/nucleicloud/utils.go
+++ b/internal/runner/nucleicloud/utils.go
@@ -7,7 +7,7 @@ import (
"strings"
"time"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
)
const DDMMYYYYhhmmss = "2006-01-02 15:04:05"
diff --git a/v2/internal/runner/options.go b/internal/runner/options.go
similarity index 97%
rename from v2/internal/runner/options.go
rename to internal/runner/options.go
index fb81b0ba..94bc4c36 100644
--- a/v2/internal/runner/options.go
+++ b/internal/runner/options.go
@@ -16,12 +16,12 @@ import (
"github.com/projectdiscovery/gologger"
"github.com/projectdiscovery/gologger/formatter"
"github.com/projectdiscovery/gologger/levels"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolinit"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/utils/vardump"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/headless/engine"
- protocoltypes "github.com/projectdiscovery/nuclei/v2/pkg/templates/types"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolinit"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/utils/vardump"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/headless/engine"
+ protocoltypes "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
fileutil "github.com/projectdiscovery/utils/file"
"github.com/projectdiscovery/utils/generic"
logutil "github.com/projectdiscovery/utils/log"
diff --git a/v2/internal/runner/options_test.go b/internal/runner/options_test.go
similarity index 95%
rename from v2/internal/runner/options_test.go
rename to internal/runner/options_test.go
index 72a9adb3..92a6fc76 100644
--- a/v2/internal/runner/options_test.go
+++ b/internal/runner/options_test.go
@@ -5,7 +5,7 @@ import (
"testing"
"github.com/projectdiscovery/goflags"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
"github.com/stretchr/testify/require"
)
diff --git a/v2/internal/runner/proxy.go b/internal/runner/proxy.go
similarity index 97%
rename from v2/internal/runner/proxy.go
rename to internal/runner/proxy.go
index a4323eeb..3513d1c5 100644
--- a/v2/internal/runner/proxy.go
+++ b/internal/runner/proxy.go
@@ -8,7 +8,7 @@ import (
"strings"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
errorutil "github.com/projectdiscovery/utils/errors"
fileutil "github.com/projectdiscovery/utils/file"
proxyutils "github.com/projectdiscovery/utils/proxy"
diff --git a/v2/internal/runner/runner.go b/internal/runner/runner.go
similarity index 91%
rename from v2/internal/runner/runner.go
rename to internal/runner/runner.go
index 45c4b699..7ae8079e 100644
--- a/v2/internal/runner/runner.go
+++ b/internal/runner/runner.go
@@ -12,8 +12,8 @@ import (
"sync/atomic"
"time"
- "github.com/projectdiscovery/nuclei/v2/internal/installer"
- "github.com/projectdiscovery/nuclei/v2/internal/runner/nucleicloud"
+ "github.com/projectdiscovery/nuclei/v3/internal/installer"
+ "github.com/projectdiscovery/nuclei/v3/internal/runner/nucleicloud"
uncoverlib "github.com/projectdiscovery/uncover"
permissionutil "github.com/projectdiscovery/utils/permission"
updateutils "github.com/projectdiscovery/utils/update"
@@ -23,39 +23,39 @@ import (
"github.com/projectdiscovery/ratelimit"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/internal/colorizer"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/disk"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/loader"
- "github.com/projectdiscovery/nuclei/v2/pkg/core"
- "github.com/projectdiscovery/nuclei/v2/pkg/core/inputs/hybrid"
- "github.com/projectdiscovery/nuclei/v2/pkg/external/customtemplates"
- "github.com/projectdiscovery/nuclei/v2/pkg/input"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/parsers"
- "github.com/projectdiscovery/nuclei/v2/pkg/progress"
- "github.com/projectdiscovery/nuclei/v2/pkg/projectfile"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/automaticscan"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/hosterrorscache"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/interactsh"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolinit"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/uncover"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/utils/excludematchers"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/headless/engine"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/http/httpclientpool"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/exporters/jsonexporter"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/exporters/jsonl"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/exporters/markdown"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/exporters/sarif"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
- "github.com/projectdiscovery/nuclei/v2/pkg/utils"
- "github.com/projectdiscovery/nuclei/v2/pkg/utils/stats"
- "github.com/projectdiscovery/nuclei/v2/pkg/utils/yaml"
+ "github.com/projectdiscovery/nuclei/v3/internal/colorizer"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog"
+ "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/core"
+ "github.com/projectdiscovery/nuclei/v3/pkg/core/inputs/hybrid"
+ "github.com/projectdiscovery/nuclei/v3/pkg/external/customtemplates"
+ "github.com/projectdiscovery/nuclei/v3/pkg/input"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/parsers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/progress"
+ "github.com/projectdiscovery/nuclei/v3/pkg/projectfile"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/automaticscan"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/hosterrorscache"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/interactsh"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolinit"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/uncover"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/utils/excludematchers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/headless/engine"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/http/httpclientpool"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/exporters/jsonexporter"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/exporters/jsonl"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/exporters/markdown"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/exporters/sarif"
+ "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/stats"
+ "github.com/projectdiscovery/nuclei/v3/pkg/utils/yaml"
"github.com/projectdiscovery/retryablehttp-go"
ptrutil "github.com/projectdiscovery/utils/ptr"
)
@@ -691,7 +691,7 @@ func (r *Runner) displayExecutionInfo(store *loader.Store) {
if v.Load() > 0 {
if k != templates.Unsigned {
gologger.Info().Msgf("Executing %d signed templates from %s", v.Load(), k)
- } else if !r.options.Silent {
+ } else if !r.options.Silent && !config.DefaultConfig.HideTemplateSigWarning {
gologger.DefaultLogger.Print().Msgf("[%v] Executing %d unsigned templates. Use with caution.", aurora.BrightYellow("WRN"), v.Load())
}
}
diff --git a/v2/internal/runner/runner_test.go b/internal/runner/runner_test.go
similarity index 90%
rename from v2/internal/runner/runner_test.go
rename to internal/runner/runner_test.go
index 5ab8a0b8..da9ff189 100644
--- a/v2/internal/runner/runner_test.go
+++ b/internal/runner/runner_test.go
@@ -6,20 +6,20 @@ import (
"github.com/stretchr/testify/assert"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
)
-func Test_createReportingOptions(t *testing.T) {
+func TestCreateReportingOptions(t *testing.T) {
var options types.Options
- options.ReportingConfig = "../../../integration_tests/test-issue-tracker-config1.yaml"
+ options.ReportingConfig = "../../integration_tests/test-issue-tracker-config1.yaml"
resultOptions, err := createReportingOptions(&options)
assert.Nil(t, err)
assert.Equal(t, resultOptions.AllowList.Severities, severity.Severities{severity.High, severity.Critical})
assert.Equal(t, resultOptions.DenyList.Severities, severity.Severities{severity.Low})
- options.ReportingConfig = "../../../integration_tests/test-issue-tracker-config2.yaml"
+ options.ReportingConfig = "../../integration_tests/test-issue-tracker-config2.yaml"
resultOptions2, err := createReportingOptions(&options)
assert.Nil(t, err)
assert.Equal(t, resultOptions2.AllowList.Severities, resultOptions.AllowList.Severities)
diff --git a/v2/internal/runner/templates.go b/internal/runner/templates.go
similarity index 90%
rename from v2/internal/runner/templates.go
rename to internal/runner/templates.go
index f0d9cfe5..0c8bb90b 100644
--- a/v2/internal/runner/templates.go
+++ b/internal/runner/templates.go
@@ -7,13 +7,13 @@ import (
"github.com/alecthomas/chroma/quick"
"github.com/logrusorgru/aurora"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/loader"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/loader"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/parsers"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/parsers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
)
// log available templates for verbose (-vv)
diff --git a/v2/lib/README.md b/lib/README.md
similarity index 93%
rename from v2/lib/README.md
rename to lib/README.md
index fdfc22ce..3f19ffb4 100644
--- a/v2/lib/README.md
+++ b/lib/README.md
@@ -7,13 +7,13 @@ Nuclei was primarily built as a CLI tool, but with increasing choice of users wa
To add nuclei as a library to your go project, you can use the following command:
```bash
-go get -u github.com/projectdiscovery/nuclei/v2/lib
+go get -u github.com/projectdiscovery/nuclei/v3/lib
```
Or add below import to your go file and let IDE handle the rest:
```go
-import nuclei "github.com/projectdiscovery/nuclei/v2/lib"
+import nuclei "github.com/projectdiscovery/nuclei/v3/lib"
```
## Basic Example of using Nuclei Library/SDK
@@ -75,7 +75,7 @@ For Various use cases like batching etc you might want to run nuclei in goroutin
## More Documentation
-For complete documentation of nuclei library, please refer to [godoc](https://pkg.go.dev/github.com/projectdiscovery/nuclei/v2/lib) which contains all available options and methods.
+For complete documentation of nuclei library, please refer to [godoc](https://pkg.go.dev/github.com/projectdiscovery/nuclei/v3/lib) which contains all available options and methods.
diff --git a/v2/lib/config.go b/lib/config.go
similarity index 95%
rename from v2/lib/config.go
rename to lib/config.go
index e6977984..4c7cfdd9 100644
--- a/v2/lib/config.go
+++ b/lib/config.go
@@ -5,14 +5,14 @@ import (
"time"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/progress"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/hosterrorscache"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/interactsh"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/utils/vardump"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/headless/engine"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/progress"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/hosterrorscache"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/interactsh"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/utils/vardump"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/headless/engine"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
"github.com/projectdiscovery/ratelimit"
)
diff --git a/v2/lib/example_test.go b/lib/example_test.go
similarity index 97%
rename from v2/lib/example_test.go
rename to lib/example_test.go
index 9794f6c9..61b82f3f 100644
--- a/v2/lib/example_test.go
+++ b/lib/example_test.go
@@ -7,7 +7,7 @@ import (
"os"
"testing"
- nuclei "github.com/projectdiscovery/nuclei/v2/lib"
+ nuclei "github.com/projectdiscovery/nuclei/v3/lib"
"github.com/remeh/sizedwaitgroup"
)
diff --git a/v2/lib/helper.go b/lib/helper.go
similarity index 87%
rename from v2/lib/helper.go
rename to lib/helper.go
index 281f6799..c5c05bb5 100644
--- a/v2/lib/helper.go
+++ b/lib/helper.go
@@ -3,9 +3,9 @@ package nuclei
import (
"context"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- uncoverNuclei "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/uncover"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ uncoverNuclei "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/uncover"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates"
"github.com/projectdiscovery/uncover"
)
diff --git a/v2/lib/multi.go b/lib/multi.go
similarity index 91%
rename from v2/lib/multi.go
rename to lib/multi.go
index ebd85e05..daf4e295 100644
--- a/v2/lib/multi.go
+++ b/lib/multi.go
@@ -5,14 +5,14 @@ import (
"time"
"github.com/logrusorgru/aurora"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/loader"
- "github.com/projectdiscovery/nuclei/v2/pkg/core"
- "github.com/projectdiscovery/nuclei/v2/pkg/core/inputs"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/parsers"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/loader"
+ "github.com/projectdiscovery/nuclei/v3/pkg/core"
+ "github.com/projectdiscovery/nuclei/v3/pkg/core/inputs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/parsers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
"github.com/projectdiscovery/ratelimit"
errorutil "github.com/projectdiscovery/utils/errors"
)
diff --git a/v2/lib/sdk.go b/lib/sdk.go
similarity index 86%
rename from v2/lib/sdk.go
rename to lib/sdk.go
index 6c1e319b..ddfd583c 100644
--- a/v2/lib/sdk.go
+++ b/lib/sdk.go
@@ -5,20 +5,20 @@ import (
"io"
"github.com/projectdiscovery/httpx/common/httpx"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/disk"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/loader"
- "github.com/projectdiscovery/nuclei/v2/pkg/core"
- "github.com/projectdiscovery/nuclei/v2/pkg/core/inputs"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/parsers"
- "github.com/projectdiscovery/nuclei/v2/pkg/progress"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/hosterrorscache"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/interactsh"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/headless/engine"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/disk"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/loader"
+ "github.com/projectdiscovery/nuclei/v3/pkg/core"
+ "github.com/projectdiscovery/nuclei/v3/pkg/core/inputs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/parsers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/progress"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/hosterrorscache"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/interactsh"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/headless/engine"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
"github.com/projectdiscovery/ratelimit"
"github.com/projectdiscovery/retryablehttp-go"
errorutil "github.com/projectdiscovery/utils/errors"
diff --git a/v2/lib/sdk_private.go b/lib/sdk_private.go
similarity index 83%
rename from v2/lib/sdk_private.go
rename to lib/sdk_private.go
index 628cdc3b..a0e6292e 100644
--- a/v2/lib/sdk_private.go
+++ b/lib/sdk_private.go
@@ -11,24 +11,24 @@ import (
"github.com/projectdiscovery/gologger"
"github.com/projectdiscovery/gologger/levels"
"github.com/projectdiscovery/httpx/common/httpx"
- "github.com/projectdiscovery/nuclei/v2/internal/installer"
- "github.com/projectdiscovery/nuclei/v2/internal/runner"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/disk"
- "github.com/projectdiscovery/nuclei/v2/pkg/core"
- "github.com/projectdiscovery/nuclei/v2/pkg/core/inputs"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/progress"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/hosterrorscache"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/interactsh"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolinit"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/http/httpclientpool"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/internal/installer"
+ "github.com/projectdiscovery/nuclei/v3/internal/runner"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/disk"
+ "github.com/projectdiscovery/nuclei/v3/pkg/core"
+ "github.com/projectdiscovery/nuclei/v3/pkg/core/inputs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/progress"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/hosterrorscache"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/interactsh"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolinit"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/http/httpclientpool"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
"github.com/projectdiscovery/ratelimit"
)
diff --git a/v2/lib/sdk_test.go b/lib/sdk_test.go
similarity index 97%
rename from v2/lib/sdk_test.go
rename to lib/sdk_test.go
index 44ed81aa..2d1669b2 100644
--- a/v2/lib/sdk_test.go
+++ b/lib/sdk_test.go
@@ -3,7 +3,7 @@ package nuclei_test
import (
"testing"
- nuclei "github.com/projectdiscovery/nuclei/v2/lib"
+ nuclei "github.com/projectdiscovery/nuclei/v3/lib"
"github.com/stretchr/testify/require"
)
diff --git a/v2/pkg/catalog/aws/catalog.go b/pkg/catalog/aws/catalog.go
similarity index 100%
rename from v2/pkg/catalog/aws/catalog.go
rename to pkg/catalog/aws/catalog.go
diff --git a/v2/pkg/catalog/aws/catalog_test.go b/pkg/catalog/aws/catalog_test.go
similarity index 100%
rename from v2/pkg/catalog/aws/catalog_test.go
rename to pkg/catalog/aws/catalog_test.go
diff --git a/v2/pkg/catalog/catalogue.go b/pkg/catalog/catalogue.go
similarity index 100%
rename from v2/pkg/catalog/catalogue.go
rename to pkg/catalog/catalogue.go
diff --git a/v2/pkg/catalog/config/constants.go b/pkg/catalog/config/constants.go
similarity index 100%
rename from v2/pkg/catalog/config/constants.go
rename to pkg/catalog/config/constants.go
diff --git a/v2/pkg/catalog/config/ignorefile.go b/pkg/catalog/config/ignorefile.go
similarity index 100%
rename from v2/pkg/catalog/config/ignorefile.go
rename to pkg/catalog/config/ignorefile.go
diff --git a/v2/pkg/catalog/config/nucleiconfig.go b/pkg/catalog/config/nucleiconfig.go
similarity index 97%
rename from v2/pkg/catalog/config/nucleiconfig.go
rename to pkg/catalog/config/nucleiconfig.go
index fb4be387..c9a24022 100644
--- a/v2/pkg/catalog/config/nucleiconfig.go
+++ b/pkg/catalog/config/nucleiconfig.go
@@ -32,9 +32,10 @@ type Config struct {
CustomGitLabTemplatesDirectory string `json:"custom-gitlab-templates-directory"`
CustomAzureTemplatesDirectory string `json:"custom-azure-templates-directory"`
- TemplateVersion string `json:"nuclei-templates-version,omitempty"`
- NucleiIgnoreHash string `json:"nuclei-ignore-hash,omitempty"`
- LogAllEvents bool `json:"-"` // when enabled logs all events (more than verbose)
+ TemplateVersion string `json:"nuclei-templates-version,omitempty"`
+ NucleiIgnoreHash string `json:"nuclei-ignore-hash,omitempty"`
+ LogAllEvents bool `json:"-"` // when enabled logs all events (more than verbose)
+ HideTemplateSigWarning bool `json:"-"` // when enabled disables template signature warning
// LatestXXX are not meant to be used directly and is used as
// local cache of nuclei version check endpoint
@@ -333,6 +334,9 @@ func init() {
if value := env.GetEnvOrDefault("NUCLEI_LOG_ALL", false); value {
DefaultConfig.LogAllEvents = true
}
+ if value := env.GetEnvOrDefault("HIDE_TEMPLATE_SIG_WARNING", false); value {
+ DefaultConfig.HideTemplateSigWarning = true
+ }
// try to read config from file
if err := DefaultConfig.ReadTemplatesConfig(); err != nil {
diff --git a/v2/pkg/catalog/config/template.go b/pkg/catalog/config/template.go
similarity index 98%
rename from v2/pkg/catalog/config/template.go
rename to pkg/catalog/config/template.go
index 31741c0c..2b7ea83e 100644
--- a/v2/pkg/catalog/config/template.go
+++ b/pkg/catalog/config/template.go
@@ -8,7 +8,7 @@ import (
"strings"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates/extensions"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates/extensions"
fileutil "github.com/projectdiscovery/utils/file"
stringsutil "github.com/projectdiscovery/utils/strings"
)
diff --git a/v2/pkg/catalog/disk/catalog.go b/pkg/catalog/disk/catalog.go
similarity index 100%
rename from v2/pkg/catalog/disk/catalog.go
rename to pkg/catalog/disk/catalog.go
diff --git a/v2/pkg/catalog/disk/find.go b/pkg/catalog/disk/find.go
similarity index 99%
rename from v2/pkg/catalog/disk/find.go
rename to pkg/catalog/disk/find.go
index 85abe328..088bcbfe 100644
--- a/v2/pkg/catalog/disk/find.go
+++ b/pkg/catalog/disk/find.go
@@ -9,7 +9,7 @@ import (
"github.com/logrusorgru/aurora"
"github.com/pkg/errors"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
stringsutil "github.com/projectdiscovery/utils/strings"
updateutils "github.com/projectdiscovery/utils/update"
urlutil "github.com/projectdiscovery/utils/url"
diff --git a/v2/pkg/catalog/disk/known-files.go b/pkg/catalog/disk/known-files.go
similarity index 100%
rename from v2/pkg/catalog/disk/known-files.go
rename to pkg/catalog/disk/known-files.go
diff --git a/v2/pkg/catalog/disk/path.go b/pkg/catalog/disk/path.go
similarity index 98%
rename from v2/pkg/catalog/disk/path.go
rename to pkg/catalog/disk/path.go
index 0280641c..4066bae1 100644
--- a/v2/pkg/catalog/disk/path.go
+++ b/pkg/catalog/disk/path.go
@@ -7,7 +7,7 @@ import (
"strings"
"github.com/pkg/errors"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
fileutil "github.com/projectdiscovery/utils/file"
urlutil "github.com/projectdiscovery/utils/url"
)
diff --git a/v2/pkg/catalog/loader/filter/path_filter.go b/pkg/catalog/loader/filter/path_filter.go
similarity index 96%
rename from v2/pkg/catalog/loader/filter/path_filter.go
rename to pkg/catalog/loader/filter/path_filter.go
index 00f5b3b2..69bdd2e1 100644
--- a/v2/pkg/catalog/loader/filter/path_filter.go
+++ b/pkg/catalog/loader/filter/path_filter.go
@@ -1,7 +1,7 @@
package filter
import (
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog"
)
// PathFilter is a path based template filter
diff --git a/v2/pkg/catalog/loader/filter/tag_filter.go b/pkg/catalog/loader/filter/tag_filter.go
similarity index 97%
rename from v2/pkg/catalog/loader/filter/tag_filter.go
rename to pkg/catalog/loader/filter/tag_filter.go
index 638da945..119b045b 100644
--- a/v2/pkg/catalog/loader/filter/tag_filter.go
+++ b/pkg/catalog/loader/filter/tag_filter.go
@@ -5,17 +5,17 @@ import (
"errors"
"io"
"net/http"
- "strings"
"path/filepath"
+ "strings"
"github.com/Knetic/govaluate"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/common/dsl"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/extractors"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/matchers"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/common/dsl"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/extractors"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/matchers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
sliceutil "github.com/projectdiscovery/utils/slice"
)
diff --git a/v2/pkg/catalog/loader/filter/tag_filter_test.go b/pkg/catalog/loader/filter/tag_filter_test.go
similarity index 96%
rename from v2/pkg/catalog/loader/filter/tag_filter_test.go
rename to pkg/catalog/loader/filter/tag_filter_test.go
index fe8a2206..ad14ddf8 100644
--- a/v2/pkg/catalog/loader/filter/tag_filter_test.go
+++ b/pkg/catalog/loader/filter/tag_filter_test.go
@@ -3,13 +3,13 @@ package filter
import (
"testing"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/stringslice"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/dns"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/http"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/stringslice"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/dns"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/http"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
"github.com/stretchr/testify/require"
)
diff --git a/v2/pkg/catalog/loader/loader.go b/pkg/catalog/loader/loader.go
similarity index 95%
rename from v2/pkg/catalog/loader/loader.go
rename to pkg/catalog/loader/loader.go
index e1967fa0..a25daddb 100644
--- a/v2/pkg/catalog/loader/loader.go
+++ b/pkg/catalog/loader/loader.go
@@ -11,18 +11,18 @@ import (
"github.com/logrusorgru/aurora"
"github.com/pkg/errors"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- cfg "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/loader/filter"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/parsers"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates"
- templateTypes "github.com/projectdiscovery/nuclei/v2/pkg/templates/types"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
- "github.com/projectdiscovery/nuclei/v2/pkg/utils/stats"
- "github.com/projectdiscovery/nuclei/v2/pkg/workflows"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ cfg "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/loader/filter"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/parsers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates"
+ templateTypes "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/utils/stats"
+ "github.com/projectdiscovery/nuclei/v3/pkg/workflows"
"github.com/projectdiscovery/retryablehttp-go"
errorutil "github.com/projectdiscovery/utils/errors"
stringsutil "github.com/projectdiscovery/utils/strings"
diff --git a/v2/pkg/catalog/loader/loader_test.go b/pkg/catalog/loader/loader_test.go
similarity index 96%
rename from v2/pkg/catalog/loader/loader_test.go
rename to pkg/catalog/loader/loader_test.go
index 9c3f4f56..fb77fae4 100644
--- a/v2/pkg/catalog/loader/loader_test.go
+++ b/pkg/catalog/loader/loader_test.go
@@ -4,8 +4,8 @@ import (
"reflect"
"testing"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/disk"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/disk"
"github.com/stretchr/testify/require"
)
diff --git a/v2/pkg/catalog/loader/remote_loader.go b/pkg/catalog/loader/remote_loader.go
similarity index 96%
rename from v2/pkg/catalog/loader/remote_loader.go
rename to pkg/catalog/loader/remote_loader.go
index 77bfddaa..898ca37d 100644
--- a/v2/pkg/catalog/loader/remote_loader.go
+++ b/pkg/catalog/loader/remote_loader.go
@@ -8,8 +8,8 @@ import (
"github.com/pkg/errors"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates/extensions"
- "github.com/projectdiscovery/nuclei/v2/pkg/utils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates/extensions"
+ "github.com/projectdiscovery/nuclei/v3/pkg/utils"
"github.com/projectdiscovery/retryablehttp-go"
stringsutil "github.com/projectdiscovery/utils/strings"
)
diff --git a/v2/pkg/core/engine.go b/pkg/core/engine.go
similarity index 90%
rename from v2/pkg/core/engine.go
rename to pkg/core/engine.go
index aaa26482..b9a8036a 100644
--- a/v2/pkg/core/engine.go
+++ b/pkg/core/engine.go
@@ -1,10 +1,10 @@
package core
import (
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
)
// Engine is an executer for running Nuclei Templates/Workflows.
diff --git a/v2/pkg/core/engine_test.go b/pkg/core/engine_test.go
similarity index 100%
rename from v2/pkg/core/engine_test.go
rename to pkg/core/engine_test.go
diff --git a/v2/pkg/core/execute_options.go b/pkg/core/execute_options.go
similarity index 94%
rename from v2/pkg/core/execute_options.go
rename to pkg/core/execute_options.go
index 6e890f7b..50c61de3 100644
--- a/v2/pkg/core/execute_options.go
+++ b/pkg/core/execute_options.go
@@ -7,11 +7,11 @@ import (
"github.com/remeh/sizedwaitgroup"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates/types"
- "github.com/projectdiscovery/nuclei/v2/pkg/types/scanstrategy"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types/scanstrategy"
stringsutil "github.com/projectdiscovery/utils/strings"
)
diff --git a/v2/pkg/core/executors.go b/pkg/core/executors.go
similarity index 96%
rename from v2/pkg/core/executors.go
rename to pkg/core/executors.go
index 45013efa..262fdcef 100644
--- a/v2/pkg/core/executors.go
+++ b/pkg/core/executors.go
@@ -5,11 +5,11 @@ import (
"sync/atomic"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates/types"
- generalTypes "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
+ generalTypes "github.com/projectdiscovery/nuclei/v3/pkg/types"
"github.com/remeh/sizedwaitgroup"
)
diff --git a/v2/pkg/core/inputs/hybrid/hmap.go b/pkg/core/inputs/hybrid/hmap.go
similarity index 97%
rename from v2/pkg/core/inputs/hybrid/hmap.go
rename to pkg/core/inputs/hybrid/hmap.go
index 1fb2d73a..290b244c 100644
--- a/v2/pkg/core/inputs/hybrid/hmap.go
+++ b/pkg/core/inputs/hybrid/hmap.go
@@ -19,10 +19,10 @@ import (
"github.com/projectdiscovery/hmap/store/hybrid"
"github.com/projectdiscovery/mapcidr"
"github.com/projectdiscovery/mapcidr/asn"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/uncover"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/uncover"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
uncoverlib "github.com/projectdiscovery/uncover"
fileutil "github.com/projectdiscovery/utils/file"
iputil "github.com/projectdiscovery/utils/ip"
diff --git a/v2/pkg/core/inputs/hybrid/hmap_test.go b/pkg/core/inputs/hybrid/hmap_test.go
similarity index 96%
rename from v2/pkg/core/inputs/hybrid/hmap_test.go
rename to pkg/core/inputs/hybrid/hmap_test.go
index 60f12972..fee92f46 100644
--- a/v2/pkg/core/inputs/hybrid/hmap_test.go
+++ b/pkg/core/inputs/hybrid/hmap_test.go
@@ -9,9 +9,9 @@ import (
"github.com/miekg/dns"
"github.com/projectdiscovery/hmap/store/hybrid"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "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"
)
diff --git a/v2/pkg/core/inputs/hybrid/options.go b/pkg/core/inputs/hybrid/options.go
similarity index 100%
rename from v2/pkg/core/inputs/hybrid/options.go
rename to pkg/core/inputs/hybrid/options.go
diff --git a/v2/pkg/core/inputs/hybrid/tests/AS134029.txt b/pkg/core/inputs/hybrid/tests/AS134029.txt
similarity index 100%
rename from v2/pkg/core/inputs/hybrid/tests/AS134029.txt
rename to pkg/core/inputs/hybrid/tests/AS134029.txt
diff --git a/v2/pkg/core/inputs/hybrid/tests/AS14421.txt b/pkg/core/inputs/hybrid/tests/AS14421.txt
similarity index 100%
rename from v2/pkg/core/inputs/hybrid/tests/AS14421.txt
rename to pkg/core/inputs/hybrid/tests/AS14421.txt
diff --git a/v2/pkg/core/inputs/inputs.go b/pkg/core/inputs/inputs.go
similarity index 89%
rename from v2/pkg/core/inputs/inputs.go
rename to pkg/core/inputs/inputs.go
index 5e04d712..3e8e456b 100644
--- a/v2/pkg/core/inputs/inputs.go
+++ b/pkg/core/inputs/inputs.go
@@ -2,8 +2,8 @@ package inputs
import (
"github.com/projectdiscovery/httpx/common/httpx"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/utils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/utils"
)
type SimpleInputProvider struct {
diff --git a/v2/pkg/core/workflow_execute.go b/pkg/core/workflow_execute.go
similarity index 96%
rename from v2/pkg/core/workflow_execute.go
rename to pkg/core/workflow_execute.go
index d1734a58..a0e21058 100644
--- a/v2/pkg/core/workflow_execute.go
+++ b/pkg/core/workflow_execute.go
@@ -8,9 +8,9 @@ import (
"github.com/remeh/sizedwaitgroup"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/workflows"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/workflows"
)
const workflowStepExecutionError = "[%s] Could not execute workflow step: %s\n"
diff --git a/v2/pkg/core/workflow_execute_test.go b/pkg/core/workflow_execute_test.go
similarity index 94%
rename from v2/pkg/core/workflow_execute_test.go
rename to pkg/core/workflow_execute_test.go
index 5b2db134..fd9c09ed 100644
--- a/v2/pkg/core/workflow_execute_test.go
+++ b/pkg/core/workflow_execute_test.go
@@ -3,14 +3,14 @@ package core
import (
"testing"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/stringslice"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/progress"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
- "github.com/projectdiscovery/nuclei/v2/pkg/workflows"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/stringslice"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/progress"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/workflows"
"github.com/stretchr/testify/require"
)
diff --git a/v2/pkg/core/workpool.go b/pkg/core/workpool.go
similarity index 96%
rename from v2/pkg/core/workpool.go
rename to pkg/core/workpool.go
index 46ca8549..07117595 100644
--- a/v2/pkg/core/workpool.go
+++ b/pkg/core/workpool.go
@@ -3,7 +3,7 @@ package core
import (
"github.com/remeh/sizedwaitgroup"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
)
// WorkPool implements an execution pool for executing different
diff --git a/v2/pkg/external/customtemplates/azure_blob.go b/pkg/external/customtemplates/azure_blob.go
similarity index 98%
rename from v2/pkg/external/customtemplates/azure_blob.go
rename to pkg/external/customtemplates/azure_blob.go
index 442d0374..2610e2de 100644
--- a/v2/pkg/external/customtemplates/azure_blob.go
+++ b/pkg/external/customtemplates/azure_blob.go
@@ -10,8 +10,8 @@ import (
"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
errorutil "github.com/projectdiscovery/utils/errors"
)
diff --git a/v2/pkg/external/customtemplates/github.go b/pkg/external/customtemplates/github.go
similarity index 98%
rename from v2/pkg/external/customtemplates/github.go
rename to pkg/external/customtemplates/github.go
index dca23438..ee30f345 100644
--- a/v2/pkg/external/customtemplates/github.go
+++ b/pkg/external/customtemplates/github.go
@@ -10,8 +10,8 @@ import (
"github.com/google/go-github/github"
"github.com/pkg/errors"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
fileutil "github.com/projectdiscovery/utils/file"
"golang.org/x/oauth2"
"gopkg.in/src-d/go-git.v4/plumbing/transport/http"
diff --git a/v2/pkg/external/customtemplates/github_test.go b/pkg/external/customtemplates/github_test.go
similarity index 90%
rename from v2/pkg/external/customtemplates/github_test.go
rename to pkg/external/customtemplates/github_test.go
index 6c812f37..ab070c7a 100644
--- a/v2/pkg/external/customtemplates/github_test.go
+++ b/pkg/external/customtemplates/github_test.go
@@ -7,8 +7,8 @@ import (
"testing"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
"github.com/stretchr/testify/require"
)
diff --git a/v2/pkg/external/customtemplates/gitlab.go b/pkg/external/customtemplates/gitlab.go
similarity index 97%
rename from v2/pkg/external/customtemplates/gitlab.go
rename to pkg/external/customtemplates/gitlab.go
index 61dbca0a..40f19142 100644
--- a/v2/pkg/external/customtemplates/gitlab.go
+++ b/pkg/external/customtemplates/gitlab.go
@@ -7,8 +7,8 @@ import (
"path/filepath"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
errorutil "github.com/projectdiscovery/utils/errors"
"github.com/xanzy/go-gitlab"
)
diff --git a/v2/pkg/external/customtemplates/s3.go b/pkg/external/customtemplates/s3.go
similarity index 96%
rename from v2/pkg/external/customtemplates/s3.go
rename to pkg/external/customtemplates/s3.go
index f5421672..74f1d0f8 100644
--- a/v2/pkg/external/customtemplates/s3.go
+++ b/pkg/external/customtemplates/s3.go
@@ -12,8 +12,8 @@ import (
"github.com/aws/aws-sdk-go-v2/feature/s3/manager"
"github.com/aws/aws-sdk-go-v2/service/s3"
"github.com/projectdiscovery/gologger"
- nucleiConfig "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ nucleiConfig "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
errorutil "github.com/projectdiscovery/utils/errors"
stringsutil "github.com/projectdiscovery/utils/strings"
)
diff --git a/v2/pkg/external/customtemplates/templates_provider.go b/pkg/external/customtemplates/templates_provider.go
similarity index 97%
rename from v2/pkg/external/customtemplates/templates_provider.go
rename to pkg/external/customtemplates/templates_provider.go
index 6ae01e3b..213e9b63 100644
--- a/v2/pkg/external/customtemplates/templates_provider.go
+++ b/pkg/external/customtemplates/templates_provider.go
@@ -3,7 +3,7 @@ package customtemplates
import (
"context"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
errorutil "github.com/projectdiscovery/utils/errors"
)
diff --git a/v2/pkg/input/input.go b/pkg/input/input.go
similarity index 98%
rename from v2/pkg/input/input.go
rename to pkg/input/input.go
index eb379a86..0afd6497 100644
--- a/v2/pkg/input/input.go
+++ b/pkg/input/input.go
@@ -6,7 +6,7 @@ import (
"strings"
"github.com/projectdiscovery/hmap/store/hybrid"
- templateTypes "github.com/projectdiscovery/nuclei/v2/pkg/templates/types"
+ templateTypes "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
fileutil "github.com/projectdiscovery/utils/file"
"github.com/projectdiscovery/utils/ports"
stringsutil "github.com/projectdiscovery/utils/strings"
diff --git a/v2/pkg/input/input_test.go b/pkg/input/input_test.go
similarity index 100%
rename from v2/pkg/input/input_test.go
rename to pkg/input/input_test.go
diff --git a/v2/pkg/js/CONTRIBUTE.md b/pkg/js/CONTRIBUTE.md
similarity index 100%
rename from v2/pkg/js/CONTRIBUTE.md
rename to pkg/js/CONTRIBUTE.md
diff --git a/v2/pkg/js/DESIGN.md b/pkg/js/DESIGN.md
similarity index 100%
rename from v2/pkg/js/DESIGN.md
rename to pkg/js/DESIGN.md
diff --git a/v2/pkg/js/THANKS.md b/pkg/js/THANKS.md
similarity index 100%
rename from v2/pkg/js/THANKS.md
rename to pkg/js/THANKS.md
diff --git a/v2/pkg/js/compiler/compiler.go b/pkg/js/compiler/compiler.go
similarity index 79%
rename from v2/pkg/js/compiler/compiler.go
rename to pkg/js/compiler/compiler.go
index 9e0e5cac..5bd2377e 100644
--- a/v2/pkg/js/compiler/compiler.go
+++ b/pkg/js/compiler/compiler.go
@@ -12,30 +12,30 @@ import (
"github.com/pkg/errors"
"github.com/projectdiscovery/gologger"
- _ "github.com/projectdiscovery/nuclei/v2/pkg/js/generated/go/libbytes"
- _ "github.com/projectdiscovery/nuclei/v2/pkg/js/generated/go/libfs"
- _ "github.com/projectdiscovery/nuclei/v2/pkg/js/generated/go/libikev2"
- _ "github.com/projectdiscovery/nuclei/v2/pkg/js/generated/go/libkerberos"
- _ "github.com/projectdiscovery/nuclei/v2/pkg/js/generated/go/libldap"
- _ "github.com/projectdiscovery/nuclei/v2/pkg/js/generated/go/libmssql"
- _ "github.com/projectdiscovery/nuclei/v2/pkg/js/generated/go/libmysql"
- _ "github.com/projectdiscovery/nuclei/v2/pkg/js/generated/go/libnet"
- _ "github.com/projectdiscovery/nuclei/v2/pkg/js/generated/go/liboracle"
- _ "github.com/projectdiscovery/nuclei/v2/pkg/js/generated/go/libpop3"
- _ "github.com/projectdiscovery/nuclei/v2/pkg/js/generated/go/libpostgres"
- _ "github.com/projectdiscovery/nuclei/v2/pkg/js/generated/go/librdp"
- _ "github.com/projectdiscovery/nuclei/v2/pkg/js/generated/go/libredis"
- _ "github.com/projectdiscovery/nuclei/v2/pkg/js/generated/go/librsync"
- _ "github.com/projectdiscovery/nuclei/v2/pkg/js/generated/go/libsmb"
- _ "github.com/projectdiscovery/nuclei/v2/pkg/js/generated/go/libsmtp"
- _ "github.com/projectdiscovery/nuclei/v2/pkg/js/generated/go/libssh"
- _ "github.com/projectdiscovery/nuclei/v2/pkg/js/generated/go/libstructs"
- _ "github.com/projectdiscovery/nuclei/v2/pkg/js/generated/go/libtelnet"
- _ "github.com/projectdiscovery/nuclei/v2/pkg/js/generated/go/libvnc"
- "github.com/projectdiscovery/nuclei/v2/pkg/js/global"
- "github.com/projectdiscovery/nuclei/v2/pkg/js/libs/goconsole"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
+ _ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/libbytes"
+ _ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/libfs"
+ _ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/libikev2"
+ _ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/libkerberos"
+ _ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/libldap"
+ _ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/libmssql"
+ _ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/libmysql"
+ _ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/libnet"
+ _ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/liboracle"
+ _ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/libpop3"
+ _ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/libpostgres"
+ _ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/librdp"
+ _ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/libredis"
+ _ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/librsync"
+ _ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/libsmb"
+ _ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/libsmtp"
+ _ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/libssh"
+ _ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/libstructs"
+ _ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/libtelnet"
+ _ "github.com/projectdiscovery/nuclei/v3/pkg/js/generated/go/libvnc"
+ "github.com/projectdiscovery/nuclei/v3/pkg/js/global"
+ "github.com/projectdiscovery/nuclei/v3/pkg/js/libs/goconsole"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
)
// Compiler provides a runtime to execute goja runtime
diff --git a/v2/pkg/js/compiler/compiler_test.go b/pkg/js/compiler/compiler_test.go
similarity index 100%
rename from v2/pkg/js/compiler/compiler_test.go
rename to pkg/js/compiler/compiler_test.go
diff --git a/v2/pkg/js/devtools/README.md b/pkg/js/devtools/README.md
similarity index 100%
rename from v2/pkg/js/devtools/README.md
rename to pkg/js/devtools/README.md
diff --git a/v2/pkg/js/devtools/bindgen/INSTALL.md b/pkg/js/devtools/bindgen/INSTALL.md
similarity index 100%
rename from v2/pkg/js/devtools/bindgen/INSTALL.md
rename to pkg/js/devtools/bindgen/INSTALL.md
diff --git a/v2/pkg/js/devtools/bindgen/README.md b/pkg/js/devtools/bindgen/README.md
similarity index 100%
rename from v2/pkg/js/devtools/bindgen/README.md
rename to pkg/js/devtools/bindgen/README.md
diff --git a/v2/pkg/js/devtools/bindgen/generator.go b/pkg/js/devtools/bindgen/generator.go
similarity index 99%
rename from v2/pkg/js/devtools/bindgen/generator.go
rename to pkg/js/devtools/bindgen/generator.go
index 6f46b2ee..92181240 100644
--- a/v2/pkg/js/devtools/bindgen/generator.go
+++ b/pkg/js/devtools/bindgen/generator.go
@@ -14,7 +14,7 @@ import (
_ "embed"
"github.com/pkg/errors"
- "github.com/projectdiscovery/nuclei/v2/pkg/js/compiler"
+ "github.com/projectdiscovery/nuclei/v3/pkg/js/compiler"
)
var (
diff --git a/v2/pkg/js/devtools/bindgen/output.go b/pkg/js/devtools/bindgen/output.go
similarity index 100%
rename from v2/pkg/js/devtools/bindgen/output.go
rename to pkg/js/devtools/bindgen/output.go
diff --git a/v2/pkg/js/devtools/bindgen/templates/go_class.tmpl b/pkg/js/devtools/bindgen/templates/go_class.tmpl
similarity index 100%
rename from v2/pkg/js/devtools/bindgen/templates/go_class.tmpl
rename to pkg/js/devtools/bindgen/templates/go_class.tmpl
diff --git a/v2/pkg/js/devtools/bindgen/templates/js_class.tmpl b/pkg/js/devtools/bindgen/templates/js_class.tmpl
similarity index 100%
rename from v2/pkg/js/devtools/bindgen/templates/js_class.tmpl
rename to pkg/js/devtools/bindgen/templates/js_class.tmpl
diff --git a/v2/pkg/js/devtools/bindgen/templates/markdown_class.tmpl b/pkg/js/devtools/bindgen/templates/markdown_class.tmpl
similarity index 100%
rename from v2/pkg/js/devtools/bindgen/templates/markdown_class.tmpl
rename to pkg/js/devtools/bindgen/templates/markdown_class.tmpl
diff --git a/v2/pkg/js/devtools/jsdocgen/README.md b/pkg/js/devtools/jsdocgen/README.md
similarity index 100%
rename from v2/pkg/js/devtools/jsdocgen/README.md
rename to pkg/js/devtools/jsdocgen/README.md
diff --git a/v2/pkg/js/devtools/jsdocgen/main.go b/pkg/js/devtools/jsdocgen/main.go
similarity index 100%
rename from v2/pkg/js/devtools/jsdocgen/main.go
rename to pkg/js/devtools/jsdocgen/main.go
diff --git a/v2/pkg/js/devtools/scrapefuncs/README.md b/pkg/js/devtools/scrapefuncs/README.md
similarity index 100%
rename from v2/pkg/js/devtools/scrapefuncs/README.md
rename to pkg/js/devtools/scrapefuncs/README.md
diff --git a/v2/pkg/js/devtools/scrapefuncs/main.go b/pkg/js/devtools/scrapefuncs/main.go
similarity index 100%
rename from v2/pkg/js/devtools/scrapefuncs/main.go
rename to pkg/js/devtools/scrapefuncs/main.go
diff --git a/v2/pkg/js/generated/README.md b/pkg/js/generated/README.md
similarity index 100%
rename from v2/pkg/js/generated/README.md
rename to pkg/js/generated/README.md
diff --git a/v2/pkg/js/generated/go/libbytes/bytes.go b/pkg/js/generated/go/libbytes/bytes.go
similarity index 78%
rename from v2/pkg/js/generated/go/libbytes/bytes.go
rename to pkg/js/generated/go/libbytes/bytes.go
index dbbe273c..ec521be3 100644
--- a/v2/pkg/js/generated/go/libbytes/bytes.go
+++ b/pkg/js/generated/go/libbytes/bytes.go
@@ -1,10 +1,10 @@
package bytes
import (
- lib_bytes "github.com/projectdiscovery/nuclei/v2/pkg/js/libs/bytes"
+ lib_bytes "github.com/projectdiscovery/nuclei/v3/pkg/js/libs/bytes"
"github.com/dop251/goja"
- "github.com/projectdiscovery/nuclei/v2/pkg/js/gojs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/js/gojs"
)
var (
diff --git a/v2/pkg/js/generated/go/libfs/fs.go b/pkg/js/generated/go/libfs/fs.go
similarity index 81%
rename from v2/pkg/js/generated/go/libfs/fs.go
rename to pkg/js/generated/go/libfs/fs.go
index 371b0da1..73056a89 100644
--- a/v2/pkg/js/generated/go/libfs/fs.go
+++ b/pkg/js/generated/go/libfs/fs.go
@@ -1,10 +1,10 @@
package fs
import (
- lib_fs "github.com/projectdiscovery/nuclei/v2/pkg/js/libs/fs"
+ lib_fs "github.com/projectdiscovery/nuclei/v3/pkg/js/libs/fs"
"github.com/dop251/goja"
- "github.com/projectdiscovery/nuclei/v2/pkg/js/gojs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/js/gojs"
)
var (
diff --git a/v2/pkg/js/generated/go/libgoconsole/goconsole.go b/pkg/js/generated/go/libgoconsole/goconsole.go
similarity index 81%
rename from v2/pkg/js/generated/go/libgoconsole/goconsole.go
rename to pkg/js/generated/go/libgoconsole/goconsole.go
index 9885471f..7b057de3 100644
--- a/v2/pkg/js/generated/go/libgoconsole/goconsole.go
+++ b/pkg/js/generated/go/libgoconsole/goconsole.go
@@ -1,10 +1,10 @@
package goconsole
import (
- lib_goconsole "github.com/projectdiscovery/nuclei/v2/pkg/js/libs/goconsole"
+ lib_goconsole "github.com/projectdiscovery/nuclei/v3/pkg/js/libs/goconsole"
"github.com/dop251/goja"
- "github.com/projectdiscovery/nuclei/v2/pkg/js/gojs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/js/gojs"
)
var (
diff --git a/v2/pkg/js/generated/go/libikev2/ikev2.go b/pkg/js/generated/go/libikev2/ikev2.go
similarity index 92%
rename from v2/pkg/js/generated/go/libikev2/ikev2.go
rename to pkg/js/generated/go/libikev2/ikev2.go
index c99c27d2..639f14aa 100644
--- a/v2/pkg/js/generated/go/libikev2/ikev2.go
+++ b/pkg/js/generated/go/libikev2/ikev2.go
@@ -1,10 +1,10 @@
package ikev2
import (
- lib_ikev2 "github.com/projectdiscovery/nuclei/v2/pkg/js/libs/ikev2"
+ lib_ikev2 "github.com/projectdiscovery/nuclei/v3/pkg/js/libs/ikev2"
"github.com/dop251/goja"
- "github.com/projectdiscovery/nuclei/v2/pkg/js/gojs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/js/gojs"
)
var (
diff --git a/v2/pkg/js/generated/go/libkerberos/kerberos.go b/pkg/js/generated/go/libkerberos/kerberos.go
similarity index 87%
rename from v2/pkg/js/generated/go/libkerberos/kerberos.go
rename to pkg/js/generated/go/libkerberos/kerberos.go
index d38cf1ec..2b1fe491 100644
--- a/v2/pkg/js/generated/go/libkerberos/kerberos.go
+++ b/pkg/js/generated/go/libkerberos/kerberos.go
@@ -1,10 +1,10 @@
package kerberos
import (
- lib_kerberos "github.com/projectdiscovery/nuclei/v2/pkg/js/libs/kerberos"
+ lib_kerberos "github.com/projectdiscovery/nuclei/v3/pkg/js/libs/kerberos"
"github.com/dop251/goja"
- "github.com/projectdiscovery/nuclei/v2/pkg/js/gojs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/js/gojs"
)
var (
diff --git a/v2/pkg/js/generated/go/libldap/ldap.go b/pkg/js/generated/go/libldap/ldap.go
similarity index 85%
rename from v2/pkg/js/generated/go/libldap/ldap.go
rename to pkg/js/generated/go/libldap/ldap.go
index 3ed1245f..1b89f4be 100644
--- a/v2/pkg/js/generated/go/libldap/ldap.go
+++ b/pkg/js/generated/go/libldap/ldap.go
@@ -1,10 +1,10 @@
package ldap
import (
- lib_ldap "github.com/projectdiscovery/nuclei/v2/pkg/js/libs/ldap"
+ lib_ldap "github.com/projectdiscovery/nuclei/v3/pkg/js/libs/ldap"
"github.com/dop251/goja"
- "github.com/projectdiscovery/nuclei/v2/pkg/js/gojs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/js/gojs"
)
var (
diff --git a/v2/pkg/js/generated/go/libmssql/mssql.go b/pkg/js/generated/go/libmssql/mssql.go
similarity index 81%
rename from v2/pkg/js/generated/go/libmssql/mssql.go
rename to pkg/js/generated/go/libmssql/mssql.go
index 884dc0ee..ba2a2c57 100644
--- a/v2/pkg/js/generated/go/libmssql/mssql.go
+++ b/pkg/js/generated/go/libmssql/mssql.go
@@ -1,10 +1,10 @@
package mssql
import (
- lib_mssql "github.com/projectdiscovery/nuclei/v2/pkg/js/libs/mssql"
+ lib_mssql "github.com/projectdiscovery/nuclei/v3/pkg/js/libs/mssql"
"github.com/dop251/goja"
- "github.com/projectdiscovery/nuclei/v2/pkg/js/gojs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/js/gojs"
)
var (
diff --git a/v2/pkg/js/generated/go/libmysql/mysql.go b/pkg/js/generated/go/libmysql/mysql.go
similarity index 81%
rename from v2/pkg/js/generated/go/libmysql/mysql.go
rename to pkg/js/generated/go/libmysql/mysql.go
index 6a570456..7c8c7600 100644
--- a/v2/pkg/js/generated/go/libmysql/mysql.go
+++ b/pkg/js/generated/go/libmysql/mysql.go
@@ -1,10 +1,10 @@
package mysql
import (
- lib_mysql "github.com/projectdiscovery/nuclei/v2/pkg/js/libs/mysql"
+ lib_mysql "github.com/projectdiscovery/nuclei/v3/pkg/js/libs/mysql"
"github.com/dop251/goja"
- "github.com/projectdiscovery/nuclei/v2/pkg/js/gojs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/js/gojs"
)
var (
diff --git a/v2/pkg/js/generated/go/libnet/net.go b/pkg/js/generated/go/libnet/net.go
similarity index 81%
rename from v2/pkg/js/generated/go/libnet/net.go
rename to pkg/js/generated/go/libnet/net.go
index 22338ca2..a41cb99f 100644
--- a/v2/pkg/js/generated/go/libnet/net.go
+++ b/pkg/js/generated/go/libnet/net.go
@@ -1,10 +1,10 @@
package net
import (
- lib_net "github.com/projectdiscovery/nuclei/v2/pkg/js/libs/net"
+ lib_net "github.com/projectdiscovery/nuclei/v3/pkg/js/libs/net"
"github.com/dop251/goja"
- "github.com/projectdiscovery/nuclei/v2/pkg/js/gojs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/js/gojs"
)
var (
diff --git a/v2/pkg/js/generated/go/liboracle/oracle.go b/pkg/js/generated/go/liboracle/oracle.go
similarity index 86%
rename from v2/pkg/js/generated/go/liboracle/oracle.go
rename to pkg/js/generated/go/liboracle/oracle.go
index d72d8bbd..5d84d902 100644
--- a/v2/pkg/js/generated/go/liboracle/oracle.go
+++ b/pkg/js/generated/go/liboracle/oracle.go
@@ -1,10 +1,10 @@
package oracle
import (
- lib_oracle "github.com/projectdiscovery/nuclei/v2/pkg/js/libs/oracle"
+ lib_oracle "github.com/projectdiscovery/nuclei/v3/pkg/js/libs/oracle"
"github.com/dop251/goja"
- "github.com/projectdiscovery/nuclei/v2/pkg/js/gojs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/js/gojs"
)
var (
diff --git a/v2/pkg/js/generated/go/libpop3/pop3.go b/pkg/js/generated/go/libpop3/pop3.go
similarity index 85%
rename from v2/pkg/js/generated/go/libpop3/pop3.go
rename to pkg/js/generated/go/libpop3/pop3.go
index 273e0a20..d1e7a865 100644
--- a/v2/pkg/js/generated/go/libpop3/pop3.go
+++ b/pkg/js/generated/go/libpop3/pop3.go
@@ -1,10 +1,10 @@
package pop3
import (
- lib_pop3 "github.com/projectdiscovery/nuclei/v2/pkg/js/libs/pop3"
+ lib_pop3 "github.com/projectdiscovery/nuclei/v3/pkg/js/libs/pop3"
"github.com/dop251/goja"
- "github.com/projectdiscovery/nuclei/v2/pkg/js/gojs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/js/gojs"
)
var (
diff --git a/v2/pkg/js/generated/go/libpostgres/postgres.go b/pkg/js/generated/go/libpostgres/postgres.go
similarity index 81%
rename from v2/pkg/js/generated/go/libpostgres/postgres.go
rename to pkg/js/generated/go/libpostgres/postgres.go
index 9dca20d9..0af65239 100644
--- a/v2/pkg/js/generated/go/libpostgres/postgres.go
+++ b/pkg/js/generated/go/libpostgres/postgres.go
@@ -1,10 +1,10 @@
package postgres
import (
- lib_postgres "github.com/projectdiscovery/nuclei/v2/pkg/js/libs/postgres"
+ lib_postgres "github.com/projectdiscovery/nuclei/v3/pkg/js/libs/postgres"
"github.com/dop251/goja"
- "github.com/projectdiscovery/nuclei/v2/pkg/js/gojs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/js/gojs"
)
var (
diff --git a/v2/pkg/js/generated/go/librdp/rdp.go b/pkg/js/generated/go/librdp/rdp.go
similarity index 88%
rename from v2/pkg/js/generated/go/librdp/rdp.go
rename to pkg/js/generated/go/librdp/rdp.go
index 7212a08a..c975fe77 100644
--- a/v2/pkg/js/generated/go/librdp/rdp.go
+++ b/pkg/js/generated/go/librdp/rdp.go
@@ -1,10 +1,10 @@
package rdp
import (
- lib_rdp "github.com/projectdiscovery/nuclei/v2/pkg/js/libs/rdp"
+ lib_rdp "github.com/projectdiscovery/nuclei/v3/pkg/js/libs/rdp"
"github.com/dop251/goja"
- "github.com/projectdiscovery/nuclei/v2/pkg/js/gojs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/js/gojs"
)
var (
diff --git a/v2/pkg/js/generated/go/libredis/redis.go b/pkg/js/generated/go/libredis/redis.go
similarity index 83%
rename from v2/pkg/js/generated/go/libredis/redis.go
rename to pkg/js/generated/go/libredis/redis.go
index e52a1f01..06aa37da 100644
--- a/v2/pkg/js/generated/go/libredis/redis.go
+++ b/pkg/js/generated/go/libredis/redis.go
@@ -1,10 +1,10 @@
package redis
import (
- lib_redis "github.com/projectdiscovery/nuclei/v2/pkg/js/libs/redis"
+ lib_redis "github.com/projectdiscovery/nuclei/v3/pkg/js/libs/redis"
"github.com/dop251/goja"
- "github.com/projectdiscovery/nuclei/v2/pkg/js/gojs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/js/gojs"
)
var (
diff --git a/v2/pkg/js/generated/go/librsync/rsync.go b/pkg/js/generated/go/librsync/rsync.go
similarity index 85%
rename from v2/pkg/js/generated/go/librsync/rsync.go
rename to pkg/js/generated/go/librsync/rsync.go
index eca6a37c..51baab04 100644
--- a/v2/pkg/js/generated/go/librsync/rsync.go
+++ b/pkg/js/generated/go/librsync/rsync.go
@@ -1,10 +1,10 @@
package rsync
import (
- lib_rsync "github.com/projectdiscovery/nuclei/v2/pkg/js/libs/rsync"
+ lib_rsync "github.com/projectdiscovery/nuclei/v3/pkg/js/libs/rsync"
"github.com/dop251/goja"
- "github.com/projectdiscovery/nuclei/v2/pkg/js/gojs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/js/gojs"
)
var (
diff --git a/v2/pkg/js/generated/go/libsmb/smb.go b/pkg/js/generated/go/libsmb/smb.go
similarity index 80%
rename from v2/pkg/js/generated/go/libsmb/smb.go
rename to pkg/js/generated/go/libsmb/smb.go
index dc92186c..5181881a 100644
--- a/v2/pkg/js/generated/go/libsmb/smb.go
+++ b/pkg/js/generated/go/libsmb/smb.go
@@ -1,10 +1,10 @@
package smb
import (
- lib_smb "github.com/projectdiscovery/nuclei/v2/pkg/js/libs/smb"
+ lib_smb "github.com/projectdiscovery/nuclei/v3/pkg/js/libs/smb"
"github.com/dop251/goja"
- "github.com/projectdiscovery/nuclei/v2/pkg/js/gojs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/js/gojs"
)
var (
diff --git a/v2/pkg/js/generated/go/libsmtp/smtp.go b/pkg/js/generated/go/libsmtp/smtp.go
similarity index 85%
rename from v2/pkg/js/generated/go/libsmtp/smtp.go
rename to pkg/js/generated/go/libsmtp/smtp.go
index aad05e4b..9fb227b4 100644
--- a/v2/pkg/js/generated/go/libsmtp/smtp.go
+++ b/pkg/js/generated/go/libsmtp/smtp.go
@@ -1,10 +1,10 @@
package smtp
import (
- lib_smtp "github.com/projectdiscovery/nuclei/v2/pkg/js/libs/smtp"
+ lib_smtp "github.com/projectdiscovery/nuclei/v3/pkg/js/libs/smtp"
"github.com/dop251/goja"
- "github.com/projectdiscovery/nuclei/v2/pkg/js/gojs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/js/gojs"
)
var (
diff --git a/v2/pkg/js/generated/go/libssh/ssh.go b/pkg/js/generated/go/libssh/ssh.go
similarity index 80%
rename from v2/pkg/js/generated/go/libssh/ssh.go
rename to pkg/js/generated/go/libssh/ssh.go
index f70fc78f..9341f7df 100644
--- a/v2/pkg/js/generated/go/libssh/ssh.go
+++ b/pkg/js/generated/go/libssh/ssh.go
@@ -1,10 +1,10 @@
package ssh
import (
- lib_ssh "github.com/projectdiscovery/nuclei/v2/pkg/js/libs/ssh"
+ lib_ssh "github.com/projectdiscovery/nuclei/v3/pkg/js/libs/ssh"
"github.com/dop251/goja"
- "github.com/projectdiscovery/nuclei/v2/pkg/js/gojs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/js/gojs"
)
var (
diff --git a/v2/pkg/js/generated/go/libstructs/structs.go b/pkg/js/generated/go/libstructs/structs.go
similarity index 80%
rename from v2/pkg/js/generated/go/libstructs/structs.go
rename to pkg/js/generated/go/libstructs/structs.go
index eddbb3cd..b11fb5fb 100644
--- a/v2/pkg/js/generated/go/libstructs/structs.go
+++ b/pkg/js/generated/go/libstructs/structs.go
@@ -1,10 +1,10 @@
package structs
import (
- lib_structs "github.com/projectdiscovery/nuclei/v2/pkg/js/libs/structs"
+ lib_structs "github.com/projectdiscovery/nuclei/v3/pkg/js/libs/structs"
"github.com/dop251/goja"
- "github.com/projectdiscovery/nuclei/v2/pkg/js/gojs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/js/gojs"
)
var (
diff --git a/v2/pkg/js/generated/go/libtelnet/telnet.go b/pkg/js/generated/go/libtelnet/telnet.go
similarity index 86%
rename from v2/pkg/js/generated/go/libtelnet/telnet.go
rename to pkg/js/generated/go/libtelnet/telnet.go
index 9d75977a..cf43761d 100644
--- a/v2/pkg/js/generated/go/libtelnet/telnet.go
+++ b/pkg/js/generated/go/libtelnet/telnet.go
@@ -1,10 +1,10 @@
package telnet
import (
- lib_telnet "github.com/projectdiscovery/nuclei/v2/pkg/js/libs/telnet"
+ lib_telnet "github.com/projectdiscovery/nuclei/v3/pkg/js/libs/telnet"
"github.com/dop251/goja"
- "github.com/projectdiscovery/nuclei/v2/pkg/js/gojs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/js/gojs"
)
var (
diff --git a/v2/pkg/js/generated/go/libvnc/vnc.go b/pkg/js/generated/go/libvnc/vnc.go
similarity index 84%
rename from v2/pkg/js/generated/go/libvnc/vnc.go
rename to pkg/js/generated/go/libvnc/vnc.go
index a5e2bc85..cb0e2fd5 100644
--- a/v2/pkg/js/generated/go/libvnc/vnc.go
+++ b/pkg/js/generated/go/libvnc/vnc.go
@@ -1,10 +1,10 @@
package vnc
import (
- lib_vnc "github.com/projectdiscovery/nuclei/v2/pkg/js/libs/vnc"
+ lib_vnc "github.com/projectdiscovery/nuclei/v3/pkg/js/libs/vnc"
"github.com/dop251/goja"
- "github.com/projectdiscovery/nuclei/v2/pkg/js/gojs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/js/gojs"
)
var (
diff --git a/v2/pkg/js/generated/js/global.js b/pkg/js/generated/js/global.js
similarity index 100%
rename from v2/pkg/js/generated/js/global.js
rename to pkg/js/generated/js/global.js
diff --git a/v2/pkg/js/generated/js/libbytes/bytes.js b/pkg/js/generated/js/libbytes/bytes.js
similarity index 100%
rename from v2/pkg/js/generated/js/libbytes/bytes.js
rename to pkg/js/generated/js/libbytes/bytes.js
diff --git a/v2/pkg/js/generated/js/libfs/fs.js b/pkg/js/generated/js/libfs/fs.js
similarity index 100%
rename from v2/pkg/js/generated/js/libfs/fs.js
rename to pkg/js/generated/js/libfs/fs.js
diff --git a/v2/pkg/js/generated/js/libgoconsole/goconsole.js b/pkg/js/generated/js/libgoconsole/goconsole.js
similarity index 100%
rename from v2/pkg/js/generated/js/libgoconsole/goconsole.js
rename to pkg/js/generated/js/libgoconsole/goconsole.js
diff --git a/v2/pkg/js/generated/js/libikev2/ikev2.js b/pkg/js/generated/js/libikev2/ikev2.js
similarity index 100%
rename from v2/pkg/js/generated/js/libikev2/ikev2.js
rename to pkg/js/generated/js/libikev2/ikev2.js
diff --git a/v2/pkg/js/generated/js/libkerberos/kerberos.js b/pkg/js/generated/js/libkerberos/kerberos.js
similarity index 100%
rename from v2/pkg/js/generated/js/libkerberos/kerberos.js
rename to pkg/js/generated/js/libkerberos/kerberos.js
diff --git a/v2/pkg/js/generated/js/libldap/ldap.js b/pkg/js/generated/js/libldap/ldap.js
similarity index 100%
rename from v2/pkg/js/generated/js/libldap/ldap.js
rename to pkg/js/generated/js/libldap/ldap.js
diff --git a/v2/pkg/js/generated/js/libmssql/mssql.js b/pkg/js/generated/js/libmssql/mssql.js
similarity index 100%
rename from v2/pkg/js/generated/js/libmssql/mssql.js
rename to pkg/js/generated/js/libmssql/mssql.js
diff --git a/v2/pkg/js/generated/js/libmysql/mysql.js b/pkg/js/generated/js/libmysql/mysql.js
similarity index 100%
rename from v2/pkg/js/generated/js/libmysql/mysql.js
rename to pkg/js/generated/js/libmysql/mysql.js
diff --git a/v2/pkg/js/generated/js/libnet/net.js b/pkg/js/generated/js/libnet/net.js
similarity index 100%
rename from v2/pkg/js/generated/js/libnet/net.js
rename to pkg/js/generated/js/libnet/net.js
diff --git a/v2/pkg/js/generated/js/liboracle/oracle.js b/pkg/js/generated/js/liboracle/oracle.js
similarity index 100%
rename from v2/pkg/js/generated/js/liboracle/oracle.js
rename to pkg/js/generated/js/liboracle/oracle.js
diff --git a/v2/pkg/js/generated/js/libpop3/pop3.js b/pkg/js/generated/js/libpop3/pop3.js
similarity index 100%
rename from v2/pkg/js/generated/js/libpop3/pop3.js
rename to pkg/js/generated/js/libpop3/pop3.js
diff --git a/v2/pkg/js/generated/js/libpostgres/postgres.js b/pkg/js/generated/js/libpostgres/postgres.js
similarity index 100%
rename from v2/pkg/js/generated/js/libpostgres/postgres.js
rename to pkg/js/generated/js/libpostgres/postgres.js
diff --git a/v2/pkg/js/generated/js/librdp/rdp.js b/pkg/js/generated/js/librdp/rdp.js
similarity index 100%
rename from v2/pkg/js/generated/js/librdp/rdp.js
rename to pkg/js/generated/js/librdp/rdp.js
diff --git a/v2/pkg/js/generated/js/libredis/redis.js b/pkg/js/generated/js/libredis/redis.js
similarity index 100%
rename from v2/pkg/js/generated/js/libredis/redis.js
rename to pkg/js/generated/js/libredis/redis.js
diff --git a/v2/pkg/js/generated/js/librsync/rsync.js b/pkg/js/generated/js/librsync/rsync.js
similarity index 100%
rename from v2/pkg/js/generated/js/librsync/rsync.js
rename to pkg/js/generated/js/librsync/rsync.js
diff --git a/v2/pkg/js/generated/js/libsmb/smb.js b/pkg/js/generated/js/libsmb/smb.js
similarity index 100%
rename from v2/pkg/js/generated/js/libsmb/smb.js
rename to pkg/js/generated/js/libsmb/smb.js
diff --git a/v2/pkg/js/generated/js/libsmtp/smtp.js b/pkg/js/generated/js/libsmtp/smtp.js
similarity index 100%
rename from v2/pkg/js/generated/js/libsmtp/smtp.js
rename to pkg/js/generated/js/libsmtp/smtp.js
diff --git a/v2/pkg/js/generated/js/libssh/ssh.js b/pkg/js/generated/js/libssh/ssh.js
similarity index 100%
rename from v2/pkg/js/generated/js/libssh/ssh.js
rename to pkg/js/generated/js/libssh/ssh.js
diff --git a/v2/pkg/js/generated/js/libstructs/structs.js b/pkg/js/generated/js/libstructs/structs.js
similarity index 100%
rename from v2/pkg/js/generated/js/libstructs/structs.js
rename to pkg/js/generated/js/libstructs/structs.js
diff --git a/v2/pkg/js/generated/js/libtelnet/telnet.js b/pkg/js/generated/js/libtelnet/telnet.js
similarity index 100%
rename from v2/pkg/js/generated/js/libtelnet/telnet.js
rename to pkg/js/generated/js/libtelnet/telnet.js
diff --git a/v2/pkg/js/generated/js/libvnc/vnc.js b/pkg/js/generated/js/libvnc/vnc.js
similarity index 100%
rename from v2/pkg/js/generated/js/libvnc/vnc.js
rename to pkg/js/generated/js/libvnc/vnc.js
diff --git a/v2/pkg/js/global/exports.js b/pkg/js/global/exports.js
similarity index 100%
rename from v2/pkg/js/global/exports.js
rename to pkg/js/global/exports.js
diff --git a/v2/pkg/js/global/js/active_directory.js b/pkg/js/global/js/active_directory.js
similarity index 100%
rename from v2/pkg/js/global/js/active_directory.js
rename to pkg/js/global/js/active_directory.js
diff --git a/v2/pkg/js/global/js/dump.js b/pkg/js/global/js/dump.js
similarity index 100%
rename from v2/pkg/js/global/js/dump.js
rename to pkg/js/global/js/dump.js
diff --git a/v2/pkg/js/global/scripts.go b/pkg/js/global/scripts.go
similarity index 96%
rename from v2/pkg/js/global/scripts.go
rename to pkg/js/global/scripts.go
index 6b4d835a..7c697935 100644
--- a/v2/pkg/js/global/scripts.go
+++ b/pkg/js/global/scripts.go
@@ -11,9 +11,9 @@ import (
"github.com/dop251/goja"
"github.com/logrusorgru/aurora"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/js/gojs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/utils/vardump"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/js/gojs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/utils/vardump"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
errorutil "github.com/projectdiscovery/utils/errors"
stringsutil "github.com/projectdiscovery/utils/strings"
)
@@ -80,7 +80,7 @@ func initBuiltInFunc(runtime *goja.Runtime) {
default:
gologger.DefaultLogger.Print().Msgf("[%v] %v", aurora.BrightCyan("JS"), value)
}
- return goja.Null()
+ return call.Argument(0)
},
})
diff --git a/v2/pkg/js/global/scripts_test.go b/pkg/js/global/scripts_test.go
similarity index 100%
rename from v2/pkg/js/global/scripts_test.go
rename to pkg/js/global/scripts_test.go
diff --git a/v2/pkg/js/gojs/gojs.go b/pkg/js/gojs/gojs.go
similarity index 100%
rename from v2/pkg/js/gojs/gojs.go
rename to pkg/js/gojs/gojs.go
diff --git a/v2/pkg/js/gojs/set.go b/pkg/js/gojs/set.go
similarity index 100%
rename from v2/pkg/js/gojs/set.go
rename to pkg/js/gojs/set.go
diff --git a/v2/pkg/js/libs/LICENSE.md b/pkg/js/libs/LICENSE.md
similarity index 100%
rename from v2/pkg/js/libs/LICENSE.md
rename to pkg/js/libs/LICENSE.md
diff --git a/v2/pkg/js/libs/bytes/buffer.go b/pkg/js/libs/bytes/buffer.go
similarity index 96%
rename from v2/pkg/js/libs/bytes/buffer.go
rename to pkg/js/libs/bytes/buffer.go
index ab3b75eb..731484ba 100644
--- a/v2/pkg/js/libs/bytes/buffer.go
+++ b/pkg/js/libs/bytes/buffer.go
@@ -4,7 +4,7 @@ import (
"encoding/hex"
"github.com/dop251/goja"
- "github.com/projectdiscovery/nuclei/v2/pkg/js/libs/structs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/js/libs/structs"
)
// Buffer is a minimal buffer implementation over a byte slice
diff --git a/v2/pkg/js/libs/fs/fs.go b/pkg/js/libs/fs/fs.go
similarity index 96%
rename from v2/pkg/js/libs/fs/fs.go
rename to pkg/js/libs/fs/fs.go
index 5421f652..5dcbb038 100644
--- a/v2/pkg/js/libs/fs/fs.go
+++ b/pkg/js/libs/fs/fs.go
@@ -3,7 +3,7 @@ package fs
import (
"os"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
)
// ListDir lists all files and directories within a path
diff --git a/v2/pkg/js/libs/goconsole/log.go b/pkg/js/libs/goconsole/log.go
similarity index 100%
rename from v2/pkg/js/libs/goconsole/log.go
rename to pkg/js/libs/goconsole/log.go
diff --git a/v2/pkg/js/libs/ikev2/ikev2.go b/pkg/js/libs/ikev2/ikev2.go
similarity index 100%
rename from v2/pkg/js/libs/ikev2/ikev2.go
rename to pkg/js/libs/ikev2/ikev2.go
diff --git a/v2/pkg/js/libs/kerberos/kerberos.go b/pkg/js/libs/kerberos/kerberos.go
similarity index 98%
rename from v2/pkg/js/libs/kerberos/kerberos.go
rename to pkg/js/libs/kerberos/kerberos.go
index ac5708a5..2a4ccd6e 100644
--- a/v2/pkg/js/libs/kerberos/kerberos.go
+++ b/pkg/js/libs/kerberos/kerberos.go
@@ -6,7 +6,7 @@ import (
"html/template"
"strings"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
kclient "github.com/ropnop/gokrb5/v8/client"
kconfig "github.com/ropnop/gokrb5/v8/config"
"github.com/ropnop/gokrb5/v8/iana/errorcode"
diff --git a/v2/pkg/js/libs/ldap/ldap.go b/pkg/js/libs/ldap/ldap.go
similarity index 98%
rename from v2/pkg/js/libs/ldap/ldap.go
rename to pkg/js/libs/ldap/ldap.go
index d6ad3397..6ceb3224 100644
--- a/v2/pkg/js/libs/ldap/ldap.go
+++ b/pkg/js/libs/ldap/ldap.go
@@ -8,7 +8,7 @@ import (
"github.com/go-ldap/ldap/v3"
"github.com/praetorian-inc/fingerprintx/pkg/plugins"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
pluginldap "github.com/praetorian-inc/fingerprintx/pkg/plugins/services/ldap"
)
diff --git a/v2/pkg/js/libs/mssql/mssql.go b/pkg/js/libs/mssql/mssql.go
similarity index 97%
rename from v2/pkg/js/libs/mssql/mssql.go
rename to pkg/js/libs/mssql/mssql.go
index 4855791c..79fe5815 100644
--- a/v2/pkg/js/libs/mssql/mssql.go
+++ b/pkg/js/libs/mssql/mssql.go
@@ -11,7 +11,7 @@ import (
_ "github.com/denisenkom/go-mssqldb"
"github.com/praetorian-inc/fingerprintx/pkg/plugins/services/mssql"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
)
// Client is a client for MS SQL database.
diff --git a/v2/pkg/js/libs/mysql/mysql.go b/pkg/js/libs/mysql/mysql.go
similarity index 96%
rename from v2/pkg/js/libs/mysql/mysql.go
rename to pkg/js/libs/mysql/mysql.go
index 6be976ab..af5de588 100644
--- a/v2/pkg/js/libs/mysql/mysql.go
+++ b/pkg/js/libs/mysql/mysql.go
@@ -11,8 +11,8 @@ import (
_ "github.com/go-sql-driver/mysql"
"github.com/praetorian-inc/fingerprintx/pkg/plugins"
mysqlplugin "github.com/praetorian-inc/fingerprintx/pkg/plugins/services/mysql"
- utils "github.com/projectdiscovery/nuclei/v2/pkg/js/utils"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
+ utils "github.com/projectdiscovery/nuclei/v3/pkg/js/utils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
)
// MySQLClient is a client for MySQL database.
diff --git a/v2/pkg/js/libs/net/net.go b/pkg/js/libs/net/net.go
similarity index 97%
rename from v2/pkg/js/libs/net/net.go
rename to pkg/js/libs/net/net.go
index 0ae05a6d..dd3a8dc4 100644
--- a/v2/pkg/js/libs/net/net.go
+++ b/pkg/js/libs/net/net.go
@@ -10,8 +10,8 @@ import (
"syscall"
"time"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
)
// Open opens a new connection to the address with a timeout.
diff --git a/v2/pkg/js/libs/oracle/oracle.go b/pkg/js/libs/oracle/oracle.go
similarity index 94%
rename from v2/pkg/js/libs/oracle/oracle.go
rename to pkg/js/libs/oracle/oracle.go
index 9c5a4a01..d6bb48d1 100644
--- a/v2/pkg/js/libs/oracle/oracle.go
+++ b/pkg/js/libs/oracle/oracle.go
@@ -8,7 +8,7 @@ import (
"github.com/praetorian-inc/fingerprintx/pkg/plugins"
"github.com/praetorian-inc/fingerprintx/pkg/plugins/services/oracledb"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
)
// OracleClient is a minimal Oracle client for nuclei scripts.
diff --git a/v2/pkg/js/libs/pop3/pop3.go b/pkg/js/libs/pop3/pop3.go
similarity index 94%
rename from v2/pkg/js/libs/pop3/pop3.go
rename to pkg/js/libs/pop3/pop3.go
index c98b6454..f1ff7bb5 100644
--- a/v2/pkg/js/libs/pop3/pop3.go
+++ b/pkg/js/libs/pop3/pop3.go
@@ -8,7 +8,7 @@ import (
"github.com/praetorian-inc/fingerprintx/pkg/plugins"
"github.com/praetorian-inc/fingerprintx/pkg/plugins/services/pop3"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
)
// Pop3Client is a minimal POP3 client for nuclei scripts.
diff --git a/v2/pkg/js/libs/postgres/postgres.go b/pkg/js/libs/postgres/postgres.go
similarity index 96%
rename from v2/pkg/js/libs/postgres/postgres.go
rename to pkg/js/libs/postgres/postgres.go
index 81e79d6a..8d309f3a 100644
--- a/v2/pkg/js/libs/postgres/postgres.go
+++ b/pkg/js/libs/postgres/postgres.go
@@ -12,8 +12,8 @@ import (
_ "github.com/lib/pq"
"github.com/praetorian-inc/fingerprintx/pkg/plugins"
postgres "github.com/praetorian-inc/fingerprintx/pkg/plugins/services/postgresql"
- utils "github.com/projectdiscovery/nuclei/v2/pkg/js/utils"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
+ utils "github.com/projectdiscovery/nuclei/v3/pkg/js/utils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
)
// PGClient is a client for Postgres database.
diff --git a/v2/pkg/js/libs/rdp/rdp.go b/pkg/js/libs/rdp/rdp.go
similarity index 96%
rename from v2/pkg/js/libs/rdp/rdp.go
rename to pkg/js/libs/rdp/rdp.go
index 5221a374..ff64b63e 100644
--- a/v2/pkg/js/libs/rdp/rdp.go
+++ b/pkg/js/libs/rdp/rdp.go
@@ -7,7 +7,7 @@ import (
"github.com/praetorian-inc/fingerprintx/pkg/plugins"
"github.com/praetorian-inc/fingerprintx/pkg/plugins/services/rdp"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
)
// RDPClient is a client for rdp servers
diff --git a/v2/pkg/js/libs/redis/redis.go b/pkg/js/libs/redis/redis.go
similarity index 98%
rename from v2/pkg/js/libs/redis/redis.go
rename to pkg/js/libs/redis/redis.go
index 29818cba..686f9ff7 100644
--- a/v2/pkg/js/libs/redis/redis.go
+++ b/pkg/js/libs/redis/redis.go
@@ -5,7 +5,7 @@ import (
"fmt"
"time"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
"github.com/redis/go-redis/v9"
"github.com/praetorian-inc/fingerprintx/pkg/plugins"
diff --git a/v2/pkg/js/libs/rsync/rsync.go b/pkg/js/libs/rsync/rsync.go
similarity index 94%
rename from v2/pkg/js/libs/rsync/rsync.go
rename to pkg/js/libs/rsync/rsync.go
index 4421138c..267c1d5c 100644
--- a/v2/pkg/js/libs/rsync/rsync.go
+++ b/pkg/js/libs/rsync/rsync.go
@@ -8,7 +8,7 @@ import (
"github.com/praetorian-inc/fingerprintx/pkg/plugins"
"github.com/praetorian-inc/fingerprintx/pkg/plugins/services/rsync"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
)
// RsyncClient is a minimal Rsync client for nuclei scripts.
diff --git a/v2/pkg/js/libs/smb/metadata.go b/pkg/js/libs/smb/metadata.go
similarity index 91%
rename from v2/pkg/js/libs/smb/metadata.go
rename to pkg/js/libs/smb/metadata.go
index 1b98a8e6..e634327d 100644
--- a/v2/pkg/js/libs/smb/metadata.go
+++ b/pkg/js/libs/smb/metadata.go
@@ -8,7 +8,7 @@ import (
"github.com/praetorian-inc/fingerprintx/pkg/plugins"
"github.com/praetorian-inc/fingerprintx/pkg/plugins/services/smb"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
)
// collectSMBv2Metadata collects metadata for SMBv2 services.
diff --git a/v2/pkg/js/libs/smb/smb.go b/pkg/js/libs/smb/smb.go
similarity index 97%
rename from v2/pkg/js/libs/smb/smb.go
rename to pkg/js/libs/smb/smb.go
index a524fc77..9f1a74b9 100644
--- a/v2/pkg/js/libs/smb/smb.go
+++ b/pkg/js/libs/smb/smb.go
@@ -8,7 +8,7 @@ import (
"github.com/hirochachacha/go-smb2"
"github.com/praetorian-inc/fingerprintx/pkg/plugins"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
"github.com/zmap/zgrab2/lib/smb/smb"
)
diff --git a/v2/pkg/js/libs/smb/smbghost.go b/pkg/js/libs/smb/smbghost.go
similarity index 93%
rename from v2/pkg/js/libs/smb/smbghost.go
rename to pkg/js/libs/smb/smbghost.go
index 79c28b30..275eaee1 100644
--- a/v2/pkg/js/libs/smb/smbghost.go
+++ b/pkg/js/libs/smb/smbghost.go
@@ -8,8 +8,8 @@ import (
"strconv"
"time"
- "github.com/projectdiscovery/nuclei/v2/pkg/js/libs/structs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
+ "github.com/projectdiscovery/nuclei/v3/pkg/js/libs/structs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
)
const (
diff --git a/v2/pkg/js/libs/smtp/smtp.go b/pkg/js/libs/smtp/smtp.go
similarity index 94%
rename from v2/pkg/js/libs/smtp/smtp.go
rename to pkg/js/libs/smtp/smtp.go
index c4f943f0..545a3985 100644
--- a/v2/pkg/js/libs/smtp/smtp.go
+++ b/pkg/js/libs/smtp/smtp.go
@@ -8,7 +8,7 @@ import (
"github.com/praetorian-inc/fingerprintx/pkg/plugins"
"github.com/praetorian-inc/fingerprintx/pkg/plugins/services/smtp"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
)
// SMTPClient is a minimal SMTP client for nuclei scripts.
diff --git a/v2/pkg/js/libs/ssh/ssh.go b/pkg/js/libs/ssh/ssh.go
similarity index 97%
rename from v2/pkg/js/libs/ssh/ssh.go
rename to pkg/js/libs/ssh/ssh.go
index 8bc5d124..f2577332 100644
--- a/v2/pkg/js/libs/ssh/ssh.go
+++ b/pkg/js/libs/ssh/ssh.go
@@ -6,7 +6,7 @@ import (
"strings"
"time"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
"github.com/zmap/zgrab2/lib/ssh"
)
diff --git a/v2/pkg/js/libs/structs/smbexploit.js b/pkg/js/libs/structs/smbexploit.js
similarity index 100%
rename from v2/pkg/js/libs/structs/smbexploit.js
rename to pkg/js/libs/structs/smbexploit.js
diff --git a/v2/pkg/js/libs/structs/structs.go b/pkg/js/libs/structs/structs.go
similarity index 100%
rename from v2/pkg/js/libs/structs/structs.go
rename to pkg/js/libs/structs/structs.go
diff --git a/v2/pkg/js/libs/telnet/telnet.go b/pkg/js/libs/telnet/telnet.go
similarity index 94%
rename from v2/pkg/js/libs/telnet/telnet.go
rename to pkg/js/libs/telnet/telnet.go
index 611b1170..5cf58a51 100644
--- a/v2/pkg/js/libs/telnet/telnet.go
+++ b/pkg/js/libs/telnet/telnet.go
@@ -8,7 +8,7 @@ import (
"github.com/praetorian-inc/fingerprintx/pkg/plugins"
"github.com/praetorian-inc/fingerprintx/pkg/plugins/services/telnet"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
)
// TelnetClient is a minimal Telnet client for nuclei scripts.
diff --git a/v2/pkg/js/libs/vnc/vnc.go b/pkg/js/libs/vnc/vnc.go
similarity index 94%
rename from v2/pkg/js/libs/vnc/vnc.go
rename to pkg/js/libs/vnc/vnc.go
index ee0c4cba..e5857580 100644
--- a/v2/pkg/js/libs/vnc/vnc.go
+++ b/pkg/js/libs/vnc/vnc.go
@@ -8,7 +8,7 @@ import (
"github.com/praetorian-inc/fingerprintx/pkg/plugins"
"github.com/praetorian-inc/fingerprintx/pkg/plugins/services/vnc"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
)
// VNCClient is a minimal VNC client for nuclei scripts.
diff --git a/v2/pkg/js/utils/util.go b/pkg/js/utils/util.go
similarity index 100%
rename from v2/pkg/js/utils/util.go
rename to pkg/js/utils/util.go
diff --git a/pkg/keys/key.go b/pkg/keys/key.go
new file mode 100644
index 00000000..bb0c9006
--- /dev/null
+++ b/pkg/keys/key.go
@@ -0,0 +1,7 @@
+// keys package contains the public key for verifying digital signature of templates
+package keys
+
+import _ "embed"
+
+//go:embed nuclei.crt
+var NucleiCert []byte // public key for verifying digital signature of templates
diff --git a/v2/nuclei.crt b/pkg/keys/nuclei.crt
similarity index 100%
rename from v2/nuclei.crt
rename to pkg/keys/nuclei.crt
diff --git a/v2/pkg/model/model.go b/pkg/model/model.go
similarity index 98%
rename from v2/pkg/model/model.go
rename to pkg/model/model.go
index 6b337ff4..7fc8c5be 100644
--- a/v2/pkg/model/model.go
+++ b/pkg/model/model.go
@@ -1,8 +1,8 @@
package model
import (
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/stringslice"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/stringslice"
)
// Info contains metadata information about a template
diff --git a/v2/pkg/model/model_test.go b/pkg/model/model_test.go
similarity index 96%
rename from v2/pkg/model/model_test.go
rename to pkg/model/model_test.go
index 7a0ca188..f73d2b36 100644
--- a/v2/pkg/model/model_test.go
+++ b/pkg/model/model_test.go
@@ -5,8 +5,8 @@ import (
"strings"
"testing"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/stringslice"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/stringslice"
"github.com/stretchr/testify/assert"
"gopkg.in/yaml.v2"
)
diff --git a/v2/pkg/model/types/severity/severities.go b/pkg/model/types/severity/severities.go
similarity index 97%
rename from v2/pkg/model/types/severity/severities.go
rename to pkg/model/types/severity/severities.go
index f45fba8c..a4eb136e 100644
--- a/v2/pkg/model/types/severity/severities.go
+++ b/pkg/model/types/severity/severities.go
@@ -6,7 +6,7 @@ import (
"strings"
"github.com/projectdiscovery/goflags"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/stringslice"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/stringslice"
)
// Severities used by the goflags library for parsing an array of Severity types, passed as CLI arguments from the user
diff --git a/v2/pkg/model/types/severity/severity.go b/pkg/model/types/severity/severity.go
similarity index 100%
rename from v2/pkg/model/types/severity/severity.go
rename to pkg/model/types/severity/severity.go
diff --git a/v2/pkg/model/types/severity/severity_test.go b/pkg/model/types/severity/severity_test.go
similarity index 100%
rename from v2/pkg/model/types/severity/severity_test.go
rename to pkg/model/types/severity/severity_test.go
diff --git a/v2/pkg/model/types/stringslice/stringslice.go b/pkg/model/types/stringslice/stringslice.go
similarity index 98%
rename from v2/pkg/model/types/stringslice/stringslice.go
rename to pkg/model/types/stringslice/stringslice.go
index 8474ef31..10f19fb7 100644
--- a/v2/pkg/model/types/stringslice/stringslice.go
+++ b/pkg/model/types/stringslice/stringslice.go
@@ -7,7 +7,7 @@ import (
"github.com/alecthomas/jsonschema"
- "github.com/projectdiscovery/nuclei/v2/pkg/utils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/utils"
)
// StringSlice represents a single (in-lined) or multiple string value(s).
diff --git a/v2/pkg/model/types/stringslice/stringslice_raw.go b/pkg/model/types/stringslice/stringslice_raw.go
similarity index 100%
rename from v2/pkg/model/types/stringslice/stringslice_raw.go
rename to pkg/model/types/stringslice/stringslice_raw.go
diff --git a/v2/pkg/model/types/userAgent/user_agent.go b/pkg/model/types/userAgent/user_agent.go
similarity index 100%
rename from v2/pkg/model/types/userAgent/user_agent.go
rename to pkg/model/types/userAgent/user_agent.go
diff --git a/v2/pkg/model/worflow_loader.go b/pkg/model/worflow_loader.go
similarity index 100%
rename from v2/pkg/model/worflow_loader.go
rename to pkg/model/worflow_loader.go
diff --git a/v2/pkg/operators/common/dsl/dsl.go b/pkg/operators/common/dsl/dsl.go
similarity index 96%
rename from v2/pkg/operators/common/dsl/dsl.go
rename to pkg/operators/common/dsl/dsl.go
index eb9e277d..1b3a02be 100644
--- a/v2/pkg/operators/common/dsl/dsl.go
+++ b/pkg/operators/common/dsl/dsl.go
@@ -8,8 +8,8 @@ import (
"github.com/miekg/dns"
"github.com/projectdiscovery/dsl"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/dns/dnsclientpool"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/dns/dnsclientpool"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
sliceutil "github.com/projectdiscovery/utils/slice"
stringsutil "github.com/projectdiscovery/utils/strings"
)
diff --git a/v2/pkg/operators/common/dsl/dsl_test.go b/pkg/operators/common/dsl/dsl_test.go
similarity index 100%
rename from v2/pkg/operators/common/dsl/dsl_test.go
rename to pkg/operators/common/dsl/dsl_test.go
diff --git a/v2/pkg/operators/extractors/compile.go b/pkg/operators/extractors/compile.go
similarity index 96%
rename from v2/pkg/operators/extractors/compile.go
rename to pkg/operators/extractors/compile.go
index c7da9a6d..2b55d374 100644
--- a/v2/pkg/operators/extractors/compile.go
+++ b/pkg/operators/extractors/compile.go
@@ -7,7 +7,7 @@ import (
"github.com/Knetic/govaluate"
"github.com/itchyny/gojq"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/common/dsl"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/common/dsl"
)
// CompileExtractors performs the initial setup operation on an extractor
diff --git a/v2/pkg/operators/extractors/doc.go b/pkg/operators/extractors/doc.go
similarity index 100%
rename from v2/pkg/operators/extractors/doc.go
rename to pkg/operators/extractors/doc.go
diff --git a/v2/pkg/operators/extractors/extract.go b/pkg/operators/extractors/extract.go
similarity index 98%
rename from v2/pkg/operators/extractors/extract.go
rename to pkg/operators/extractors/extract.go
index 19ccab38..f17fba52 100644
--- a/v2/pkg/operators/extractors/extract.go
+++ b/pkg/operators/extractors/extract.go
@@ -8,7 +8,7 @@ import (
"github.com/antchfx/htmlquery"
"github.com/antchfx/xmlquery"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
)
// ExtractRegex extracts text from a corpus and returns it
diff --git a/v2/pkg/operators/extractors/extract_test.go b/pkg/operators/extractors/extract_test.go
similarity index 100%
rename from v2/pkg/operators/extractors/extract_test.go
rename to pkg/operators/extractors/extract_test.go
diff --git a/v2/pkg/operators/extractors/extractor_types.go b/pkg/operators/extractors/extractor_types.go
similarity index 100%
rename from v2/pkg/operators/extractors/extractor_types.go
rename to pkg/operators/extractors/extractor_types.go
diff --git a/v2/pkg/operators/extractors/extractors.go b/pkg/operators/extractors/extractors.go
similarity index 100%
rename from v2/pkg/operators/extractors/extractors.go
rename to pkg/operators/extractors/extractors.go
diff --git a/v2/pkg/operators/extractors/util.go b/pkg/operators/extractors/util.go
similarity index 100%
rename from v2/pkg/operators/extractors/util.go
rename to pkg/operators/extractors/util.go
diff --git a/v2/pkg/operators/matchers/compile.go b/pkg/operators/matchers/compile.go
similarity index 97%
rename from v2/pkg/operators/matchers/compile.go
rename to pkg/operators/matchers/compile.go
index f125c59e..5a99347c 100644
--- a/v2/pkg/operators/matchers/compile.go
+++ b/pkg/operators/matchers/compile.go
@@ -8,7 +8,7 @@ import (
"github.com/Knetic/govaluate"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/common/dsl"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/common/dsl"
)
// CompileMatchers performs the initial setup operation on a matcher
diff --git a/v2/pkg/operators/matchers/doc.go b/pkg/operators/matchers/doc.go
similarity index 100%
rename from v2/pkg/operators/matchers/doc.go
rename to pkg/operators/matchers/doc.go
diff --git a/v2/pkg/operators/matchers/match.go b/pkg/operators/matchers/match.go
similarity index 98%
rename from v2/pkg/operators/matchers/match.go
rename to pkg/operators/matchers/match.go
index 04b4b164..e74270ef 100644
--- a/v2/pkg/operators/matchers/match.go
+++ b/pkg/operators/matchers/match.go
@@ -10,8 +10,8 @@ import (
dslRepo "github.com/projectdiscovery/dsl"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/common/dsl"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/expressions"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/common/dsl"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/expressions"
stringsutil "github.com/projectdiscovery/utils/strings"
)
diff --git a/v2/pkg/operators/matchers/match_test.go b/pkg/operators/matchers/match_test.go
similarity index 99%
rename from v2/pkg/operators/matchers/match_test.go
rename to pkg/operators/matchers/match_test.go
index bc31290e..ea6258ae 100644
--- a/v2/pkg/operators/matchers/match_test.go
+++ b/pkg/operators/matchers/match_test.go
@@ -4,7 +4,7 @@ import (
"testing"
"github.com/Knetic/govaluate"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/common/dsl"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/common/dsl"
"github.com/stretchr/testify/require"
)
diff --git a/v2/pkg/operators/matchers/matchers.go b/pkg/operators/matchers/matchers.go
similarity index 100%
rename from v2/pkg/operators/matchers/matchers.go
rename to pkg/operators/matchers/matchers.go
diff --git a/v2/pkg/operators/matchers/matchers_types.go b/pkg/operators/matchers/matchers_types.go
similarity index 100%
rename from v2/pkg/operators/matchers/matchers_types.go
rename to pkg/operators/matchers/matchers_types.go
diff --git a/v2/pkg/operators/matchers/validate.go b/pkg/operators/matchers/validate.go
similarity index 100%
rename from v2/pkg/operators/matchers/validate.go
rename to pkg/operators/matchers/validate.go
diff --git a/v2/pkg/operators/matchers/validate_test.go b/pkg/operators/matchers/validate_test.go
similarity index 100%
rename from v2/pkg/operators/matchers/validate_test.go
rename to pkg/operators/matchers/validate_test.go
diff --git a/v2/pkg/operators/operators.go b/pkg/operators/operators.go
similarity index 97%
rename from v2/pkg/operators/operators.go
rename to pkg/operators/operators.go
index 02593554..2a504d12 100644
--- a/v2/pkg/operators/operators.go
+++ b/pkg/operators/operators.go
@@ -7,10 +7,10 @@ import (
"github.com/pkg/errors"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/extractors"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/matchers"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/utils/excludematchers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/extractors"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/matchers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/utils/excludematchers"
sliceutil "github.com/projectdiscovery/utils/slice"
)
diff --git a/v2/pkg/operators/operators_test.go b/pkg/operators/operators_test.go
similarity index 100%
rename from v2/pkg/operators/operators_test.go
rename to pkg/operators/operators_test.go
diff --git a/v2/pkg/output/doc.go b/pkg/output/doc.go
similarity index 100%
rename from v2/pkg/output/doc.go
rename to pkg/output/doc.go
diff --git a/v2/pkg/output/file_output_writer.go b/pkg/output/file_output_writer.go
similarity index 100%
rename from v2/pkg/output/file_output_writer.go
rename to pkg/output/file_output_writer.go
diff --git a/v2/pkg/output/format_json.go b/pkg/output/format_json.go
similarity index 100%
rename from v2/pkg/output/format_json.go
rename to pkg/output/format_json.go
diff --git a/v2/pkg/output/format_screen.go b/pkg/output/format_screen.go
similarity index 98%
rename from v2/pkg/output/format_screen.go
rename to pkg/output/format_screen.go
index 6f727c34..a02ba574 100644
--- a/v2/pkg/output/format_screen.go
+++ b/pkg/output/format_screen.go
@@ -4,7 +4,7 @@ import (
"bytes"
"strconv"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
mapsutil "github.com/projectdiscovery/utils/maps"
)
diff --git a/v2/pkg/output/output.go b/pkg/output/output.go
similarity index 97%
rename from v2/pkg/output/output.go
rename to pkg/output/output.go
index 2f99221f..5f897f44 100644
--- a/v2/pkg/output/output.go
+++ b/pkg/output/output.go
@@ -19,12 +19,12 @@ import (
"github.com/projectdiscovery/gologger"
"github.com/projectdiscovery/interactsh/pkg/server"
- "github.com/projectdiscovery/nuclei/v2/internal/colorizer"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
- "github.com/projectdiscovery/nuclei/v2/pkg/utils"
+ "github.com/projectdiscovery/nuclei/v3/internal/colorizer"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/utils"
fileutil "github.com/projectdiscovery/utils/file"
osutils "github.com/projectdiscovery/utils/os"
)
diff --git a/v2/pkg/output/output_test.go b/pkg/output/output_test.go
similarity index 97%
rename from v2/pkg/output/output_test.go
rename to pkg/output/output_test.go
index f15b0d40..7c96c052 100644
--- a/v2/pkg/output/output_test.go
+++ b/pkg/output/output_test.go
@@ -6,7 +6,7 @@ import (
"testing"
"github.com/pkg/errors"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
"github.com/stretchr/testify/require"
)
diff --git a/v2/pkg/parsers/parser.go b/pkg/parsers/parser.go
similarity index 92%
rename from v2/pkg/parsers/parser.go
rename to pkg/parsers/parser.go
index 0056bde5..8ec3580f 100644
--- a/v2/pkg/parsers/parser.go
+++ b/pkg/parsers/parser.go
@@ -6,14 +6,14 @@ import (
"regexp"
"strings"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/loader/filter"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates/cache"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates/types"
- "github.com/projectdiscovery/nuclei/v2/pkg/utils"
- "github.com/projectdiscovery/nuclei/v2/pkg/utils/stats"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/loader/filter"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates/cache"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/utils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/utils/stats"
"gopkg.in/yaml.v2"
)
diff --git a/v2/pkg/parsers/parser_test.go b/pkg/parsers/parser_test.go
similarity index 92%
rename from v2/pkg/parsers/parser_test.go
rename to pkg/parsers/parser_test.go
index 507eb367..d23bacee 100644
--- a/v2/pkg/parsers/parser_test.go
+++ b/pkg/parsers/parser_test.go
@@ -5,12 +5,12 @@ import (
"fmt"
"testing"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/disk"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/loader/filter"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/stringslice"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/disk"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/loader/filter"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/stringslice"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates"
"github.com/stretchr/testify/require"
)
diff --git a/v2/pkg/parsers/workflow_loader.go b/pkg/parsers/workflow_loader.go
similarity index 92%
rename from v2/pkg/parsers/workflow_loader.go
rename to pkg/parsers/workflow_loader.go
index 719c1c63..98be0a1b 100644
--- a/v2/pkg/parsers/workflow_loader.go
+++ b/pkg/parsers/workflow_loader.go
@@ -2,10 +2,10 @@ package parsers
import (
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/loader/filter"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/loader/filter"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
)
type workflowLoader struct {
diff --git a/v2/pkg/progress/doc.go b/pkg/progress/doc.go
similarity index 100%
rename from v2/pkg/progress/doc.go
rename to pkg/progress/doc.go
diff --git a/v2/pkg/progress/progress.go b/pkg/progress/progress.go
similarity index 100%
rename from v2/pkg/progress/progress.go
rename to pkg/progress/progress.go
diff --git a/v2/pkg/projectfile/httputil.go b/pkg/projectfile/httputil.go
similarity index 100%
rename from v2/pkg/projectfile/httputil.go
rename to pkg/projectfile/httputil.go
diff --git a/v2/pkg/projectfile/project.go b/pkg/projectfile/project.go
similarity index 100%
rename from v2/pkg/projectfile/project.go
rename to pkg/projectfile/project.go
diff --git a/v2/pkg/protocols/code/code.go b/pkg/protocols/code/code.go
similarity index 92%
rename from v2/pkg/protocols/code/code.go
rename to pkg/protocols/code/code.go
index c048b2da..eccc6cd5 100644
--- a/v2/pkg/protocols/code/code.go
+++ b/pkg/protocols/code/code.go
@@ -11,20 +11,20 @@ import (
"github.com/projectdiscovery/gologger"
"github.com/projectdiscovery/gozero"
gozerotypes "github.com/projectdiscovery/gozero/types"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/extractors"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/matchers"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/helpers/eventcreator"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/helpers/responsehighlighter"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/interactsh"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/utils/vardump"
- protocolutils "github.com/projectdiscovery/nuclei/v2/pkg/protocols/utils"
- templateTypes "github.com/projectdiscovery/nuclei/v2/pkg/templates/types"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/extractors"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/matchers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/helpers/eventcreator"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/helpers/responsehighlighter"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/interactsh"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/utils/vardump"
+ protocolutils "github.com/projectdiscovery/nuclei/v3/pkg/protocols/utils"
+ templateTypes "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
errorutil "github.com/projectdiscovery/utils/errors"
)
diff --git a/v2/pkg/protocols/code/code_test.go b/pkg/protocols/code/code_test.go
similarity index 76%
rename from v2/pkg/protocols/code/code_test.go
rename to pkg/protocols/code/code_test.go
index 001c2430..1ace1388 100644
--- a/v2/pkg/protocols/code/code_test.go
+++ b/pkg/protocols/code/code_test.go
@@ -7,11 +7,11 @@ import (
"github.com/stretchr/testify/require"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
)
func TestCodeProtocol(t *testing.T) {
diff --git a/v2/pkg/protocols/common/automaticscan/automaticscan.go b/pkg/protocols/common/automaticscan/automaticscan.go
similarity index 92%
rename from v2/pkg/protocols/common/automaticscan/automaticscan.go
rename to pkg/protocols/common/automaticscan/automaticscan.go
index 01f82b81..a58e0a1c 100644
--- a/v2/pkg/protocols/common/automaticscan/automaticscan.go
+++ b/pkg/protocols/common/automaticscan/automaticscan.go
@@ -10,15 +10,15 @@ import (
"github.com/corpix/uarand"
"github.com/pkg/errors"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/loader"
- "github.com/projectdiscovery/nuclei/v2/pkg/core"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/http/httpclientpool"
- httputil "github.com/projectdiscovery/nuclei/v2/pkg/protocols/utils/http"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/loader"
+ "github.com/projectdiscovery/nuclei/v3/pkg/core"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/http/httpclientpool"
+ httputil "github.com/projectdiscovery/nuclei/v3/pkg/protocols/utils/http"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
"github.com/projectdiscovery/retryablehttp-go"
sliceutil "github.com/projectdiscovery/utils/slice"
wappalyzer "github.com/projectdiscovery/wappalyzergo"
diff --git a/v2/pkg/protocols/common/automaticscan/automaticscan_test.go b/pkg/protocols/common/automaticscan/automaticscan_test.go
similarity index 100%
rename from v2/pkg/protocols/common/automaticscan/automaticscan_test.go
rename to pkg/protocols/common/automaticscan/automaticscan_test.go
diff --git a/v2/pkg/protocols/common/automaticscan/doc.go b/pkg/protocols/common/automaticscan/doc.go
similarity index 100%
rename from v2/pkg/protocols/common/automaticscan/doc.go
rename to pkg/protocols/common/automaticscan/doc.go
diff --git a/v2/pkg/protocols/common/contextargs/contextargs.go b/pkg/protocols/common/contextargs/contextargs.go
similarity index 100%
rename from v2/pkg/protocols/common/contextargs/contextargs.go
rename to pkg/protocols/common/contextargs/contextargs.go
diff --git a/v2/pkg/protocols/common/contextargs/doc.go b/pkg/protocols/common/contextargs/doc.go
similarity index 100%
rename from v2/pkg/protocols/common/contextargs/doc.go
rename to pkg/protocols/common/contextargs/doc.go
diff --git a/v2/pkg/protocols/common/contextargs/metainput.go b/pkg/protocols/common/contextargs/metainput.go
similarity index 100%
rename from v2/pkg/protocols/common/contextargs/metainput.go
rename to pkg/protocols/common/contextargs/metainput.go
diff --git a/v2/pkg/protocols/common/contextargs/variables.go b/pkg/protocols/common/contextargs/variables.go
similarity index 100%
rename from v2/pkg/protocols/common/contextargs/variables.go
rename to pkg/protocols/common/contextargs/variables.go
diff --git a/v2/pkg/protocols/common/expressions/expressions.go b/pkg/protocols/common/expressions/expressions.go
similarity index 95%
rename from v2/pkg/protocols/common/expressions/expressions.go
rename to pkg/protocols/common/expressions/expressions.go
index e8e01ee8..a3681e35 100644
--- a/v2/pkg/protocols/common/expressions/expressions.go
+++ b/pkg/protocols/common/expressions/expressions.go
@@ -5,9 +5,9 @@ import (
"github.com/Knetic/govaluate"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/common/dsl"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/marker"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/replacer"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/common/dsl"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/marker"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/replacer"
stringsutil "github.com/projectdiscovery/utils/strings"
)
diff --git a/v2/pkg/protocols/common/expressions/expressions_test.go b/pkg/protocols/common/expressions/expressions_test.go
similarity index 100%
rename from v2/pkg/protocols/common/expressions/expressions_test.go
rename to pkg/protocols/common/expressions/expressions_test.go
diff --git a/v2/pkg/protocols/common/expressions/variables.go b/pkg/protocols/common/expressions/variables.go
similarity index 98%
rename from v2/pkg/protocols/common/expressions/variables.go
rename to pkg/protocols/common/expressions/variables.go
index c4d1cb61..f129eb91 100644
--- a/v2/pkg/protocols/common/expressions/variables.go
+++ b/pkg/protocols/common/expressions/variables.go
@@ -6,7 +6,7 @@ import (
"strings"
"github.com/Knetic/govaluate"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/common/dsl"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/common/dsl"
)
var (
diff --git a/v2/pkg/protocols/common/expressions/variables_test.go b/pkg/protocols/common/expressions/variables_test.go
similarity index 100%
rename from v2/pkg/protocols/common/expressions/variables_test.go
rename to pkg/protocols/common/expressions/variables_test.go
diff --git a/v2/pkg/protocols/common/fuzz/doc.go b/pkg/protocols/common/fuzz/doc.go
similarity index 100%
rename from v2/pkg/protocols/common/fuzz/doc.go
rename to pkg/protocols/common/fuzz/doc.go
diff --git a/v2/pkg/protocols/common/fuzz/execute.go b/pkg/protocols/common/fuzz/execute.go
similarity index 96%
rename from v2/pkg/protocols/common/fuzz/execute.go
rename to pkg/protocols/common/fuzz/execute.go
index 86a18cae..1a4700b0 100644
--- a/v2/pkg/protocols/common/fuzz/execute.go
+++ b/pkg/protocols/common/fuzz/execute.go
@@ -5,9 +5,9 @@ import (
"strings"
"github.com/pkg/errors"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
"github.com/projectdiscovery/retryablehttp-go"
errorutil "github.com/projectdiscovery/utils/errors"
)
diff --git a/v2/pkg/protocols/common/fuzz/execute_test.go b/pkg/protocols/common/fuzz/execute_test.go
similarity index 100%
rename from v2/pkg/protocols/common/fuzz/execute_test.go
rename to pkg/protocols/common/fuzz/execute_test.go
diff --git a/v2/pkg/protocols/common/fuzz/fuzz.go b/pkg/protocols/common/fuzz/fuzz.go
similarity index 97%
rename from v2/pkg/protocols/common/fuzz/fuzz.go
rename to pkg/protocols/common/fuzz/fuzz.go
index 1ce0561e..0cf37a23 100644
--- a/v2/pkg/protocols/common/fuzz/fuzz.go
+++ b/pkg/protocols/common/fuzz/fuzz.go
@@ -4,8 +4,8 @@ import (
"regexp"
"strings"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
)
// Rule is a single rule which describes how to fuzz the request
diff --git a/v2/pkg/protocols/common/fuzz/fuzz_test.go b/pkg/protocols/common/fuzz/fuzz_test.go
similarity index 100%
rename from v2/pkg/protocols/common/fuzz/fuzz_test.go
rename to pkg/protocols/common/fuzz/fuzz_test.go
diff --git a/v2/pkg/protocols/common/fuzz/parts.go b/pkg/protocols/common/fuzz/parts.go
similarity index 97%
rename from v2/pkg/protocols/common/fuzz/parts.go
rename to pkg/protocols/common/fuzz/parts.go
index afae9f92..586e2028 100644
--- a/v2/pkg/protocols/common/fuzz/parts.go
+++ b/pkg/protocols/common/fuzz/parts.go
@@ -10,9 +10,9 @@ import (
"github.com/projectdiscovery/gologger"
"github.com/corpix/uarand"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/expressions"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/expressions"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
"github.com/projectdiscovery/retryablehttp-go"
sliceutil "github.com/projectdiscovery/utils/slice"
urlutil "github.com/projectdiscovery/utils/url"
diff --git a/v2/pkg/protocols/common/fuzz/parts_test.go b/pkg/protocols/common/fuzz/parts_test.go
similarity index 95%
rename from v2/pkg/protocols/common/fuzz/parts_test.go
rename to pkg/protocols/common/fuzz/parts_test.go
index 805c08cf..90b1b2ab 100644
--- a/v2/pkg/protocols/common/fuzz/parts_test.go
+++ b/pkg/protocols/common/fuzz/parts_test.go
@@ -5,9 +5,9 @@ import (
"net/http"
"testing"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/interactsh"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/interactsh"
"github.com/stretchr/testify/require"
)
diff --git a/v2/pkg/protocols/common/generators/attack_types.go b/pkg/protocols/common/generators/attack_types.go
similarity index 100%
rename from v2/pkg/protocols/common/generators/attack_types.go
rename to pkg/protocols/common/generators/attack_types.go
diff --git a/v2/pkg/protocols/common/generators/env.go b/pkg/protocols/common/generators/env.go
similarity index 100%
rename from v2/pkg/protocols/common/generators/env.go
rename to pkg/protocols/common/generators/env.go
diff --git a/v2/pkg/protocols/common/generators/generators.go b/pkg/protocols/common/generators/generators.go
similarity index 98%
rename from v2/pkg/protocols/common/generators/generators.go
rename to pkg/protocols/common/generators/generators.go
index c17fef84..4f27a885 100644
--- a/v2/pkg/protocols/common/generators/generators.go
+++ b/pkg/protocols/common/generators/generators.go
@@ -5,8 +5,8 @@ package generators
import (
"github.com/pkg/errors"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
)
// PayloadGenerator is the generator struct for generating payloads
diff --git a/v2/pkg/protocols/common/generators/generators_test.go b/pkg/protocols/common/generators/generators_test.go
similarity index 96%
rename from v2/pkg/protocols/common/generators/generators_test.go
rename to pkg/protocols/common/generators/generators_test.go
index 2226188d..a55e8e51 100644
--- a/v2/pkg/protocols/common/generators/generators_test.go
+++ b/pkg/protocols/common/generators/generators_test.go
@@ -5,8 +5,8 @@ import (
"github.com/stretchr/testify/require"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/disk"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/disk"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
)
func TestBatteringRamGenerator(t *testing.T) {
diff --git a/v2/pkg/protocols/common/generators/load.go b/pkg/protocols/common/generators/load.go
similarity index 96%
rename from v2/pkg/protocols/common/generators/load.go
rename to pkg/protocols/common/generators/load.go
index 390c8141..1d46233f 100644
--- a/v2/pkg/protocols/common/generators/load.go
+++ b/pkg/protocols/common/generators/load.go
@@ -6,7 +6,7 @@ import (
"strings"
"github.com/pkg/errors"
- pkgTypes "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ pkgTypes "github.com/projectdiscovery/nuclei/v3/pkg/types"
"github.com/spf13/cast"
)
diff --git a/v2/pkg/protocols/common/generators/load_test.go b/pkg/protocols/common/generators/load_test.go
similarity index 97%
rename from v2/pkg/protocols/common/generators/load_test.go
rename to pkg/protocols/common/generators/load_test.go
index eed974e1..ebec9fd7 100644
--- a/v2/pkg/protocols/common/generators/load_test.go
+++ b/pkg/protocols/common/generators/load_test.go
@@ -6,8 +6,8 @@ import (
"path/filepath"
"testing"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/disk"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/disk"
osutils "github.com/projectdiscovery/utils/os"
"github.com/stretchr/testify/require"
)
diff --git a/v2/pkg/protocols/common/generators/maps.go b/pkg/protocols/common/generators/maps.go
similarity index 100%
rename from v2/pkg/protocols/common/generators/maps.go
rename to pkg/protocols/common/generators/maps.go
diff --git a/v2/pkg/protocols/common/generators/maps_test.go b/pkg/protocols/common/generators/maps_test.go
similarity index 100%
rename from v2/pkg/protocols/common/generators/maps_test.go
rename to pkg/protocols/common/generators/maps_test.go
diff --git a/v2/pkg/protocols/common/generators/options.go b/pkg/protocols/common/generators/options.go
similarity index 89%
rename from v2/pkg/protocols/common/generators/options.go
rename to pkg/protocols/common/generators/options.go
index 868ccef7..bc077547 100644
--- a/v2/pkg/protocols/common/generators/options.go
+++ b/pkg/protocols/common/generators/options.go
@@ -1,7 +1,7 @@
package generators
import (
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
)
// BuildPayloadFromOptions returns a map with the payloads provided via CLI
diff --git a/v2/pkg/protocols/common/generators/slice.go b/pkg/protocols/common/generators/slice.go
similarity index 100%
rename from v2/pkg/protocols/common/generators/slice.go
rename to pkg/protocols/common/generators/slice.go
diff --git a/v2/pkg/protocols/common/generators/validate.go b/pkg/protocols/common/generators/validate.go
similarity index 96%
rename from v2/pkg/protocols/common/generators/validate.go
rename to pkg/protocols/common/generators/validate.go
index 1635cd78..c9f7d6b3 100644
--- a/v2/pkg/protocols/common/generators/validate.go
+++ b/pkg/protocols/common/generators/validate.go
@@ -6,7 +6,7 @@ import (
"path/filepath"
"strings"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
fileutil "github.com/projectdiscovery/utils/file"
folderutil "github.com/projectdiscovery/utils/folder"
)
diff --git a/v2/pkg/protocols/common/helpers/deserialization/deserialization.go b/pkg/protocols/common/helpers/deserialization/deserialization.go
similarity index 100%
rename from v2/pkg/protocols/common/helpers/deserialization/deserialization.go
rename to pkg/protocols/common/helpers/deserialization/deserialization.go
diff --git a/v2/pkg/protocols/common/helpers/deserialization/helpers.go b/pkg/protocols/common/helpers/deserialization/helpers.go
similarity index 100%
rename from v2/pkg/protocols/common/helpers/deserialization/helpers.go
rename to pkg/protocols/common/helpers/deserialization/helpers.go
diff --git a/v2/pkg/protocols/common/helpers/deserialization/java.go b/pkg/protocols/common/helpers/deserialization/java.go
similarity index 100%
rename from v2/pkg/protocols/common/helpers/deserialization/java.go
rename to pkg/protocols/common/helpers/deserialization/java.go
diff --git a/v2/pkg/protocols/common/helpers/deserialization/testdata/Deserialize.java b/pkg/protocols/common/helpers/deserialization/testdata/Deserialize.java
similarity index 100%
rename from v2/pkg/protocols/common/helpers/deserialization/testdata/Deserialize.java
rename to pkg/protocols/common/helpers/deserialization/testdata/Deserialize.java
diff --git a/v2/pkg/protocols/common/helpers/deserialization/testdata/README.md b/pkg/protocols/common/helpers/deserialization/testdata/README.md
similarity index 100%
rename from v2/pkg/protocols/common/helpers/deserialization/testdata/README.md
rename to pkg/protocols/common/helpers/deserialization/testdata/README.md
diff --git a/v2/pkg/protocols/common/helpers/deserialization/testdata/ValueObject.java b/pkg/protocols/common/helpers/deserialization/testdata/ValueObject.java
similarity index 100%
rename from v2/pkg/protocols/common/helpers/deserialization/testdata/ValueObject.java
rename to pkg/protocols/common/helpers/deserialization/testdata/ValueObject.java
diff --git a/v2/pkg/protocols/common/helpers/eventcreator/eventcreator.go b/pkg/protocols/common/helpers/eventcreator/eventcreator.go
similarity index 89%
rename from v2/pkg/protocols/common/helpers/eventcreator/eventcreator.go
rename to pkg/protocols/common/helpers/eventcreator/eventcreator.go
index 1480de5c..c8726453 100644
--- a/v2/pkg/protocols/common/helpers/eventcreator/eventcreator.go
+++ b/pkg/protocols/common/helpers/eventcreator/eventcreator.go
@@ -2,10 +2,10 @@ package eventcreator
import (
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/utils/vardump"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/utils/vardump"
"golang.org/x/text/cases"
"golang.org/x/text/language"
)
diff --git a/v2/pkg/protocols/common/helpers/responsehighlighter/hexdump.go b/pkg/protocols/common/helpers/responsehighlighter/hexdump.go
similarity index 100%
rename from v2/pkg/protocols/common/helpers/responsehighlighter/hexdump.go
rename to pkg/protocols/common/helpers/responsehighlighter/hexdump.go
diff --git a/v2/pkg/protocols/common/helpers/responsehighlighter/response_highlighter.go b/pkg/protocols/common/helpers/responsehighlighter/response_highlighter.go
similarity index 96%
rename from v2/pkg/protocols/common/helpers/responsehighlighter/response_highlighter.go
rename to pkg/protocols/common/helpers/responsehighlighter/response_highlighter.go
index ccec3cd3..39bb8e99 100644
--- a/v2/pkg/protocols/common/helpers/responsehighlighter/response_highlighter.go
+++ b/pkg/protocols/common/helpers/responsehighlighter/response_highlighter.go
@@ -7,7 +7,7 @@ import (
"github.com/logrusorgru/aurora"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
)
var colorFunction = aurora.Green
diff --git a/v2/pkg/protocols/common/helpers/responsehighlighter/response_highlighter_test.go b/pkg/protocols/common/helpers/responsehighlighter/response_highlighter_test.go
similarity index 99%
rename from v2/pkg/protocols/common/helpers/responsehighlighter/response_highlighter_test.go
rename to pkg/protocols/common/helpers/responsehighlighter/response_highlighter_test.go
index fcdd16a8..60a91ab0 100644
--- a/v2/pkg/protocols/common/helpers/responsehighlighter/response_highlighter_test.go
+++ b/pkg/protocols/common/helpers/responsehighlighter/response_highlighter_test.go
@@ -6,7 +6,7 @@ import (
"github.com/stretchr/testify/assert"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
)
const input = "abcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmn"
diff --git a/v2/pkg/protocols/common/helpers/writer/writer.go b/pkg/protocols/common/helpers/writer/writer.go
similarity index 84%
rename from v2/pkg/protocols/common/helpers/writer/writer.go
rename to pkg/protocols/common/helpers/writer/writer.go
index 641a69f3..b68e584f 100644
--- a/v2/pkg/protocols/common/helpers/writer/writer.go
+++ b/pkg/protocols/common/helpers/writer/writer.go
@@ -2,9 +2,9 @@ package writer
import (
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/progress"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/progress"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting"
)
// WriteResult is a helper for writing results to the output
diff --git a/v2/pkg/protocols/common/hosterrorscache/hosterrorscache.go b/pkg/protocols/common/hosterrorscache/hosterrorscache.go
similarity index 100%
rename from v2/pkg/protocols/common/hosterrorscache/hosterrorscache.go
rename to pkg/protocols/common/hosterrorscache/hosterrorscache.go
diff --git a/v2/pkg/protocols/common/hosterrorscache/hosterrorscache_test.go b/pkg/protocols/common/hosterrorscache/hosterrorscache_test.go
similarity index 100%
rename from v2/pkg/protocols/common/hosterrorscache/hosterrorscache_test.go
rename to pkg/protocols/common/hosterrorscache/hosterrorscache_test.go
diff --git a/v2/pkg/protocols/common/interactsh/const.go b/pkg/protocols/common/interactsh/const.go
similarity index 100%
rename from v2/pkg/protocols/common/interactsh/const.go
rename to pkg/protocols/common/interactsh/const.go
diff --git a/v2/pkg/protocols/common/interactsh/interactsh.go b/pkg/protocols/common/interactsh/interactsh.go
similarity index 98%
rename from v2/pkg/protocols/common/interactsh/interactsh.go
rename to pkg/protocols/common/interactsh/interactsh.go
index 506b2e93..675590d5 100644
--- a/v2/pkg/protocols/common/interactsh/interactsh.go
+++ b/pkg/protocols/common/interactsh/interactsh.go
@@ -17,10 +17,10 @@ import (
"github.com/projectdiscovery/gologger"
"github.com/projectdiscovery/interactsh/pkg/client"
"github.com/projectdiscovery/interactsh/pkg/server"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/helpers/responsehighlighter"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/helpers/writer"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/helpers/responsehighlighter"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/helpers/writer"
errorutil "github.com/projectdiscovery/utils/errors"
stringsutil "github.com/projectdiscovery/utils/strings"
)
diff --git a/v2/pkg/protocols/common/interactsh/options.go b/pkg/protocols/common/interactsh/options.go
similarity index 93%
rename from v2/pkg/protocols/common/interactsh/options.go
rename to pkg/protocols/common/interactsh/options.go
index 48d53680..c2ae2502 100644
--- a/v2/pkg/protocols/common/interactsh/options.go
+++ b/pkg/protocols/common/interactsh/options.go
@@ -4,9 +4,9 @@ import (
"time"
"github.com/projectdiscovery/interactsh/pkg/client"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/progress"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/progress"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting"
"github.com/projectdiscovery/retryablehttp-go"
)
diff --git a/v2/pkg/protocols/common/marker/marker.go b/pkg/protocols/common/marker/marker.go
similarity index 100%
rename from v2/pkg/protocols/common/marker/marker.go
rename to pkg/protocols/common/marker/marker.go
diff --git a/v2/pkg/protocols/common/protocolinit/init.go b/pkg/protocols/common/protocolinit/init.go
similarity index 91%
rename from v2/pkg/protocols/common/protocolinit/init.go
rename to pkg/protocols/common/protocolinit/init.go
index 4e2cc33e..679cab50 100644
--- a/v2/pkg/protocols/common/protocolinit/init.go
+++ b/pkg/protocols/common/protocolinit/init.go
@@ -3,13 +3,13 @@ package protocolinit
import (
"github.com/corpix/uarand"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/dns/dnsclientpool"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/http/httpclientpool"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/http/signerpool"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/network/networkclientpool"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/whois/rdapclientpool"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/dns/dnsclientpool"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/http/httpclientpool"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/http/signerpool"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/network/networkclientpool"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/whois/rdapclientpool"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
)
// Init initializes the client pools for the protocols
diff --git a/v2/pkg/protocols/common/protocolstate/file.go b/pkg/protocols/common/protocolstate/file.go
similarity index 94%
rename from v2/pkg/protocols/common/protocolstate/file.go
rename to pkg/protocols/common/protocolstate/file.go
index cc837a68..7d6618c8 100644
--- a/v2/pkg/protocols/common/protocolstate/file.go
+++ b/pkg/protocols/common/protocolstate/file.go
@@ -3,7 +3,7 @@ package protocolstate
import (
"strings"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
errorutil "github.com/projectdiscovery/utils/errors"
fileutil "github.com/projectdiscovery/utils/file"
)
diff --git a/v2/pkg/protocols/common/protocolstate/headless.go b/pkg/protocols/common/protocolstate/headless.go
similarity index 100%
rename from v2/pkg/protocols/common/protocolstate/headless.go
rename to pkg/protocols/common/protocolstate/headless.go
diff --git a/v2/pkg/protocols/common/protocolstate/js.go b/pkg/protocols/common/protocolstate/js.go
similarity index 100%
rename from v2/pkg/protocols/common/protocolstate/js.go
rename to pkg/protocols/common/protocolstate/js.go
diff --git a/v2/pkg/protocols/common/protocolstate/state.go b/pkg/protocols/common/protocolstate/state.go
similarity index 98%
rename from v2/pkg/protocols/common/protocolstate/state.go
rename to pkg/protocols/common/protocolstate/state.go
index 4c97414f..c39e9c79 100644
--- a/v2/pkg/protocols/common/protocolstate/state.go
+++ b/pkg/protocols/common/protocolstate/state.go
@@ -10,7 +10,7 @@ import (
"github.com/projectdiscovery/fastdialer/fastdialer"
"github.com/projectdiscovery/networkpolicy"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
)
// Dialer is a shared fastdialer instance for host DNS resolution
diff --git a/v2/pkg/protocols/common/randomip/randomip.go b/pkg/protocols/common/randomip/randomip.go
similarity index 100%
rename from v2/pkg/protocols/common/randomip/randomip.go
rename to pkg/protocols/common/randomip/randomip.go
diff --git a/v2/pkg/protocols/common/randomip/randomip_test.go b/pkg/protocols/common/randomip/randomip_test.go
similarity index 100%
rename from v2/pkg/protocols/common/randomip/randomip_test.go
rename to pkg/protocols/common/randomip/randomip_test.go
diff --git a/v2/pkg/protocols/common/replacer/replacer.go b/pkg/protocols/common/replacer/replacer.go
similarity index 91%
rename from v2/pkg/protocols/common/replacer/replacer.go
rename to pkg/protocols/common/replacer/replacer.go
index 585d1e25..c95086b3 100644
--- a/v2/pkg/protocols/common/replacer/replacer.go
+++ b/pkg/protocols/common/replacer/replacer.go
@@ -5,8 +5,8 @@ import (
"github.com/projectdiscovery/fasttemplate"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/marker"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/marker"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
)
// Replace replaces placeholders in template with values on the fly.
diff --git a/v2/pkg/protocols/common/replacer/replacer_test.go b/pkg/protocols/common/replacer/replacer_test.go
similarity index 100%
rename from v2/pkg/protocols/common/replacer/replacer_test.go
rename to pkg/protocols/common/replacer/replacer_test.go
diff --git a/v2/pkg/protocols/common/tostring/tostring.go b/pkg/protocols/common/tostring/tostring.go
similarity index 100%
rename from v2/pkg/protocols/common/tostring/tostring.go
rename to pkg/protocols/common/tostring/tostring.go
diff --git a/v2/pkg/protocols/common/uncover/uncover.go b/pkg/protocols/common/uncover/uncover.go
similarity index 98%
rename from v2/pkg/protocols/common/uncover/uncover.go
rename to pkg/protocols/common/uncover/uncover.go
index 9a30590b..a3f22133 100644
--- a/v2/pkg/protocols/common/uncover/uncover.go
+++ b/pkg/protocols/common/uncover/uncover.go
@@ -7,7 +7,7 @@ import (
"strings"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates"
"github.com/projectdiscovery/uncover"
"github.com/projectdiscovery/uncover/sources"
mapsutil "github.com/projectdiscovery/utils/maps"
diff --git a/v2/pkg/protocols/common/utils/excludematchers/excludematchers.go b/pkg/protocols/common/utils/excludematchers/excludematchers.go
similarity index 100%
rename from v2/pkg/protocols/common/utils/excludematchers/excludematchers.go
rename to pkg/protocols/common/utils/excludematchers/excludematchers.go
diff --git a/v2/pkg/protocols/common/utils/excludematchers/excludematchers_test.go b/pkg/protocols/common/utils/excludematchers/excludematchers_test.go
similarity index 100%
rename from v2/pkg/protocols/common/utils/excludematchers/excludematchers_test.go
rename to pkg/protocols/common/utils/excludematchers/excludematchers_test.go
diff --git a/v2/pkg/protocols/common/utils/vardump/dump.go b/pkg/protocols/common/utils/vardump/dump.go
similarity index 96%
rename from v2/pkg/protocols/common/utils/vardump/dump.go
rename to pkg/protocols/common/utils/vardump/dump.go
index 03960aa6..ab4f56b1 100644
--- a/v2/pkg/protocols/common/utils/vardump/dump.go
+++ b/pkg/protocols/common/utils/vardump/dump.go
@@ -4,7 +4,7 @@ import (
"strconv"
"strings"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
mapsutil "github.com/projectdiscovery/utils/maps"
)
diff --git a/v2/pkg/protocols/common/variables/doc.go b/pkg/protocols/common/variables/doc.go
similarity index 100%
rename from v2/pkg/protocols/common/variables/doc.go
rename to pkg/protocols/common/variables/doc.go
diff --git a/v2/pkg/protocols/common/variables/variables.go b/pkg/protocols/common/variables/variables.go
similarity index 92%
rename from v2/pkg/protocols/common/variables/variables.go
rename to pkg/protocols/common/variables/variables.go
index 7a7fda1f..f26df593 100644
--- a/v2/pkg/protocols/common/variables/variables.go
+++ b/pkg/protocols/common/variables/variables.go
@@ -5,12 +5,12 @@ import (
"strings"
"github.com/alecthomas/jsonschema"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/expressions"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/interactsh"
- protocolutils "github.com/projectdiscovery/nuclei/v2/pkg/protocols/utils"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
- "github.com/projectdiscovery/nuclei/v2/pkg/utils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/expressions"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/interactsh"
+ protocolutils "github.com/projectdiscovery/nuclei/v3/pkg/protocols/utils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/utils"
stringsutil "github.com/projectdiscovery/utils/strings"
)
diff --git a/v2/pkg/protocols/common/variables/variables_test.go b/pkg/protocols/common/variables/variables_test.go
similarity index 100%
rename from v2/pkg/protocols/common/variables/variables_test.go
rename to pkg/protocols/common/variables/variables_test.go
diff --git a/v2/pkg/protocols/dns/cluster.go b/pkg/protocols/dns/cluster.go
similarity index 100%
rename from v2/pkg/protocols/dns/cluster.go
rename to pkg/protocols/dns/cluster.go
diff --git a/v2/pkg/protocols/dns/dns.go b/pkg/protocols/dns/dns.go
similarity index 96%
rename from v2/pkg/protocols/dns/dns.go
rename to pkg/protocols/dns/dns.go
index 23242705..9d80e849 100644
--- a/v2/pkg/protocols/dns/dns.go
+++ b/pkg/protocols/dns/dns.go
@@ -6,12 +6,12 @@ import (
"github.com/miekg/dns"
"github.com/pkg/errors"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/expressions"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/replacer"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/dns/dnsclientpool"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/expressions"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/replacer"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/dns/dnsclientpool"
"github.com/projectdiscovery/retryabledns"
fileutil "github.com/projectdiscovery/utils/file"
)
diff --git a/v2/pkg/protocols/dns/dns_test.go b/pkg/protocols/dns/dns_test.go
similarity index 93%
rename from v2/pkg/protocols/dns/dns_test.go
rename to pkg/protocols/dns/dns_test.go
index b2262fc7..bf2c3a9f 100644
--- a/v2/pkg/protocols/dns/dns_test.go
+++ b/pkg/protocols/dns/dns_test.go
@@ -5,9 +5,9 @@ import (
"github.com/stretchr/testify/require"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
)
func TestDNSCompileMake(t *testing.T) {
diff --git a/v2/pkg/protocols/dns/dns_types.go b/pkg/protocols/dns/dns_types.go
similarity index 100%
rename from v2/pkg/protocols/dns/dns_types.go
rename to pkg/protocols/dns/dns_types.go
diff --git a/v2/pkg/protocols/dns/dnsclientpool/clientpool.go b/pkg/protocols/dns/dnsclientpool/clientpool.go
similarity index 97%
rename from v2/pkg/protocols/dns/dnsclientpool/clientpool.go
rename to pkg/protocols/dns/dnsclientpool/clientpool.go
index a3a75a8f..fd632bd1 100644
--- a/v2/pkg/protocols/dns/dnsclientpool/clientpool.go
+++ b/pkg/protocols/dns/dnsclientpool/clientpool.go
@@ -6,7 +6,7 @@ import (
"sync"
"github.com/pkg/errors"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
"github.com/projectdiscovery/retryabledns"
)
diff --git a/v2/pkg/protocols/dns/operators.go b/pkg/protocols/dns/operators.go
similarity index 93%
rename from v2/pkg/protocols/dns/operators.go
rename to pkg/protocols/dns/operators.go
index d0cad293..a4d57b2e 100644
--- a/v2/pkg/protocols/dns/operators.go
+++ b/pkg/protocols/dns/operators.go
@@ -8,13 +8,13 @@ import (
"github.com/miekg/dns"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/extractors"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/matchers"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/extractors"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/matchers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
"github.com/projectdiscovery/retryabledns"
)
diff --git a/v2/pkg/protocols/dns/operators_test.go b/pkg/protocols/dns/operators_test.go
similarity index 96%
rename from v2/pkg/protocols/dns/operators_test.go
rename to pkg/protocols/dns/operators_test.go
index 8cbcbdcd..80d02908 100644
--- a/v2/pkg/protocols/dns/operators_test.go
+++ b/pkg/protocols/dns/operators_test.go
@@ -8,13 +8,13 @@ import (
"github.com/miekg/dns"
"github.com/stretchr/testify/require"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/extractors"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/matchers"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/extractors"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/matchers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
)
func TestResponseToDSLMap(t *testing.T) {
diff --git a/v2/pkg/protocols/dns/request.go b/pkg/protocols/dns/request.go
similarity index 92%
rename from v2/pkg/protocols/dns/request.go
rename to pkg/protocols/dns/request.go
index a132ad3e..faa981da 100644
--- a/v2/pkg/protocols/dns/request.go
+++ b/pkg/protocols/dns/request.go
@@ -11,17 +11,17 @@ import (
"golang.org/x/exp/maps"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/expressions"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/helpers/eventcreator"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/helpers/responsehighlighter"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/utils/vardump"
- protocolutils "github.com/projectdiscovery/nuclei/v2/pkg/protocols/utils"
- templateTypes "github.com/projectdiscovery/nuclei/v2/pkg/templates/types"
- "github.com/projectdiscovery/nuclei/v2/pkg/utils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/expressions"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/helpers/eventcreator"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/helpers/responsehighlighter"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/utils/vardump"
+ protocolutils "github.com/projectdiscovery/nuclei/v3/pkg/protocols/utils"
+ templateTypes "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/utils"
"github.com/projectdiscovery/retryabledns"
iputil "github.com/projectdiscovery/utils/ip"
)
diff --git a/v2/pkg/protocols/dns/request_test.go b/pkg/protocols/dns/request_test.go
similarity index 86%
rename from v2/pkg/protocols/dns/request_test.go
rename to pkg/protocols/dns/request_test.go
index 3d602542..7275097b 100644
--- a/v2/pkg/protocols/dns/request_test.go
+++ b/pkg/protocols/dns/request_test.go
@@ -5,14 +5,14 @@ import (
"github.com/stretchr/testify/require"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/extractors"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/matchers"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/extractors"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/matchers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
)
func TestDNSExecuteWithResults(t *testing.T) {
diff --git a/v2/pkg/protocols/file/file.go b/pkg/protocols/file/file.go
similarity index 98%
rename from v2/pkg/protocols/file/file.go
rename to pkg/protocols/file/file.go
index f9c23579..d9968ffe 100644
--- a/v2/pkg/protocols/file/file.go
+++ b/pkg/protocols/file/file.go
@@ -8,8 +8,8 @@ import (
"github.com/h2non/filetype"
"github.com/pkg/errors"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
)
var (
diff --git a/v2/pkg/protocols/file/find.go b/pkg/protocols/file/find.go
similarity index 100%
rename from v2/pkg/protocols/file/find.go
rename to pkg/protocols/file/find.go
diff --git a/v2/pkg/protocols/file/find_test.go b/pkg/protocols/file/find_test.go
similarity index 91%
rename from v2/pkg/protocols/file/find_test.go
rename to pkg/protocols/file/find_test.go
index 3e86682c..3df5d238 100644
--- a/v2/pkg/protocols/file/find_test.go
+++ b/pkg/protocols/file/find_test.go
@@ -7,9 +7,9 @@ import (
"github.com/stretchr/testify/require"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
permissionutil "github.com/projectdiscovery/utils/permission"
)
diff --git a/v2/pkg/protocols/file/operators.go b/pkg/protocols/file/operators.go
similarity index 90%
rename from v2/pkg/protocols/file/operators.go
rename to pkg/protocols/file/operators.go
index 2a7825de..2780045b 100644
--- a/v2/pkg/protocols/file/operators.go
+++ b/pkg/protocols/file/operators.go
@@ -3,13 +3,13 @@ package file
import (
"time"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/extractors"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/matchers"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/extractors"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/matchers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
)
// Match matches a generic data response again a given matcher
diff --git a/v2/pkg/protocols/file/operators_test.go b/pkg/protocols/file/operators_test.go
similarity index 96%
rename from v2/pkg/protocols/file/operators_test.go
rename to pkg/protocols/file/operators_test.go
index 30732007..72a0ca45 100644
--- a/v2/pkg/protocols/file/operators_test.go
+++ b/pkg/protocols/file/operators_test.go
@@ -5,13 +5,13 @@ import (
"github.com/stretchr/testify/require"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/extractors"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/matchers"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/extractors"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/matchers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
)
func newMockOperator() operators.Operators {
diff --git a/v2/pkg/protocols/file/request.go b/pkg/protocols/file/request.go
similarity index 95%
rename from v2/pkg/protocols/file/request.go
rename to pkg/protocols/file/request.go
index 324b5a19..bf81a12a 100644
--- a/v2/pkg/protocols/file/request.go
+++ b/pkg/protocols/file/request.go
@@ -14,15 +14,15 @@ import (
"github.com/remeh/sizedwaitgroup"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/matchers"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/helpers/eventcreator"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/helpers/responsehighlighter"
- templateTypes "github.com/projectdiscovery/nuclei/v2/pkg/templates/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/matchers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/helpers/eventcreator"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/helpers/responsehighlighter"
+ templateTypes "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
sliceutil "github.com/projectdiscovery/utils/slice"
)
diff --git a/v2/pkg/protocols/file/request_test.go b/pkg/protocols/file/request_test.go
similarity index 84%
rename from v2/pkg/protocols/file/request_test.go
rename to pkg/protocols/file/request_test.go
index 5aaf8d02..ff41e3e8 100644
--- a/v2/pkg/protocols/file/request_test.go
+++ b/pkg/protocols/file/request_test.go
@@ -7,14 +7,14 @@ import (
"github.com/stretchr/testify/require"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/extractors"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/matchers"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/extractors"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/matchers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
permissionutil "github.com/projectdiscovery/utils/permission"
)
diff --git a/pkg/protocols/headless/engine/.nuclei-config/nuclei/.templates-config.json b/pkg/protocols/headless/engine/.nuclei-config/nuclei/.templates-config.json
new file mode 100644
index 00000000..54f80691
--- /dev/null
+++ b/pkg/protocols/headless/engine/.nuclei-config/nuclei/.templates-config.json
@@ -0,0 +1 @@
+{"nuclei-templates-directory":"/Users/tarun/nuclei-templates","custom-s3-templates-directory":"/Users/tarun/nuclei-templates/s3","custom-github-templates-directory":"/Users/tarun/nuclei-templates/github","custom-gitlab-templates-directory":"/Users/tarun/nuclei-templates/gitlab","custom-azure-templates-directory":"/Users/tarun/nuclei-templates/azure","nuclei-latest-version":"","nuclei-templates-latest-version":""}
\ No newline at end of file
diff --git a/v2/pkg/protocols/headless/engine/action.go b/pkg/protocols/headless/engine/action.go
similarity index 100%
rename from v2/pkg/protocols/headless/engine/action.go
rename to pkg/protocols/headless/engine/action.go
diff --git a/v2/pkg/protocols/headless/engine/action_types.go b/pkg/protocols/headless/engine/action_types.go
similarity index 100%
rename from v2/pkg/protocols/headless/engine/action_types.go
rename to pkg/protocols/headless/engine/action_types.go
diff --git a/v2/pkg/protocols/headless/engine/engine.go b/pkg/protocols/headless/engine/engine.go
similarity index 98%
rename from v2/pkg/protocols/headless/engine/engine.go
rename to pkg/protocols/headless/engine/engine.go
index de43211d..04d6b2a6 100644
--- a/v2/pkg/protocols/headless/engine/engine.go
+++ b/pkg/protocols/headless/engine/engine.go
@@ -11,7 +11,7 @@ import (
"github.com/go-rod/rod/lib/launcher/flags"
"github.com/pkg/errors"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
fileutil "github.com/projectdiscovery/utils/file"
osutils "github.com/projectdiscovery/utils/os"
processutil "github.com/projectdiscovery/utils/process"
diff --git a/v2/pkg/protocols/headless/engine/hijack.go b/pkg/protocols/headless/engine/hijack.go
similarity index 100%
rename from v2/pkg/protocols/headless/engine/hijack.go
rename to pkg/protocols/headless/engine/hijack.go
diff --git a/v2/pkg/protocols/headless/engine/http_client.go b/pkg/protocols/headless/engine/http_client.go
similarity index 93%
rename from v2/pkg/protocols/headless/engine/http_client.go
rename to pkg/protocols/headless/engine/http_client.go
index 426a197e..0029432e 100644
--- a/v2/pkg/protocols/headless/engine/http_client.go
+++ b/pkg/protocols/headless/engine/http_client.go
@@ -12,9 +12,9 @@ import (
"golang.org/x/net/proxy"
"github.com/projectdiscovery/fastdialer/fastdialer/ja3/impersonate"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/utils"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/utils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
)
// newHttpClient creates a new http client for headless communication with a timeout
diff --git a/v2/pkg/protocols/headless/engine/instance.go b/pkg/protocols/headless/engine/instance.go
similarity index 97%
rename from v2/pkg/protocols/headless/engine/instance.go
rename to pkg/protocols/headless/engine/instance.go
index f0dae782..7646bfa0 100644
--- a/v2/pkg/protocols/headless/engine/instance.go
+++ b/pkg/protocols/headless/engine/instance.go
@@ -7,7 +7,7 @@ import (
"github.com/go-rod/rod"
"github.com/go-rod/rod/lib/utils"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/interactsh"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/interactsh"
)
// Instance is an isolated browser instance opened for doing operations with it.
diff --git a/v2/pkg/protocols/headless/engine/page.go b/pkg/protocols/headless/engine/page.go
similarity index 97%
rename from v2/pkg/protocols/headless/engine/page.go
rename to pkg/protocols/headless/engine/page.go
index 7ce2cd81..0df4d9ab 100644
--- a/v2/pkg/protocols/headless/engine/page.go
+++ b/pkg/protocols/headless/engine/page.go
@@ -11,9 +11,9 @@ import (
"github.com/go-rod/rod"
"github.com/go-rod/rod/lib/proto"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/utils"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/utils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
)
// Page is a single page in an isolated browser instance
diff --git a/v2/pkg/protocols/headless/engine/page_actions.go b/pkg/protocols/headless/engine/page_actions.go
similarity index 98%
rename from v2/pkg/protocols/headless/engine/page_actions.go
rename to pkg/protocols/headless/engine/page_actions.go
index 3cd9cfd0..d2f5dbd3 100644
--- a/v2/pkg/protocols/headless/engine/page_actions.go
+++ b/pkg/protocols/headless/engine/page_actions.go
@@ -15,12 +15,12 @@ import (
"github.com/go-rod/rod/lib/utils"
"github.com/pkg/errors"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/expressions"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/utils/vardump"
- protocolutils "github.com/projectdiscovery/nuclei/v2/pkg/protocols/utils"
- httputil "github.com/projectdiscovery/nuclei/v2/pkg/protocols/utils/http"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/expressions"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/utils/vardump"
+ protocolutils "github.com/projectdiscovery/nuclei/v3/pkg/protocols/utils"
+ httputil "github.com/projectdiscovery/nuclei/v3/pkg/protocols/utils/http"
errorutil "github.com/projectdiscovery/utils/errors"
fileutil "github.com/projectdiscovery/utils/file"
folderutil "github.com/projectdiscovery/utils/folder"
diff --git a/v2/pkg/protocols/headless/engine/page_actions_test.go b/pkg/protocols/headless/engine/page_actions_test.go
similarity index 99%
rename from v2/pkg/protocols/headless/engine/page_actions_test.go
rename to pkg/protocols/headless/engine/page_actions_test.go
index 6b6c50b8..80e0e505 100644
--- a/v2/pkg/protocols/headless/engine/page_actions_test.go
+++ b/pkg/protocols/headless/engine/page_actions_test.go
@@ -17,10 +17,10 @@ import (
"github.com/stretchr/testify/require"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils/testheadless"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils/testheadless"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
stringsutil "github.com/projectdiscovery/utils/strings"
)
diff --git a/v2/pkg/protocols/headless/engine/rules.go b/pkg/protocols/headless/engine/rules.go
similarity index 98%
rename from v2/pkg/protocols/headless/engine/rules.go
rename to pkg/protocols/headless/engine/rules.go
index a28176dc..a3b302c4 100644
--- a/v2/pkg/protocols/headless/engine/rules.go
+++ b/pkg/protocols/headless/engine/rules.go
@@ -7,7 +7,7 @@ import (
"github.com/go-rod/rod"
"github.com/go-rod/rod/lib/proto"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
)
// routingRuleHandler handles proxy rule for actions related to request/response modification
diff --git a/v2/pkg/protocols/headless/engine/util.go b/pkg/protocols/headless/engine/util.go
similarity index 79%
rename from v2/pkg/protocols/headless/engine/util.go
rename to pkg/protocols/headless/engine/util.go
index df032f31..5e765154 100644
--- a/v2/pkg/protocols/headless/engine/util.go
+++ b/pkg/protocols/headless/engine/util.go
@@ -1,7 +1,7 @@
package engine
import (
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/marker"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/marker"
"github.com/valyala/fasttemplate"
)
diff --git a/v2/pkg/protocols/headless/headless.go b/pkg/protocols/headless/headless.go
similarity index 94%
rename from v2/pkg/protocols/headless/headless.go
rename to pkg/protocols/headless/headless.go
index 32dc1af8..d2d88efa 100644
--- a/v2/pkg/protocols/headless/headless.go
+++ b/pkg/protocols/headless/headless.go
@@ -4,12 +4,12 @@ import (
"github.com/corpix/uarand"
"github.com/pkg/errors"
- useragent "github.com/projectdiscovery/nuclei/v2/pkg/model/types/userAgent"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/fuzz"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/headless/engine"
+ useragent "github.com/projectdiscovery/nuclei/v3/pkg/model/types/userAgent"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/fuzz"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/headless/engine"
fileutil "github.com/projectdiscovery/utils/file"
)
diff --git a/v2/pkg/protocols/headless/operators.go b/pkg/protocols/headless/operators.go
similarity index 91%
rename from v2/pkg/protocols/headless/operators.go
rename to pkg/protocols/headless/operators.go
index ef552df3..6088f8f8 100644
--- a/v2/pkg/protocols/headless/operators.go
+++ b/pkg/protocols/headless/operators.go
@@ -4,13 +4,13 @@ import (
"strconv"
"time"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/extractors"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/matchers"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/extractors"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/matchers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
)
// Match matches a generic data response again a given matcher
diff --git a/v2/pkg/protocols/headless/operators_test.go b/pkg/protocols/headless/operators_test.go
similarity index 100%
rename from v2/pkg/protocols/headless/operators_test.go
rename to pkg/protocols/headless/operators_test.go
diff --git a/v2/pkg/protocols/headless/request.go b/pkg/protocols/headless/request.go
similarity index 91%
rename from v2/pkg/protocols/headless/request.go
rename to pkg/protocols/headless/request.go
index 93ece953..2cfded16 100644
--- a/v2/pkg/protocols/headless/request.go
+++ b/pkg/protocols/headless/request.go
@@ -12,19 +12,19 @@ import (
"golang.org/x/exp/maps"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/fuzz"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/helpers/eventcreator"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/helpers/responsehighlighter"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/interactsh"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/utils/vardump"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/headless/engine"
- protocolutils "github.com/projectdiscovery/nuclei/v2/pkg/protocols/utils"
- templateTypes "github.com/projectdiscovery/nuclei/v2/pkg/templates/types"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/fuzz"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/helpers/eventcreator"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/helpers/responsehighlighter"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/interactsh"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/utils/vardump"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/headless/engine"
+ protocolutils "github.com/projectdiscovery/nuclei/v3/pkg/protocols/utils"
+ templateTypes "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
urlutil "github.com/projectdiscovery/utils/url"
)
diff --git a/v2/pkg/protocols/http/build_request.go b/pkg/protocols/http/build_request.go
similarity index 96%
rename from v2/pkg/protocols/http/build_request.go
rename to pkg/protocols/http/build_request.go
index c3cf3997..7819ebcb 100644
--- a/v2/pkg/protocols/http/build_request.go
+++ b/pkg/protocols/http/build_request.go
@@ -13,16 +13,16 @@ import (
"github.com/pkg/errors"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/expressions"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/utils/vardump"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/http/race"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/http/raw"
- protocolutils "github.com/projectdiscovery/nuclei/v2/pkg/protocols/utils"
- httputil "github.com/projectdiscovery/nuclei/v2/pkg/protocols/utils/http"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
- "github.com/projectdiscovery/nuclei/v2/pkg/types/scanstrategy"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/expressions"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/utils/vardump"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/http/race"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/http/raw"
+ protocolutils "github.com/projectdiscovery/nuclei/v3/pkg/protocols/utils"
+ httputil "github.com/projectdiscovery/nuclei/v3/pkg/protocols/utils/http"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types/scanstrategy"
"github.com/projectdiscovery/rawhttp"
"github.com/projectdiscovery/retryablehttp-go"
errorutil "github.com/projectdiscovery/utils/errors"
diff --git a/v2/pkg/protocols/http/build_request_test.go b/pkg/protocols/http/build_request_test.go
similarity index 96%
rename from v2/pkg/protocols/http/build_request_test.go
rename to pkg/protocols/http/build_request_test.go
index 6d9a17ae..bc87549f 100644
--- a/v2/pkg/protocols/http/build_request_test.go
+++ b/pkg/protocols/http/build_request_test.go
@@ -7,12 +7,12 @@ import (
"github.com/stretchr/testify/require"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/interactsh"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/interactsh"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
)
func TestMakeRequestFromModal(t *testing.T) {
diff --git a/v2/pkg/protocols/http/cluster.go b/pkg/protocols/http/cluster.go
similarity index 100%
rename from v2/pkg/protocols/http/cluster.go
rename to pkg/protocols/http/cluster.go
diff --git a/v2/pkg/protocols/http/cluster_test.go b/pkg/protocols/http/cluster_test.go
similarity index 100%
rename from v2/pkg/protocols/http/cluster_test.go
rename to pkg/protocols/http/cluster_test.go
diff --git a/v2/pkg/protocols/http/http.go b/pkg/protocols/http/http.go
similarity index 97%
rename from v2/pkg/protocols/http/http.go
rename to pkg/protocols/http/http.go
index 4dfda24c..5b61ff09 100644
--- a/v2/pkg/protocols/http/http.go
+++ b/pkg/protocols/http/http.go
@@ -8,13 +8,13 @@ import (
json "github.com/json-iterator/go"
"github.com/pkg/errors"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/expressions"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/fuzz"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/http/httpclientpool"
- httputil "github.com/projectdiscovery/nuclei/v2/pkg/protocols/utils/http"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/expressions"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/fuzz"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/http/httpclientpool"
+ httputil "github.com/projectdiscovery/nuclei/v3/pkg/protocols/utils/http"
"github.com/projectdiscovery/rawhttp"
"github.com/projectdiscovery/retryablehttp-go"
fileutil "github.com/projectdiscovery/utils/file"
diff --git a/v2/pkg/protocols/http/http_method_types.go b/pkg/protocols/http/http_method_types.go
similarity index 100%
rename from v2/pkg/protocols/http/http_method_types.go
rename to pkg/protocols/http/http_method_types.go
diff --git a/v2/pkg/protocols/http/http_test.go b/pkg/protocols/http/http_test.go
similarity index 84%
rename from v2/pkg/protocols/http/http_test.go
rename to pkg/protocols/http/http_test.go
index aca703e9..396fd55e 100644
--- a/v2/pkg/protocols/http/http_test.go
+++ b/pkg/protocols/http/http_test.go
@@ -5,10 +5,10 @@ import (
"github.com/stretchr/testify/require"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
)
func TestHTTPCompile(t *testing.T) {
diff --git a/v2/pkg/protocols/http/httpclientpool/clientpool.go b/pkg/protocols/http/httpclientpool/clientpool.go
similarity index 97%
rename from v2/pkg/protocols/http/httpclientpool/clientpool.go
rename to pkg/protocols/http/httpclientpool/clientpool.go
index f74fa34d..aeaa9a21 100644
--- a/v2/pkg/protocols/http/httpclientpool/clientpool.go
+++ b/pkg/protocols/http/httpclientpool/clientpool.go
@@ -18,10 +18,10 @@ import (
"github.com/projectdiscovery/fastdialer/fastdialer"
"github.com/projectdiscovery/fastdialer/fastdialer/ja3/impersonate"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/utils"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
- "github.com/projectdiscovery/nuclei/v2/pkg/types/scanstrategy"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/utils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types/scanstrategy"
"github.com/projectdiscovery/rawhttp"
"github.com/projectdiscovery/retryablehttp-go"
mapsutil "github.com/projectdiscovery/utils/maps"
diff --git a/v2/pkg/protocols/http/operators.go b/pkg/protocols/http/operators.go
similarity index 91%
rename from v2/pkg/protocols/http/operators.go
rename to pkg/protocols/http/operators.go
index 03d75c7a..a5ee0efa 100644
--- a/v2/pkg/protocols/http/operators.go
+++ b/pkg/protocols/http/operators.go
@@ -5,15 +5,15 @@ import (
"strings"
"time"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/extractors"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/matchers"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/helpers/responsehighlighter"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/utils"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/extractors"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/matchers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/helpers/responsehighlighter"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/utils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
)
// Match matches a generic data response again a given matcher
diff --git a/v2/pkg/protocols/http/operators_test.go b/pkg/protocols/http/operators_test.go
similarity index 97%
rename from v2/pkg/protocols/http/operators_test.go
rename to pkg/protocols/http/operators_test.go
index 889bf222..deb5319d 100644
--- a/v2/pkg/protocols/http/operators_test.go
+++ b/pkg/protocols/http/operators_test.go
@@ -7,13 +7,13 @@ import (
"github.com/stretchr/testify/require"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/extractors"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/matchers"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/extractors"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/matchers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
)
func TestResponseToDSLMap(t *testing.T) {
diff --git a/v2/pkg/protocols/http/race/syncedreadcloser.go b/pkg/protocols/http/race/syncedreadcloser.go
similarity index 100%
rename from v2/pkg/protocols/http/race/syncedreadcloser.go
rename to pkg/protocols/http/race/syncedreadcloser.go
diff --git a/v2/pkg/protocols/http/raw/doc.go b/pkg/protocols/http/raw/doc.go
similarity index 100%
rename from v2/pkg/protocols/http/raw/doc.go
rename to pkg/protocols/http/raw/doc.go
diff --git a/v2/pkg/protocols/http/raw/raw.go b/pkg/protocols/http/raw/raw.go
similarity index 100%
rename from v2/pkg/protocols/http/raw/raw.go
rename to pkg/protocols/http/raw/raw.go
diff --git a/v2/pkg/protocols/http/raw/raw_test.go b/pkg/protocols/http/raw/raw_test.go
similarity index 100%
rename from v2/pkg/protocols/http/raw/raw_test.go
rename to pkg/protocols/http/raw/raw_test.go
diff --git a/v2/pkg/protocols/http/request.go b/pkg/protocols/http/request.go
similarity index 97%
rename from v2/pkg/protocols/http/request.go
rename to pkg/protocols/http/request.go
index 0dc3c542..9131ba4a 100644
--- a/v2/pkg/protocols/http/request.go
+++ b/pkg/protocols/http/request.go
@@ -20,22 +20,22 @@ import (
"github.com/projectdiscovery/fastdialer/fastdialer"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/expressions"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/fuzz"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/helpers/eventcreator"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/helpers/responsehighlighter"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/interactsh"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/tostring"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/http/httpclientpool"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/http/signer"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/http/signerpool"
- templateTypes "github.com/projectdiscovery/nuclei/v2/pkg/templates/types"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/expressions"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/fuzz"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/helpers/eventcreator"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/helpers/responsehighlighter"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/interactsh"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/tostring"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/http/httpclientpool"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/http/signer"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/http/signerpool"
+ templateTypes "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
"github.com/projectdiscovery/rawhttp"
"github.com/projectdiscovery/utils/reader"
sliceutil "github.com/projectdiscovery/utils/slice"
@@ -793,7 +793,9 @@ func (request *Request) executeRequest(input *contextargs.Context, generatedRequ
if request.NeedsRequestCondition() {
for k, v := range outputEvent {
key := fmt.Sprintf("%s_%d", k, requestCount)
- previousEvent[key] = v
+ if previousEvent[key] != nil {
+ previousEvent[key] = v
+ }
finalEvent[key] = v
}
}
diff --git a/v2/pkg/protocols/http/request_annotations.go b/pkg/protocols/http/request_annotations.go
similarity index 100%
rename from v2/pkg/protocols/http/request_annotations.go
rename to pkg/protocols/http/request_annotations.go
diff --git a/v2/pkg/protocols/http/request_annotations_test.go b/pkg/protocols/http/request_annotations_test.go
similarity index 96%
rename from v2/pkg/protocols/http/request_annotations_test.go
rename to pkg/protocols/http/request_annotations_test.go
index df376f65..acec6c4d 100644
--- a/v2/pkg/protocols/http/request_annotations_test.go
+++ b/pkg/protocols/http/request_annotations_test.go
@@ -5,7 +5,7 @@ import (
"net/http"
"testing"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/http/httpclientpool"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/http/httpclientpool"
"github.com/projectdiscovery/retryablehttp-go"
"github.com/stretchr/testify/require"
)
diff --git a/v2/pkg/protocols/http/request_condition.go b/pkg/protocols/http/request_condition.go
similarity index 100%
rename from v2/pkg/protocols/http/request_condition.go
rename to pkg/protocols/http/request_condition.go
diff --git a/v2/pkg/protocols/http/request_generator.go b/pkg/protocols/http/request_generator.go
similarity index 97%
rename from v2/pkg/protocols/http/request_generator.go
rename to pkg/protocols/http/request_generator.go
index eb3ebfb7..b15df1be 100644
--- a/v2/pkg/protocols/http/request_generator.go
+++ b/pkg/protocols/http/request_generator.go
@@ -1,8 +1,8 @@
package http
import (
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
)
// requestGenerator generates requests sequentially based on various
diff --git a/v2/pkg/protocols/http/request_generator_test.go b/pkg/protocols/http/request_generator_test.go
similarity index 92%
rename from v2/pkg/protocols/http/request_generator_test.go
rename to pkg/protocols/http/request_generator_test.go
index c57291d5..f36b99fa 100644
--- a/v2/pkg/protocols/http/request_generator_test.go
+++ b/pkg/protocols/http/request_generator_test.go
@@ -5,9 +5,9 @@ import (
"github.com/stretchr/testify/require"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/disk"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/disk"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
)
func TestRequestGeneratorPaths(t *testing.T) {
diff --git a/v2/pkg/protocols/http/request_test.go b/pkg/protocols/http/request_test.go
similarity index 92%
rename from v2/pkg/protocols/http/request_test.go
rename to pkg/protocols/http/request_test.go
index 514bdae0..3d969712 100644
--- a/v2/pkg/protocols/http/request_test.go
+++ b/pkg/protocols/http/request_test.go
@@ -8,14 +8,14 @@ import (
"github.com/stretchr/testify/require"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/extractors"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/matchers"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/extractors"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/matchers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
)
func TestHTTPExtractMultipleReuse(t *testing.T) {
diff --git a/v2/pkg/protocols/http/signature.go b/pkg/protocols/http/signature.go
similarity index 97%
rename from v2/pkg/protocols/http/signature.go
rename to pkg/protocols/http/signature.go
index af4d81c3..b8d49171 100644
--- a/v2/pkg/protocols/http/signature.go
+++ b/pkg/protocols/http/signature.go
@@ -7,7 +7,7 @@ import (
"github.com/alecthomas/jsonschema"
"github.com/pkg/errors"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/http/signer"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/http/signer"
)
// SignatureType is the type of signature
diff --git a/v2/pkg/protocols/http/signer/aws-sign.go b/pkg/protocols/http/signer/aws-sign.go
similarity index 100%
rename from v2/pkg/protocols/http/signer/aws-sign.go
rename to pkg/protocols/http/signer/aws-sign.go
diff --git a/v2/pkg/protocols/http/signer/signer.go b/pkg/protocols/http/signer/signer.go
similarity index 95%
rename from v2/pkg/protocols/http/signer/signer.go
rename to pkg/protocols/http/signer/signer.go
index c5a768b3..2ce845e9 100644
--- a/v2/pkg/protocols/http/signer/signer.go
+++ b/pkg/protocols/http/signer/signer.go
@@ -5,7 +5,7 @@ import (
"errors"
"net/http"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
)
// An Argument that can be passed to Signer
diff --git a/v2/pkg/protocols/http/signerpool/signerpool.go b/pkg/protocols/http/signerpool/signerpool.go
similarity index 91%
rename from v2/pkg/protocols/http/signerpool/signerpool.go
rename to pkg/protocols/http/signerpool/signerpool.go
index 94fd9a7c..65ee5069 100644
--- a/v2/pkg/protocols/http/signerpool/signerpool.go
+++ b/pkg/protocols/http/signerpool/signerpool.go
@@ -5,9 +5,9 @@ import (
"strings"
"sync"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/http/signer"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/http/signer"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
)
var (
diff --git a/v2/pkg/protocols/http/utils.go b/pkg/protocols/http/utils.go
similarity index 97%
rename from v2/pkg/protocols/http/utils.go
rename to pkg/protocols/http/utils.go
index a706b8b4..f2b36489 100644
--- a/v2/pkg/protocols/http/utils.go
+++ b/pkg/protocols/http/utils.go
@@ -13,8 +13,8 @@ import (
"golang.org/x/text/encoding/simplifiedchinese"
"golang.org/x/text/transform"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
"github.com/projectdiscovery/rawhttp"
mapsutil "github.com/projectdiscovery/utils/maps"
stringsutil "github.com/projectdiscovery/utils/strings"
diff --git a/v2/pkg/protocols/http/validate.go b/pkg/protocols/http/validate.go
similarity index 100%
rename from v2/pkg/protocols/http/validate.go
rename to pkg/protocols/http/validate.go
diff --git a/v2/pkg/protocols/javascript/js.go b/pkg/protocols/javascript/js.go
similarity index 96%
rename from v2/pkg/protocols/javascript/js.go
rename to pkg/protocols/javascript/js.go
index 73320b49..4fb15cd0 100644
--- a/v2/pkg/protocols/javascript/js.go
+++ b/pkg/protocols/javascript/js.go
@@ -14,23 +14,23 @@ import (
"github.com/dop251/goja"
"github.com/pkg/errors"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/js/compiler"
- "github.com/projectdiscovery/nuclei/v2/pkg/js/gojs"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/extractors"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/matchers"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/expressions"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/helpers/eventcreator"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/interactsh"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/utils/vardump"
- protocolutils "github.com/projectdiscovery/nuclei/v2/pkg/protocols/utils"
- templateTypes "github.com/projectdiscovery/nuclei/v2/pkg/templates/types"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/js/compiler"
+ "github.com/projectdiscovery/nuclei/v3/pkg/js/gojs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/extractors"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/matchers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/expressions"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/helpers/eventcreator"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/interactsh"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/utils/vardump"
+ protocolutils "github.com/projectdiscovery/nuclei/v3/pkg/protocols/utils"
+ templateTypes "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
errorutil "github.com/projectdiscovery/utils/errors"
urlutil "github.com/projectdiscovery/utils/url"
"github.com/remeh/sizedwaitgroup"
diff --git a/v2/pkg/protocols/javascript/js_test.go b/pkg/protocols/javascript/js_test.go
similarity index 82%
rename from v2/pkg/protocols/javascript/js_test.go
rename to pkg/protocols/javascript/js_test.go
index a2216e36..2afd51a2 100644
--- a/v2/pkg/protocols/javascript/js_test.go
+++ b/pkg/protocols/javascript/js_test.go
@@ -6,13 +6,13 @@ import (
"testing"
"time"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/disk"
- "github.com/projectdiscovery/nuclei/v2/pkg/parsers"
- "github.com/projectdiscovery/nuclei/v2/pkg/progress"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/disk"
+ "github.com/projectdiscovery/nuclei/v3/pkg/parsers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/progress"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
"github.com/projectdiscovery/ratelimit"
"github.com/stretchr/testify/require"
)
diff --git a/v2/pkg/protocols/javascript/testcases/ms-sql-detect.yaml b/pkg/protocols/javascript/testcases/ms-sql-detect.yaml
similarity index 100%
rename from v2/pkg/protocols/javascript/testcases/ms-sql-detect.yaml
rename to pkg/protocols/javascript/testcases/ms-sql-detect.yaml
diff --git a/v2/pkg/protocols/javascript/testcases/redis-pass-brute.yaml b/pkg/protocols/javascript/testcases/redis-pass-brute.yaml
similarity index 100%
rename from v2/pkg/protocols/javascript/testcases/redis-pass-brute.yaml
rename to pkg/protocols/javascript/testcases/redis-pass-brute.yaml
diff --git a/v2/pkg/protocols/javascript/testcases/ssh-server-fingerprint.yaml b/pkg/protocols/javascript/testcases/ssh-server-fingerprint.yaml
similarity index 100%
rename from v2/pkg/protocols/javascript/testcases/ssh-server-fingerprint.yaml
rename to pkg/protocols/javascript/testcases/ssh-server-fingerprint.yaml
diff --git a/v2/pkg/protocols/network/network.go b/pkg/protocols/network/network.go
similarity index 96%
rename from v2/pkg/protocols/network/network.go
rename to pkg/protocols/network/network.go
index 9ac03f4c..7975e4c1 100644
--- a/v2/pkg/protocols/network/network.go
+++ b/pkg/protocols/network/network.go
@@ -6,11 +6,11 @@ import (
"github.com/pkg/errors"
"github.com/projectdiscovery/fastdialer/fastdialer"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/expressions"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/network/networkclientpool"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/expressions"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/network/networkclientpool"
fileutil "github.com/projectdiscovery/utils/file"
)
diff --git a/v2/pkg/protocols/network/network_input_types.go b/pkg/protocols/network/network_input_types.go
similarity index 100%
rename from v2/pkg/protocols/network/network_input_types.go
rename to pkg/protocols/network/network_input_types.go
diff --git a/v2/pkg/protocols/network/network_test.go b/pkg/protocols/network/network_test.go
similarity index 84%
rename from v2/pkg/protocols/network/network_test.go
rename to pkg/protocols/network/network_test.go
index 27a64d59..83dbc7fc 100644
--- a/v2/pkg/protocols/network/network_test.go
+++ b/pkg/protocols/network/network_test.go
@@ -5,9 +5,9 @@ import (
"github.com/stretchr/testify/require"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
)
func TestNetworkCompileMake(t *testing.T) {
diff --git a/v2/pkg/protocols/network/networkclientpool/clientpool.go b/pkg/protocols/network/networkclientpool/clientpool.go
similarity index 88%
rename from v2/pkg/protocols/network/networkclientpool/clientpool.go
rename to pkg/protocols/network/networkclientpool/clientpool.go
index f80897b1..1a933413 100644
--- a/v2/pkg/protocols/network/networkclientpool/clientpool.go
+++ b/pkg/protocols/network/networkclientpool/clientpool.go
@@ -2,8 +2,8 @@ package networkclientpool
import (
"github.com/projectdiscovery/fastdialer/fastdialer"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
)
var (
diff --git a/v2/pkg/protocols/network/operators.go b/pkg/protocols/network/operators.go
similarity index 90%
rename from v2/pkg/protocols/network/operators.go
rename to pkg/protocols/network/operators.go
index 5faf1979..6e6c99ea 100644
--- a/v2/pkg/protocols/network/operators.go
+++ b/pkg/protocols/network/operators.go
@@ -3,13 +3,13 @@ package network
import (
"time"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/extractors"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/matchers"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/extractors"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/matchers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
)
// Match matches a generic data response again a given matcher
diff --git a/v2/pkg/protocols/network/operators_test.go b/pkg/protocols/network/operators_test.go
similarity index 94%
rename from v2/pkg/protocols/network/operators_test.go
rename to pkg/protocols/network/operators_test.go
index 241daf4b..88bc94b4 100644
--- a/v2/pkg/protocols/network/operators_test.go
+++ b/pkg/protocols/network/operators_test.go
@@ -5,13 +5,13 @@ import (
"github.com/stretchr/testify/require"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/extractors"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/matchers"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/extractors"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/matchers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
)
func TestResponseToDSLMap(t *testing.T) {
diff --git a/v2/pkg/protocols/network/request.go b/pkg/protocols/network/request.go
similarity index 94%
rename from v2/pkg/protocols/network/request.go
rename to pkg/protocols/network/request.go
index 5f720beb..6fd9cbed 100644
--- a/v2/pkg/protocols/network/request.go
+++ b/pkg/protocols/network/request.go
@@ -15,19 +15,19 @@ import (
"golang.org/x/exp/maps"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/expressions"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/helpers/eventcreator"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/helpers/responsehighlighter"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/interactsh"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/replacer"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/utils/vardump"
- protocolutils "github.com/projectdiscovery/nuclei/v2/pkg/protocols/utils"
- templateTypes "github.com/projectdiscovery/nuclei/v2/pkg/templates/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/expressions"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/helpers/eventcreator"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/helpers/responsehighlighter"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/interactsh"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/replacer"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/utils/vardump"
+ protocolutils "github.com/projectdiscovery/nuclei/v3/pkg/protocols/utils"
+ templateTypes "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
errorutil "github.com/projectdiscovery/utils/errors"
mapsutil "github.com/projectdiscovery/utils/maps"
)
diff --git a/v2/pkg/protocols/network/request_test.go b/pkg/protocols/network/request_test.go
similarity index 91%
rename from v2/pkg/protocols/network/request_test.go
rename to pkg/protocols/network/request_test.go
index 89c52872..bf0cd531 100644
--- a/v2/pkg/protocols/network/request_test.go
+++ b/pkg/protocols/network/request_test.go
@@ -10,14 +10,14 @@ import (
"github.com/stretchr/testify/require"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/extractors"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/matchers"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/extractors"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/matchers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
)
func TestNetworkExecuteWithResults(t *testing.T) {
diff --git a/v2/pkg/protocols/offlinehttp/find.go b/pkg/protocols/offlinehttp/find.go
similarity index 100%
rename from v2/pkg/protocols/offlinehttp/find.go
rename to pkg/protocols/offlinehttp/find.go
diff --git a/v2/pkg/protocols/offlinehttp/find_test.go b/pkg/protocols/offlinehttp/find_test.go
similarity index 89%
rename from v2/pkg/protocols/offlinehttp/find_test.go
rename to pkg/protocols/offlinehttp/find_test.go
index 0bcb7ea2..83249bc9 100644
--- a/v2/pkg/protocols/offlinehttp/find_test.go
+++ b/pkg/protocols/offlinehttp/find_test.go
@@ -7,10 +7,10 @@ import (
"github.com/stretchr/testify/require"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
permissionutil "github.com/projectdiscovery/utils/permission"
)
diff --git a/v2/pkg/protocols/offlinehttp/offlinehttp.go b/pkg/protocols/offlinehttp/offlinehttp.go
similarity index 95%
rename from v2/pkg/protocols/offlinehttp/offlinehttp.go
rename to pkg/protocols/offlinehttp/offlinehttp.go
index ccfc84db..5f28bd15 100644
--- a/v2/pkg/protocols/offlinehttp/offlinehttp.go
+++ b/pkg/protocols/offlinehttp/offlinehttp.go
@@ -3,8 +3,8 @@ package offlinehttp
import (
"github.com/pkg/errors"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
)
// Request is a offline http response processing request
diff --git a/v2/pkg/protocols/offlinehttp/operators.go b/pkg/protocols/offlinehttp/operators.go
similarity index 90%
rename from v2/pkg/protocols/offlinehttp/operators.go
rename to pkg/protocols/offlinehttp/operators.go
index bccc8d19..76d9fb77 100644
--- a/v2/pkg/protocols/offlinehttp/operators.go
+++ b/pkg/protocols/offlinehttp/operators.go
@@ -5,15 +5,15 @@ import (
"strings"
"time"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/extractors"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/matchers"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/helpers/responsehighlighter"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/utils"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/extractors"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/matchers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/helpers/responsehighlighter"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/utils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
)
// Match matches a generic data response again a given matcher
diff --git a/v2/pkg/protocols/offlinehttp/operators_test.go b/pkg/protocols/offlinehttp/operators_test.go
similarity index 96%
rename from v2/pkg/protocols/offlinehttp/operators_test.go
rename to pkg/protocols/offlinehttp/operators_test.go
index 7ee5172f..21bb8693 100644
--- a/v2/pkg/protocols/offlinehttp/operators_test.go
+++ b/pkg/protocols/offlinehttp/operators_test.go
@@ -7,13 +7,13 @@ import (
"github.com/stretchr/testify/require"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/extractors"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/matchers"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/extractors"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/matchers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
)
func TestResponseToDSLMap(t *testing.T) {
diff --git a/v2/pkg/protocols/offlinehttp/read_response.go b/pkg/protocols/offlinehttp/read_response.go
similarity index 100%
rename from v2/pkg/protocols/offlinehttp/read_response.go
rename to pkg/protocols/offlinehttp/read_response.go
diff --git a/v2/pkg/protocols/offlinehttp/read_response_test.go b/pkg/protocols/offlinehttp/read_response_test.go
similarity index 100%
rename from v2/pkg/protocols/offlinehttp/read_response_test.go
rename to pkg/protocols/offlinehttp/read_response_test.go
diff --git a/v2/pkg/protocols/offlinehttp/request.go b/pkg/protocols/offlinehttp/request.go
similarity index 87%
rename from v2/pkg/protocols/offlinehttp/request.go
rename to pkg/protocols/offlinehttp/request.go
index a942288a..8d755625 100644
--- a/v2/pkg/protocols/offlinehttp/request.go
+++ b/pkg/protocols/offlinehttp/request.go
@@ -9,14 +9,14 @@ import (
"github.com/remeh/sizedwaitgroup"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/helpers/eventcreator"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/tostring"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/utils"
- templateTypes "github.com/projectdiscovery/nuclei/v2/pkg/templates/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/helpers/eventcreator"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/tostring"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/utils"
+ templateTypes "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
)
var _ protocols.Request = &Request{}
diff --git a/v2/pkg/protocols/protocols.go b/pkg/protocols/protocols.go
similarity index 90%
rename from v2/pkg/protocols/protocols.go
rename to pkg/protocols/protocols.go
index 226f0937..6acdbddf 100644
--- a/v2/pkg/protocols/protocols.go
+++ b/pkg/protocols/protocols.go
@@ -9,25 +9,25 @@ import (
"github.com/logrusorgru/aurora"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog"
- "github.com/projectdiscovery/nuclei/v2/pkg/input"
- "github.com/projectdiscovery/nuclei/v2/pkg/js/compiler"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/extractors"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/matchers"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/progress"
- "github.com/projectdiscovery/nuclei/v2/pkg/projectfile"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/hosterrorscache"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/interactsh"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/utils/excludematchers"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/variables"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/headless/engine"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting"
- templateTypes "github.com/projectdiscovery/nuclei/v2/pkg/templates/types"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog"
+ "github.com/projectdiscovery/nuclei/v3/pkg/input"
+ "github.com/projectdiscovery/nuclei/v3/pkg/js/compiler"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/extractors"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/matchers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/progress"
+ "github.com/projectdiscovery/nuclei/v3/pkg/projectfile"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/hosterrorscache"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/interactsh"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/utils/excludematchers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/variables"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/headless/engine"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting"
+ templateTypes "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
)
// Executer is an interface implemented any protocol based request executer.
diff --git a/v2/pkg/protocols/ssl/ssl.go b/pkg/protocols/ssl/ssl.go
similarity index 93%
rename from v2/pkg/protocols/ssl/ssl.go
rename to pkg/protocols/ssl/ssl.go
index a32e8491..5fc16f07 100644
--- a/v2/pkg/protocols/ssl/ssl.go
+++ b/pkg/protocols/ssl/ssl.go
@@ -11,22 +11,22 @@ import (
"github.com/projectdiscovery/fastdialer/fastdialer"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/extractors"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/matchers"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/expressions"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/helpers/eventcreator"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/helpers/responsehighlighter"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/utils/vardump"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/network/networkclientpool"
- protocolutils "github.com/projectdiscovery/nuclei/v2/pkg/protocols/utils"
- templateTypes "github.com/projectdiscovery/nuclei/v2/pkg/templates/types"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/extractors"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/matchers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/expressions"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/helpers/eventcreator"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/helpers/responsehighlighter"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/utils/vardump"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/network/networkclientpool"
+ protocolutils "github.com/projectdiscovery/nuclei/v3/pkg/protocols/utils"
+ templateTypes "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
"github.com/projectdiscovery/tlsx/pkg/tlsx"
"github.com/projectdiscovery/tlsx/pkg/tlsx/clients"
"github.com/projectdiscovery/tlsx/pkg/tlsx/openssl"
diff --git a/v2/pkg/protocols/ssl/ssl_test.go b/pkg/protocols/ssl/ssl_test.go
similarity index 78%
rename from v2/pkg/protocols/ssl/ssl_test.go
rename to pkg/protocols/ssl/ssl_test.go
index 4ba87b13..009cf98d 100644
--- a/v2/pkg/protocols/ssl/ssl_test.go
+++ b/pkg/protocols/ssl/ssl_test.go
@@ -5,11 +5,11 @@ import (
"github.com/stretchr/testify/require"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
)
func TestSSLProtocol(t *testing.T) {
diff --git a/v2/pkg/protocols/utils/http/requtils.go b/pkg/protocols/utils/http/requtils.go
similarity index 93%
rename from v2/pkg/protocols/utils/http/requtils.go
rename to pkg/protocols/utils/http/requtils.go
index 6c69445d..79e980bb 100644
--- a/v2/pkg/protocols/utils/http/requtils.go
+++ b/pkg/protocols/utils/http/requtils.go
@@ -4,8 +4,8 @@ import (
"regexp"
"strings"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
- "github.com/projectdiscovery/nuclei/v2/pkg/types/scanstrategy"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types/scanstrategy"
"github.com/projectdiscovery/retryablehttp-go"
urlutil "github.com/projectdiscovery/utils/url"
)
diff --git a/v2/pkg/protocols/utils/http/requtils_test.go b/pkg/protocols/utils/http/requtils_test.go
similarity index 100%
rename from v2/pkg/protocols/utils/http/requtils_test.go
rename to pkg/protocols/utils/http/requtils_test.go
diff --git a/v2/pkg/protocols/utils/utils.go b/pkg/protocols/utils/utils.go
similarity index 97%
rename from v2/pkg/protocols/utils/utils.go
rename to pkg/protocols/utils/utils.go
index 505a0a3b..9f65b7b6 100644
--- a/v2/pkg/protocols/utils/utils.go
+++ b/pkg/protocols/utils/utils.go
@@ -7,7 +7,7 @@ import (
"os"
"strings"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
)
// CleanStructFieldJSONTag cleans struct json tag field
diff --git a/v2/pkg/protocols/utils/utils_test.go b/pkg/protocols/utils/utils_test.go
similarity index 100%
rename from v2/pkg/protocols/utils/utils_test.go
rename to pkg/protocols/utils/utils_test.go
diff --git a/v2/pkg/protocols/utils/variables.go b/pkg/protocols/utils/variables.go
similarity index 97%
rename from v2/pkg/protocols/utils/variables.go
rename to pkg/protocols/utils/variables.go
index 230f1f15..d1810d19 100644
--- a/v2/pkg/protocols/utils/variables.go
+++ b/pkg/protocols/utils/variables.go
@@ -6,8 +6,8 @@ import (
"strings"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
maputil "github.com/projectdiscovery/utils/maps"
urlutil "github.com/projectdiscovery/utils/url"
"github.com/weppos/publicsuffix-go/publicsuffix"
diff --git a/v2/pkg/protocols/utils/variables_test.go b/pkg/protocols/utils/variables_test.go
similarity index 98%
rename from v2/pkg/protocols/utils/variables_test.go
rename to pkg/protocols/utils/variables_test.go
index 5c4e25ef..c2430501 100644
--- a/v2/pkg/protocols/utils/variables_test.go
+++ b/pkg/protocols/utils/variables_test.go
@@ -4,7 +4,7 @@ import (
"reflect"
"testing"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
urlutil "github.com/projectdiscovery/utils/url"
"github.com/stretchr/testify/require"
)
diff --git a/v2/pkg/protocols/websocket/websocket.go b/pkg/protocols/websocket/websocket.go
similarity index 94%
rename from v2/pkg/protocols/websocket/websocket.go
rename to pkg/protocols/websocket/websocket.go
index ed2e7bf9..a6da3b5d 100644
--- a/v2/pkg/protocols/websocket/websocket.go
+++ b/pkg/protocols/websocket/websocket.go
@@ -18,21 +18,21 @@ import (
"github.com/projectdiscovery/fastdialer/fastdialer"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/extractors"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/matchers"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/expressions"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/helpers/eventcreator"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/helpers/responsehighlighter"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/utils/vardump"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/network/networkclientpool"
- protocolutils "github.com/projectdiscovery/nuclei/v2/pkg/protocols/utils"
- templateTypes "github.com/projectdiscovery/nuclei/v2/pkg/templates/types"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/extractors"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/matchers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/expressions"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/helpers/eventcreator"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/helpers/responsehighlighter"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/utils/vardump"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/network/networkclientpool"
+ protocolutils "github.com/projectdiscovery/nuclei/v3/pkg/protocols/utils"
+ templateTypes "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
urlutil "github.com/projectdiscovery/utils/url"
)
diff --git a/v2/pkg/protocols/whois/rdapclientpool/clientpool.go b/pkg/protocols/whois/rdapclientpool/clientpool.go
similarity index 95%
rename from v2/pkg/protocols/whois/rdapclientpool/clientpool.go
rename to pkg/protocols/whois/rdapclientpool/clientpool.go
index 6aa513fb..cb393a50 100644
--- a/v2/pkg/protocols/whois/rdapclientpool/clientpool.go
+++ b/pkg/protocols/whois/rdapclientpool/clientpool.go
@@ -2,7 +2,7 @@ package rdapclientpool
import (
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
"github.com/projectdiscovery/rdap"
)
diff --git a/v2/pkg/protocols/whois/whois.go b/pkg/protocols/whois/whois.go
similarity index 88%
rename from v2/pkg/protocols/whois/whois.go
rename to pkg/protocols/whois/whois.go
index 6ab686ff..df729b98 100644
--- a/v2/pkg/protocols/whois/whois.go
+++ b/pkg/protocols/whois/whois.go
@@ -10,22 +10,22 @@ import (
"github.com/projectdiscovery/rdap"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/extractors"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/matchers"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/helpers/eventcreator"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/helpers/responsehighlighter"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/replacer"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/utils/vardump"
- protocolutils "github.com/projectdiscovery/nuclei/v2/pkg/protocols/utils"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/whois/rdapclientpool"
- templateTypes "github.com/projectdiscovery/nuclei/v2/pkg/templates/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/extractors"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/matchers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/helpers/eventcreator"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/helpers/responsehighlighter"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/replacer"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/utils/vardump"
+ protocolutils "github.com/projectdiscovery/nuclei/v3/pkg/protocols/utils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/whois/rdapclientpool"
+ templateTypes "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
)
// Request is a request for the WHOIS protocol
diff --git a/v2/pkg/reporting/client.go b/pkg/reporting/client.go
similarity index 84%
rename from v2/pkg/reporting/client.go
rename to pkg/reporting/client.go
index 582e3065..06b480d7 100644
--- a/v2/pkg/reporting/client.go
+++ b/pkg/reporting/client.go
@@ -1,7 +1,7 @@
package reporting
import (
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
)
// Client is a client for nuclei issue tracking module
diff --git a/v2/pkg/reporting/dedupe/dedupe.go b/pkg/reporting/dedupe/dedupe.go
similarity index 96%
rename from v2/pkg/reporting/dedupe/dedupe.go
rename to pkg/reporting/dedupe/dedupe.go
index 85a9200a..ea7e5a0a 100644
--- a/v2/pkg/reporting/dedupe/dedupe.go
+++ b/pkg/reporting/dedupe/dedupe.go
@@ -12,8 +12,8 @@ import (
"github.com/syndtr/goleveldb/leveldb"
"github.com/syndtr/goleveldb/leveldb/errors"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
)
// Storage is a duplicate detecting storage for nuclei scan events.
diff --git a/v2/pkg/reporting/dedupe/dedupe_test.go b/pkg/reporting/dedupe/dedupe_test.go
similarity index 93%
rename from v2/pkg/reporting/dedupe/dedupe_test.go
rename to pkg/reporting/dedupe/dedupe_test.go
index db9ef670..0a6d84b0 100644
--- a/v2/pkg/reporting/dedupe/dedupe_test.go
+++ b/pkg/reporting/dedupe/dedupe_test.go
@@ -6,7 +6,7 @@ import (
"github.com/stretchr/testify/require"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
)
func TestDedupeDuplicates(t *testing.T) {
diff --git a/v2/pkg/reporting/exporters/es/elasticsearch.go b/pkg/reporting/exporters/es/elasticsearch.go
similarity index 97%
rename from v2/pkg/reporting/exporters/es/elasticsearch.go
rename to pkg/reporting/exporters/es/elasticsearch.go
index 7b5d43a7..7738a0ad 100644
--- a/v2/pkg/reporting/exporters/es/elasticsearch.go
+++ b/pkg/reporting/exporters/es/elasticsearch.go
@@ -13,8 +13,8 @@ import (
"github.com/pkg/errors"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
"github.com/projectdiscovery/retryablehttp-go"
)
diff --git a/v2/pkg/reporting/exporters/jsonexporter/jsonexporter.go b/pkg/reporting/exporters/jsonexporter/jsonexporter.go
similarity index 97%
rename from v2/pkg/reporting/exporters/jsonexporter/jsonexporter.go
rename to pkg/reporting/exporters/jsonexporter/jsonexporter.go
index e2e16b28..6881fc4b 100644
--- a/v2/pkg/reporting/exporters/jsonexporter/jsonexporter.go
+++ b/pkg/reporting/exporters/jsonexporter/jsonexporter.go
@@ -3,7 +3,7 @@ package jsonexporter
import (
"encoding/json"
"github.com/pkg/errors"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
"os"
"sync"
)
diff --git a/v2/pkg/reporting/exporters/jsonl/jsonl.go b/pkg/reporting/exporters/jsonl/jsonl.go
similarity index 98%
rename from v2/pkg/reporting/exporters/jsonl/jsonl.go
rename to pkg/reporting/exporters/jsonl/jsonl.go
index 07e5b5f8..5a559503 100644
--- a/v2/pkg/reporting/exporters/jsonl/jsonl.go
+++ b/pkg/reporting/exporters/jsonl/jsonl.go
@@ -3,7 +3,7 @@ package jsonl
import (
"encoding/json"
"github.com/pkg/errors"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
"os"
"sync"
)
diff --git a/v2/pkg/reporting/exporters/markdown/markdown.go b/pkg/reporting/exporters/markdown/markdown.go
similarity index 96%
rename from v2/pkg/reporting/exporters/markdown/markdown.go
rename to pkg/reporting/exporters/markdown/markdown.go
index e3458f76..462978b2 100644
--- a/v2/pkg/reporting/exporters/markdown/markdown.go
+++ b/pkg/reporting/exporters/markdown/markdown.go
@@ -8,9 +8,9 @@ import (
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/exporters/markdown/util"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/format"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/exporters/markdown/util"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/format"
fileutil "github.com/projectdiscovery/utils/file"
stringsutil "github.com/projectdiscovery/utils/strings"
)
diff --git a/v2/pkg/reporting/exporters/markdown/util/markdown_formatter.go b/pkg/reporting/exporters/markdown/util/markdown_formatter.go
similarity index 100%
rename from v2/pkg/reporting/exporters/markdown/util/markdown_formatter.go
rename to pkg/reporting/exporters/markdown/util/markdown_formatter.go
diff --git a/v2/pkg/reporting/exporters/markdown/util/markdown_utils.go b/pkg/reporting/exporters/markdown/util/markdown_utils.go
similarity index 100%
rename from v2/pkg/reporting/exporters/markdown/util/markdown_utils.go
rename to pkg/reporting/exporters/markdown/util/markdown_utils.go
diff --git a/v2/pkg/reporting/exporters/markdown/util/markdown_utils_test.go b/pkg/reporting/exporters/markdown/util/markdown_utils_test.go
similarity index 100%
rename from v2/pkg/reporting/exporters/markdown/util/markdown_utils_test.go
rename to pkg/reporting/exporters/markdown/util/markdown_utils_test.go
diff --git a/v2/pkg/reporting/exporters/sarif/sarif.go b/pkg/reporting/exporters/sarif/sarif.go
similarity index 97%
rename from v2/pkg/reporting/exporters/sarif/sarif.go
rename to pkg/reporting/exporters/sarif/sarif.go
index 64e97f8c..d2fe63bd 100644
--- a/v2/pkg/reporting/exporters/sarif/sarif.go
+++ b/pkg/reporting/exporters/sarif/sarif.go
@@ -8,8 +8,8 @@ import (
"sync"
"github.com/pkg/errors"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
"github.com/projectdiscovery/sarif"
)
diff --git a/v2/pkg/reporting/exporters/splunk/splunkhec.go b/pkg/reporting/exporters/splunk/splunkhec.go
similarity index 96%
rename from v2/pkg/reporting/exporters/splunk/splunkhec.go
rename to pkg/reporting/exporters/splunk/splunkhec.go
index a8902800..07ddd7f6 100644
--- a/v2/pkg/reporting/exporters/splunk/splunkhec.go
+++ b/pkg/reporting/exporters/splunk/splunkhec.go
@@ -12,8 +12,8 @@ import (
"github.com/corpix/uarand"
"github.com/pkg/errors"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
"github.com/projectdiscovery/retryablehttp-go"
)
diff --git a/v2/pkg/reporting/format/format.go b/pkg/reporting/format/format.go
similarity index 100%
rename from v2/pkg/reporting/format/format.go
rename to pkg/reporting/format/format.go
diff --git a/v2/pkg/reporting/format/format_utils.go b/pkg/reporting/format/format_utils.go
similarity index 95%
rename from v2/pkg/reporting/format/format_utils.go
rename to pkg/reporting/format/format_utils.go
index c9af7b11..286ebcc3 100644
--- a/v2/pkg/reporting/format/format_utils.go
+++ b/pkg/reporting/format/format_utils.go
@@ -6,12 +6,12 @@ import (
"strconv"
"strings"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/exporters/markdown/util"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
- "github.com/projectdiscovery/nuclei/v2/pkg/utils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/exporters/markdown/util"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/utils"
)
// Summary returns a formatted built one line summary of the event
diff --git a/v2/pkg/reporting/format/format_utils_test.go b/pkg/reporting/format/format_utils_test.go
similarity index 86%
rename from v2/pkg/reporting/format/format_utils_test.go
rename to pkg/reporting/format/format_utils_test.go
index 97f258aa..e9e596cb 100644
--- a/v2/pkg/reporting/format/format_utils_test.go
+++ b/pkg/reporting/format/format_utils_test.go
@@ -6,10 +6,10 @@ import (
"github.com/stretchr/testify/assert"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/stringslice"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/exporters/markdown/util"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/stringslice"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/exporters/markdown/util"
)
func TestToMarkdownTableString(t *testing.T) {
diff --git a/v2/pkg/reporting/options.go b/pkg/reporting/options.go
similarity index 73%
rename from v2/pkg/reporting/options.go
rename to pkg/reporting/options.go
index 579df9de..110db38f 100644
--- a/v2/pkg/reporting/options.go
+++ b/pkg/reporting/options.go
@@ -1,15 +1,15 @@
package reporting
import (
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/exporters/es"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/exporters/jsonexporter"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/exporters/jsonl"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/exporters/markdown"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/exporters/sarif"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/exporters/splunk"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/trackers/github"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/trackers/gitlab"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/trackers/jira"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/exporters/es"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/exporters/jsonexporter"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/exporters/jsonl"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/exporters/markdown"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/exporters/sarif"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/exporters/splunk"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/trackers/github"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/trackers/gitlab"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/trackers/jira"
"github.com/projectdiscovery/retryablehttp-go"
)
diff --git a/v2/pkg/reporting/reporting.go b/pkg/reporting/reporting.go
similarity index 89%
rename from v2/pkg/reporting/reporting.go
rename to pkg/reporting/reporting.go
index 7ecd4e42..cd6f5cc0 100644
--- a/v2/pkg/reporting/reporting.go
+++ b/pkg/reporting/reporting.go
@@ -3,26 +3,26 @@ package reporting
import (
"os"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- json_exporter "github.com/projectdiscovery/nuclei/v2/pkg/reporting/exporters/jsonexporter"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/exporters/jsonl"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ json_exporter "github.com/projectdiscovery/nuclei/v3/pkg/reporting/exporters/jsonexporter"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/exporters/jsonl"
"go.uber.org/multierr"
"gopkg.in/yaml.v2"
"errors"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/stringslice"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/dedupe"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/exporters/es"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/exporters/markdown"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/exporters/sarif"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/exporters/splunk"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/trackers/github"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/trackers/gitlab"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/trackers/jira"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/stringslice"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/dedupe"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/exporters/es"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/exporters/markdown"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/exporters/sarif"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/exporters/splunk"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/trackers/github"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/trackers/gitlab"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/trackers/jira"
errorutil "github.com/projectdiscovery/utils/errors"
fileutil "github.com/projectdiscovery/utils/file"
sliceutil "github.com/projectdiscovery/utils/slice"
diff --git a/v2/pkg/reporting/trackers/github/github.go b/pkg/reporting/trackers/github/github.go
similarity index 95%
rename from v2/pkg/reporting/trackers/github/github.go
rename to pkg/reporting/trackers/github/github.go
index c838d561..dab374f5 100644
--- a/v2/pkg/reporting/trackers/github/github.go
+++ b/pkg/reporting/trackers/github/github.go
@@ -5,10 +5,10 @@ import (
"fmt"
"github.com/google/go-github/github"
"github.com/pkg/errors"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/exporters/markdown/util"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/format"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/exporters/markdown/util"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/format"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
"github.com/projectdiscovery/retryablehttp-go"
"golang.org/x/oauth2"
"io"
diff --git a/v2/pkg/reporting/trackers/gitlab/gitlab.go b/pkg/reporting/trackers/gitlab/gitlab.go
similarity index 95%
rename from v2/pkg/reporting/trackers/gitlab/gitlab.go
rename to pkg/reporting/trackers/gitlab/gitlab.go
index 660c9b8e..630ffc74 100644
--- a/v2/pkg/reporting/trackers/gitlab/gitlab.go
+++ b/pkg/reporting/trackers/gitlab/gitlab.go
@@ -5,9 +5,9 @@ import (
"github.com/xanzy/go-gitlab"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/exporters/markdown/util"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/format"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/exporters/markdown/util"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/format"
"github.com/projectdiscovery/retryablehttp-go"
)
diff --git a/v2/pkg/reporting/trackers/jira/jira.go b/pkg/reporting/trackers/jira/jira.go
similarity index 97%
rename from v2/pkg/reporting/trackers/jira/jira.go
rename to pkg/reporting/trackers/jira/jira.go
index af8853c7..fa09124b 100644
--- a/v2/pkg/reporting/trackers/jira/jira.go
+++ b/pkg/reporting/trackers/jira/jira.go
@@ -9,9 +9,9 @@ import (
"github.com/trivago/tgo/tcontainer"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/exporters/markdown/util"
- "github.com/projectdiscovery/nuclei/v2/pkg/reporting/format"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/exporters/markdown/util"
+ "github.com/projectdiscovery/nuclei/v3/pkg/reporting/format"
"github.com/projectdiscovery/retryablehttp-go"
)
diff --git a/v2/pkg/reporting/trackers/jira/jira_test.go b/pkg/reporting/trackers/jira/jira_test.go
similarity index 100%
rename from v2/pkg/reporting/trackers/jira/jira_test.go
rename to pkg/reporting/trackers/jira/jira_test.go
diff --git a/v2/pkg/templates/cache/cache.go b/pkg/templates/cache/cache.go
similarity index 100%
rename from v2/pkg/templates/cache/cache.go
rename to pkg/templates/cache/cache.go
diff --git a/v2/pkg/templates/cache/cache_test.go b/pkg/templates/cache/cache_test.go
similarity index 100%
rename from v2/pkg/templates/cache/cache_test.go
rename to pkg/templates/cache/cache_test.go
diff --git a/v2/pkg/templates/cluster.go b/pkg/templates/cluster.go
similarity index 96%
rename from v2/pkg/templates/cluster.go
rename to pkg/templates/cluster.go
index 0e80bf8d..f98f1cd2 100644
--- a/v2/pkg/templates/cluster.go
+++ b/pkg/templates/cluster.go
@@ -6,13 +6,13 @@ import (
"strings"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/helpers/writer"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/helpers/writer"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
cryptoutil "github.com/projectdiscovery/utils/crypto"
mapsutil "github.com/projectdiscovery/utils/maps"
)
diff --git a/v2/pkg/templates/cluster_test.go b/pkg/templates/cluster_test.go
similarity index 92%
rename from v2/pkg/templates/cluster_test.go
rename to pkg/templates/cluster_test.go
index bca59e83..bfd10fd4 100644
--- a/v2/pkg/templates/cluster_test.go
+++ b/pkg/templates/cluster_test.go
@@ -3,8 +3,8 @@ package templates
import (
"testing"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/dns"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/http"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/dns"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/http"
"github.com/stretchr/testify/require"
)
diff --git a/v2/pkg/templates/compile.go b/pkg/templates/compile.go
similarity index 95%
rename from v2/pkg/templates/compile.go
rename to pkg/templates/compile.go
index 3fd4aa41..3c6a9694 100644
--- a/v2/pkg/templates/compile.go
+++ b/pkg/templates/compile.go
@@ -13,15 +13,15 @@ import (
"gopkg.in/yaml.v2"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- "github.com/projectdiscovery/nuclei/v2/pkg/js/compiler"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/offlinehttp"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates/cache"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates/signer"
- "github.com/projectdiscovery/nuclei/v2/pkg/tmplexec"
- "github.com/projectdiscovery/nuclei/v2/pkg/utils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/js/compiler"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/offlinehttp"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates/cache"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates/signer"
+ "github.com/projectdiscovery/nuclei/v3/pkg/tmplexec"
+ "github.com/projectdiscovery/nuclei/v3/pkg/utils"
"github.com/projectdiscovery/retryablehttp-go"
errorutil "github.com/projectdiscovery/utils/errors"
stringsutil "github.com/projectdiscovery/utils/strings"
diff --git a/v2/pkg/templates/compile_test.go b/pkg/templates/compile_test.go
similarity index 87%
rename from v2/pkg/templates/compile_test.go
rename to pkg/templates/compile_test.go
index ec2055ac..05e5601e 100644
--- a/v2/pkg/templates/compile_test.go
+++ b/pkg/templates/compile_test.go
@@ -11,22 +11,22 @@ import (
"time"
"github.com/julienschmidt/httprouter"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/disk"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/stringslice"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/matchers"
- "github.com/projectdiscovery/nuclei/v2/pkg/parsers"
- "github.com/projectdiscovery/nuclei/v2/pkg/progress"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/variables"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/http"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
- "github.com/projectdiscovery/nuclei/v2/pkg/workflows"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/disk"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/stringslice"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/matchers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/parsers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/progress"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/variables"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/http"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/workflows"
"github.com/projectdiscovery/ratelimit"
"github.com/stretchr/testify/require"
)
diff --git a/v2/pkg/templates/doc.go b/pkg/templates/doc.go
similarity index 100%
rename from v2/pkg/templates/doc.go
rename to pkg/templates/doc.go
diff --git a/v2/pkg/templates/extensions/extensions.go b/pkg/templates/extensions/extensions.go
similarity index 100%
rename from v2/pkg/templates/extensions/extensions.go
rename to pkg/templates/extensions/extensions.go
diff --git a/v2/pkg/templates/log.go b/pkg/templates/log.go
similarity index 94%
rename from v2/pkg/templates/log.go
rename to pkg/templates/log.go
index d705a86e..a8f2735a 100644
--- a/v2/pkg/templates/log.go
+++ b/pkg/templates/log.go
@@ -6,8 +6,8 @@ import (
"github.com/logrusorgru/aurora"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
mapsutil "github.com/projectdiscovery/utils/maps"
)
diff --git a/v2/pkg/templates/log_test.go b/pkg/templates/log_test.go
similarity index 100%
rename from v2/pkg/templates/log_test.go
rename to pkg/templates/log_test.go
diff --git a/v2/pkg/templates/preprocessors.go b/pkg/templates/preprocessors.go
similarity index 100%
rename from v2/pkg/templates/preprocessors.go
rename to pkg/templates/preprocessors.go
diff --git a/pkg/templates/signer/.nuclei-config/nuclei/.templates-config.json b/pkg/templates/signer/.nuclei-config/nuclei/.templates-config.json
new file mode 100644
index 00000000..54f80691
--- /dev/null
+++ b/pkg/templates/signer/.nuclei-config/nuclei/.templates-config.json
@@ -0,0 +1 @@
+{"nuclei-templates-directory":"/Users/tarun/nuclei-templates","custom-s3-templates-directory":"/Users/tarun/nuclei-templates/s3","custom-github-templates-directory":"/Users/tarun/nuclei-templates/github","custom-gitlab-templates-directory":"/Users/tarun/nuclei-templates/gitlab","custom-azure-templates-directory":"/Users/tarun/nuclei-templates/azure","nuclei-latest-version":"","nuclei-templates-latest-version":""}
\ No newline at end of file
diff --git a/v2/pkg/templates/signer/default.go b/pkg/templates/signer/default.go
similarity index 88%
rename from v2/pkg/templates/signer/default.go
rename to pkg/templates/signer/default.go
index c05eda94..16900bd0 100644
--- a/v2/pkg/templates/signer/default.go
+++ b/pkg/templates/signer/default.go
@@ -2,8 +2,8 @@ package signer
import (
"github.com/projectdiscovery/gologger"
- v2 "github.com/projectdiscovery/nuclei/v2"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/keys"
errorutil "github.com/projectdiscovery/utils/errors"
)
@@ -12,7 +12,7 @@ var DefaultTemplateVerifiers []*TemplateSigner
func init() {
h := &KeyHandler{
- UserCert: v2.NucleiCert,
+ UserCert: keys.NucleiCert,
}
if err := h.ParseUserCert(); err != nil {
gologger.Error().Msgf("Could not parse pd nuclei certificate: %s\n", err)
diff --git a/v2/pkg/templates/signer/handler.go b/pkg/templates/signer/handler.go
similarity index 100%
rename from v2/pkg/templates/signer/handler.go
rename to pkg/templates/signer/handler.go
diff --git a/v2/pkg/templates/signer/handler_test.go b/pkg/templates/signer/handler_test.go
similarity index 100%
rename from v2/pkg/templates/signer/handler_test.go
rename to pkg/templates/signer/handler_test.go
diff --git a/v2/pkg/templates/signer/tmpl_signer.go b/pkg/templates/signer/tmpl_signer.go
similarity index 99%
rename from v2/pkg/templates/signer/tmpl_signer.go
rename to pkg/templates/signer/tmpl_signer.go
index 0c1ae49e..c4378fd4 100644
--- a/v2/pkg/templates/signer/tmpl_signer.go
+++ b/pkg/templates/signer/tmpl_signer.go
@@ -16,7 +16,7 @@ import (
"sync"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
errorutil "github.com/projectdiscovery/utils/errors"
)
diff --git a/v2/pkg/templates/template_sign.go b/pkg/templates/template_sign.go
similarity index 83%
rename from v2/pkg/templates/template_sign.go
rename to pkg/templates/template_sign.go
index 58e60fdb..24ae41c5 100644
--- a/v2/pkg/templates/template_sign.go
+++ b/pkg/templates/template_sign.go
@@ -7,13 +7,13 @@ import (
"strings"
"sync"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/disk"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolinit"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates/extensions"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates/signer"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/disk"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolinit"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates/extensions"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates/signer"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
errorutil "github.com/projectdiscovery/utils/errors"
)
@@ -31,6 +31,12 @@ var (
ErrNotATemplate = errorutil.NewWithTag("signer", "given filePath is not a template")
)
+// UseOptionsForSigner sets the options to use for signing templates
+// instead of default options
+func UseOptionsForSigner(opts *types.Options) {
+ defaultOpts = opts
+}
+
// New Signer/Verification logic requires it to load content of file references
// and this is done respecting sandbox restrictions to avoid any security issues
// AllowLocalFileAccess is a function that allows local file access by disabling sandbox restrictions
diff --git a/v2/pkg/templates/templates.go b/pkg/templates/templates.go
similarity index 95%
rename from v2/pkg/templates/templates.go
rename to pkg/templates/templates.go
index b1b11967..c98f220e 100644
--- a/v2/pkg/templates/templates.go
+++ b/pkg/templates/templates.go
@@ -9,21 +9,21 @@ import (
"strings"
validate "github.com/go-playground/validator/v10"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/code"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/variables"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/dns"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/file"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/headless"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/http"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/javascript"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/network"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/ssl"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/websocket"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/whois"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates/types"
- "github.com/projectdiscovery/nuclei/v2/pkg/workflows"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/code"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/variables"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/dns"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/file"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/headless"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/http"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/javascript"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/network"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/ssl"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/websocket"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/whois"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/workflows"
errorutil "github.com/projectdiscovery/utils/errors"
fileutil "github.com/projectdiscovery/utils/file"
"go.uber.org/multierr"
diff --git a/v2/pkg/templates/templates_doc.go b/pkg/templates/templates_doc.go
similarity index 100%
rename from v2/pkg/templates/templates_doc.go
rename to pkg/templates/templates_doc.go
diff --git a/v2/pkg/templates/templates_doc_examples.go b/pkg/templates/templates_doc_examples.go
similarity index 80%
rename from v2/pkg/templates/templates_doc_examples.go
rename to pkg/templates/templates_doc_examples.go
index c2650d09..c06d88ea 100644
--- a/v2/pkg/templates/templates_doc_examples.go
+++ b/pkg/templates/templates_doc_examples.go
@@ -3,16 +3,16 @@
package templates
import (
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/stringslice"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/extractors"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/matchers"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/dns"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/file"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/http"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/network"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/stringslice"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/extractors"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/matchers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/dns"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/file"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/http"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/network"
)
var (
diff --git a/v2/pkg/templates/templates_test.go b/pkg/templates/templates_test.go
similarity index 100%
rename from v2/pkg/templates/templates_test.go
rename to pkg/templates/templates_test.go
diff --git a/v2/pkg/templates/tests/json-template.json b/pkg/templates/tests/json-template.json
similarity index 100%
rename from v2/pkg/templates/tests/json-template.json
rename to pkg/templates/tests/json-template.json
diff --git a/v2/pkg/templates/tests/match-1.yaml b/pkg/templates/tests/match-1.yaml
similarity index 100%
rename from v2/pkg/templates/tests/match-1.yaml
rename to pkg/templates/tests/match-1.yaml
diff --git a/v2/pkg/templates/tests/multiproto.json b/pkg/templates/tests/multiproto.json
similarity index 100%
rename from v2/pkg/templates/tests/multiproto.json
rename to pkg/templates/tests/multiproto.json
diff --git a/v2/pkg/templates/tests/multiproto.yaml b/pkg/templates/tests/multiproto.yaml
similarity index 100%
rename from v2/pkg/templates/tests/multiproto.yaml
rename to pkg/templates/tests/multiproto.yaml
diff --git a/v2/pkg/templates/tests/no-author.yaml b/pkg/templates/tests/no-author.yaml
similarity index 100%
rename from v2/pkg/templates/tests/no-author.yaml
rename to pkg/templates/tests/no-author.yaml
diff --git a/v2/pkg/templates/tests/no-req.yaml b/pkg/templates/tests/no-req.yaml
similarity index 100%
rename from v2/pkg/templates/tests/no-req.yaml
rename to pkg/templates/tests/no-req.yaml
diff --git a/v2/pkg/templates/tests/workflow.yaml b/pkg/templates/tests/workflow.yaml
similarity index 100%
rename from v2/pkg/templates/tests/workflow.yaml
rename to pkg/templates/tests/workflow.yaml
diff --git a/v2/pkg/templates/types/types.go b/pkg/templates/types/types.go
similarity index 98%
rename from v2/pkg/templates/types/types.go
rename to pkg/templates/types/types.go
index b51fd2bd..6d26530d 100644
--- a/v2/pkg/templates/types/types.go
+++ b/pkg/templates/types/types.go
@@ -8,7 +8,7 @@ import (
"github.com/alecthomas/jsonschema"
"github.com/pkg/errors"
"github.com/projectdiscovery/goflags"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/stringslice"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/stringslice"
)
// ProtocolType is the type of the request protocol specified
diff --git a/v2/pkg/templates/workflows.go b/pkg/templates/workflows.go
similarity index 95%
rename from v2/pkg/templates/workflows.go
rename to pkg/templates/workflows.go
index 36326632..94e2c11c 100644
--- a/v2/pkg/templates/workflows.go
+++ b/pkg/templates/workflows.go
@@ -4,9 +4,9 @@ import (
"github.com/pkg/errors"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/workflows"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/workflows"
)
// compileWorkflow compiles the workflow for execution
diff --git a/v2/pkg/testutils/integration.go b/pkg/testutils/integration.go
similarity index 100%
rename from v2/pkg/testutils/integration.go
rename to pkg/testutils/integration.go
diff --git a/v2/pkg/testutils/testheadless/headless_local.go b/pkg/testutils/testheadless/headless_local.go
similarity index 100%
rename from v2/pkg/testutils/testheadless/headless_local.go
rename to pkg/testutils/testheadless/headless_local.go
diff --git a/v2/pkg/testutils/testheadless/headless_runtime.go b/pkg/testutils/testheadless/headless_runtime.go
similarity index 100%
rename from v2/pkg/testutils/testheadless/headless_runtime.go
rename to pkg/testutils/testheadless/headless_runtime.go
diff --git a/v2/pkg/testutils/testutils.go b/pkg/testutils/testutils.go
similarity index 91%
rename from v2/pkg/testutils/testutils.go
rename to pkg/testutils/testutils.go
index 43cff4df..12485c5b 100644
--- a/v2/pkg/testutils/testutils.go
+++ b/pkg/testutils/testutils.go
@@ -9,16 +9,16 @@ import (
"github.com/logrusorgru/aurora"
"github.com/projectdiscovery/gologger/levels"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/disk"
- "github.com/projectdiscovery/nuclei/v2/pkg/model"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/progress"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolinit"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
- "github.com/projectdiscovery/nuclei/v2/pkg/utils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/disk"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/progress"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolinit"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/utils"
)
// Init initializes the protocols and their configurations
diff --git a/v2/pkg/tmplexec/README.md b/pkg/tmplexec/README.md
similarity index 100%
rename from v2/pkg/tmplexec/README.md
rename to pkg/tmplexec/README.md
diff --git a/v2/pkg/tmplexec/doc.go b/pkg/tmplexec/doc.go
similarity index 100%
rename from v2/pkg/tmplexec/doc.go
rename to pkg/tmplexec/doc.go
diff --git a/v2/pkg/tmplexec/exec.go b/pkg/tmplexec/exec.go
similarity index 91%
rename from v2/pkg/tmplexec/exec.go
rename to pkg/tmplexec/exec.go
index 08234e1b..64290627 100644
--- a/v2/pkg/tmplexec/exec.go
+++ b/pkg/tmplexec/exec.go
@@ -7,14 +7,14 @@ import (
"sync/atomic"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators/common/dsl"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/helpers/writer"
- "github.com/projectdiscovery/nuclei/v2/pkg/tmplexec/flow"
- "github.com/projectdiscovery/nuclei/v2/pkg/tmplexec/generic"
- "github.com/projectdiscovery/nuclei/v2/pkg/tmplexec/multiproto"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators/common/dsl"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/helpers/writer"
+ "github.com/projectdiscovery/nuclei/v3/pkg/tmplexec/flow"
+ "github.com/projectdiscovery/nuclei/v3/pkg/tmplexec/generic"
+ "github.com/projectdiscovery/nuclei/v3/pkg/tmplexec/multiproto"
)
// TemplateExecutor is an executor for a template
diff --git a/v2/pkg/tmplexec/flow/README.md b/pkg/tmplexec/flow/README.md
similarity index 100%
rename from v2/pkg/tmplexec/flow/README.md
rename to pkg/tmplexec/flow/README.md
diff --git a/v2/pkg/tmplexec/flow/builtin/dedupe.go b/pkg/tmplexec/flow/builtin/dedupe.go
similarity index 96%
rename from v2/pkg/tmplexec/flow/builtin/dedupe.go
rename to pkg/tmplexec/flow/builtin/dedupe.go
index eae088db..729a7adf 100644
--- a/v2/pkg/tmplexec/flow/builtin/dedupe.go
+++ b/pkg/tmplexec/flow/builtin/dedupe.go
@@ -5,7 +5,7 @@ import (
"reflect"
"github.com/dop251/goja"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
)
// Dedupe is a javascript builtin for deduping values
diff --git a/v2/pkg/tmplexec/flow/doc.go b/pkg/tmplexec/flow/doc.go
similarity index 100%
rename from v2/pkg/tmplexec/flow/doc.go
rename to pkg/tmplexec/flow/doc.go
diff --git a/v2/pkg/tmplexec/flow/flow_executor.go b/pkg/tmplexec/flow/flow_executor.go
similarity index 95%
rename from v2/pkg/tmplexec/flow/flow_executor.go
rename to pkg/tmplexec/flow/flow_executor.go
index 8cff7d97..1bb5ca81 100644
--- a/v2/pkg/tmplexec/flow/flow_executor.go
+++ b/pkg/tmplexec/flow/flow_executor.go
@@ -10,14 +10,14 @@ import (
"github.com/dop251/goja"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
- templateTypes "github.com/projectdiscovery/nuclei/v2/pkg/templates/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/protocolstate"
+ templateTypes "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
errorutil "github.com/projectdiscovery/utils/errors"
fileutil "github.com/projectdiscovery/utils/file"
mapsutil "github.com/projectdiscovery/utils/maps"
diff --git a/v2/pkg/tmplexec/flow/flow_executor_test.go b/pkg/tmplexec/flow/flow_executor_test.go
similarity index 93%
rename from v2/pkg/tmplexec/flow/flow_executor_test.go
rename to pkg/tmplexec/flow/flow_executor_test.go
index 5680735b..f38514f9 100644
--- a/v2/pkg/tmplexec/flow/flow_executor_test.go
+++ b/pkg/tmplexec/flow/flow_executor_test.go
@@ -6,14 +6,14 @@ import (
"testing"
"time"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/disk"
- "github.com/projectdiscovery/nuclei/v2/pkg/parsers"
- "github.com/projectdiscovery/nuclei/v2/pkg/progress"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/disk"
+ "github.com/projectdiscovery/nuclei/v3/pkg/parsers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/progress"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
"github.com/projectdiscovery/ratelimit"
"github.com/stretchr/testify/require"
)
diff --git a/v2/pkg/tmplexec/flow/flow_internal.go b/pkg/tmplexec/flow/flow_internal.go
similarity index 96%
rename from v2/pkg/tmplexec/flow/flow_internal.go
rename to pkg/tmplexec/flow/flow_internal.go
index 3e9beb7b..a073422d 100644
--- a/v2/pkg/tmplexec/flow/flow_internal.go
+++ b/pkg/tmplexec/flow/flow_internal.go
@@ -7,11 +7,11 @@ import (
"github.com/dop251/goja"
"github.com/logrusorgru/aurora"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/utils/vardump"
- "github.com/projectdiscovery/nuclei/v2/pkg/tmplexec/flow/builtin"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/utils/vardump"
+ "github.com/projectdiscovery/nuclei/v3/pkg/tmplexec/flow/builtin"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
mapsutil "github.com/projectdiscovery/utils/maps"
)
diff --git a/v2/pkg/tmplexec/flow/options.go b/pkg/tmplexec/flow/options.go
similarity index 96%
rename from v2/pkg/tmplexec/flow/options.go
rename to pkg/tmplexec/flow/options.go
index 3d845a13..dab7cdc9 100644
--- a/v2/pkg/tmplexec/flow/options.go
+++ b/pkg/tmplexec/flow/options.go
@@ -3,7 +3,7 @@ package flow
import (
"strings"
- "github.com/projectdiscovery/nuclei/v2/pkg/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/types"
)
// ProtoOptions are options that can be passed to flow protocol callback
diff --git a/v2/pkg/tmplexec/flow/testcases/condition-flow-extractors.yaml b/pkg/tmplexec/flow/testcases/condition-flow-extractors.yaml
similarity index 100%
rename from v2/pkg/tmplexec/flow/testcases/condition-flow-extractors.yaml
rename to pkg/tmplexec/flow/testcases/condition-flow-extractors.yaml
diff --git a/v2/pkg/tmplexec/flow/testcases/condition-flow-no-operators.yaml b/pkg/tmplexec/flow/testcases/condition-flow-no-operators.yaml
similarity index 100%
rename from v2/pkg/tmplexec/flow/testcases/condition-flow-no-operators.yaml
rename to pkg/tmplexec/flow/testcases/condition-flow-no-operators.yaml
diff --git a/v2/pkg/tmplexec/flow/testcases/condition-flow.yaml b/pkg/tmplexec/flow/testcases/condition-flow.yaml
similarity index 100%
rename from v2/pkg/tmplexec/flow/testcases/condition-flow.yaml
rename to pkg/tmplexec/flow/testcases/condition-flow.yaml
diff --git a/v2/pkg/tmplexec/flow/testcases/nuclei-flow-dns-id.yaml b/pkg/tmplexec/flow/testcases/nuclei-flow-dns-id.yaml
similarity index 100%
rename from v2/pkg/tmplexec/flow/testcases/nuclei-flow-dns-id.yaml
rename to pkg/tmplexec/flow/testcases/nuclei-flow-dns-id.yaml
diff --git a/v2/pkg/tmplexec/flow/testcases/nuclei-flow-dns-prefix.yaml b/pkg/tmplexec/flow/testcases/nuclei-flow-dns-prefix.yaml
similarity index 100%
rename from v2/pkg/tmplexec/flow/testcases/nuclei-flow-dns-prefix.yaml
rename to pkg/tmplexec/flow/testcases/nuclei-flow-dns-prefix.yaml
diff --git a/v2/pkg/tmplexec/flow/testcases/nuclei-flow-dns.yaml b/pkg/tmplexec/flow/testcases/nuclei-flow-dns.yaml
similarity index 100%
rename from v2/pkg/tmplexec/flow/testcases/nuclei-flow-dns.yaml
rename to pkg/tmplexec/flow/testcases/nuclei-flow-dns.yaml
diff --git a/v2/pkg/tmplexec/flow/util.go b/pkg/tmplexec/flow/util.go
similarity index 87%
rename from v2/pkg/tmplexec/flow/util.go
rename to pkg/tmplexec/flow/util.go
index 6e1c343f..c7143c55 100644
--- a/v2/pkg/tmplexec/flow/util.go
+++ b/pkg/tmplexec/flow/util.go
@@ -1,6 +1,6 @@
package flow
-import "github.com/projectdiscovery/nuclei/v2/pkg/operators"
+import "github.com/projectdiscovery/nuclei/v3/pkg/operators"
// Checks if template has matchers
func hasMatchers(all []*operators.Operators) bool {
diff --git a/v2/pkg/tmplexec/generic/exec.go b/pkg/tmplexec/generic/exec.go
similarity index 94%
rename from v2/pkg/tmplexec/generic/exec.go
rename to pkg/tmplexec/generic/exec.go
index c4c0af75..022661ce 100644
--- a/v2/pkg/tmplexec/generic/exec.go
+++ b/pkg/tmplexec/generic/exec.go
@@ -5,9 +5,9 @@ import (
"sync/atomic"
"github.com/projectdiscovery/gologger"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
)
// generic engine as name suggests is a generic template
diff --git a/v2/pkg/tmplexec/interface.go b/pkg/tmplexec/interface.go
similarity index 76%
rename from v2/pkg/tmplexec/interface.go
rename to pkg/tmplexec/interface.go
index ec52f915..d813e5bd 100644
--- a/v2/pkg/tmplexec/interface.go
+++ b/pkg/tmplexec/interface.go
@@ -1,11 +1,11 @@
package tmplexec
import (
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/tmplexec/flow"
- "github.com/projectdiscovery/nuclei/v2/pkg/tmplexec/generic"
- "github.com/projectdiscovery/nuclei/v2/pkg/tmplexec/multiproto"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/tmplexec/flow"
+ "github.com/projectdiscovery/nuclei/v3/pkg/tmplexec/generic"
+ "github.com/projectdiscovery/nuclei/v3/pkg/tmplexec/multiproto"
)
var (
diff --git a/v2/pkg/tmplexec/multiproto/README.md b/pkg/tmplexec/multiproto/README.md
similarity index 100%
rename from v2/pkg/tmplexec/multiproto/README.md
rename to pkg/tmplexec/multiproto/README.md
diff --git a/v2/pkg/tmplexec/multiproto/doc.go b/pkg/tmplexec/multiproto/doc.go
similarity index 100%
rename from v2/pkg/tmplexec/multiproto/doc.go
rename to pkg/tmplexec/multiproto/doc.go
diff --git a/v2/pkg/tmplexec/multiproto/multi.go b/pkg/tmplexec/multiproto/multi.go
similarity index 93%
rename from v2/pkg/tmplexec/multiproto/multi.go
rename to pkg/tmplexec/multiproto/multi.go
index 9a4f37b6..e9db4002 100644
--- a/v2/pkg/tmplexec/multiproto/multi.go
+++ b/pkg/tmplexec/multiproto/multi.go
@@ -4,10 +4,10 @@ import (
"strconv"
"sync/atomic"
- "github.com/projectdiscovery/nuclei/v2/pkg/output"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/output"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/generators"
)
// Mutliprotocol is a template executer engine that executes multiple protocols
@@ -98,7 +98,7 @@ func (m *MultiProtocol) ExecuteWithResults(input *contextargs.Context, callback
}
// Review: how to handle events of multiple protocols in a single template
// currently the outer callback is only executed once (for the last protocol in queue)
- // due to workflow logic at https://github.com/projectdiscovery/nuclei/blob/main/v2/pkg/protocols/common/executer/executem.go#L150
+ // due to workflow logic at https://github.com/projectdiscovery/nuclei/blob/main/pkg/protocols/common/executer/executem.go#L150
// this causes addition of duplicated / unncessary variables with prefix template_id_all_variables
callback(finalProtoEvent)
diff --git a/v2/pkg/tmplexec/multiproto/multi_test.go b/pkg/tmplexec/multiproto/multi_test.go
similarity index 81%
rename from v2/pkg/tmplexec/multiproto/multi_test.go
rename to pkg/tmplexec/multiproto/multi_test.go
index 907e6ba7..c8ad42ca 100644
--- a/v2/pkg/tmplexec/multiproto/multi_test.go
+++ b/pkg/tmplexec/multiproto/multi_test.go
@@ -6,14 +6,14 @@ import (
"testing"
"time"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/disk"
- "github.com/projectdiscovery/nuclei/v2/pkg/parsers"
- "github.com/projectdiscovery/nuclei/v2/pkg/progress"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/contextargs"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates"
- "github.com/projectdiscovery/nuclei/v2/pkg/testutils"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/disk"
+ "github.com/projectdiscovery/nuclei/v3/pkg/parsers"
+ "github.com/projectdiscovery/nuclei/v3/pkg/progress"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols/common/contextargs"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates"
+ "github.com/projectdiscovery/nuclei/v3/pkg/testutils"
"github.com/projectdiscovery/ratelimit"
"github.com/stretchr/testify/require"
)
diff --git a/v2/pkg/tmplexec/multiproto/testcases/multiprotodynamic.yaml b/pkg/tmplexec/multiproto/testcases/multiprotodynamic.yaml
similarity index 100%
rename from v2/pkg/tmplexec/multiproto/testcases/multiprotodynamic.yaml
rename to pkg/tmplexec/multiproto/testcases/multiprotodynamic.yaml
diff --git a/v2/pkg/tmplexec/multiproto/testcases/multiprotowithprefix.yaml b/pkg/tmplexec/multiproto/testcases/multiprotowithprefix.yaml
similarity index 100%
rename from v2/pkg/tmplexec/multiproto/testcases/multiprotowithprefix.yaml
rename to pkg/tmplexec/multiproto/testcases/multiprotowithprefix.yaml
diff --git a/v2/pkg/types/interfaces.go b/pkg/types/interfaces.go
similarity index 98%
rename from v2/pkg/types/interfaces.go
rename to pkg/types/interfaces.go
index 8b3812bb..21293de5 100644
--- a/v2/pkg/types/interfaces.go
+++ b/pkg/types/interfaces.go
@@ -10,7 +10,7 @@ import (
"strings"
"github.com/asaskevich/govalidator"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
)
// JSONScalarToString converts an interface coming from json to string
diff --git a/v2/pkg/types/proxy.go b/pkg/types/proxy.go
similarity index 100%
rename from v2/pkg/types/proxy.go
rename to pkg/types/proxy.go
diff --git a/v2/pkg/types/resume.go b/pkg/types/resume.go
similarity index 97%
rename from v2/pkg/types/resume.go
rename to pkg/types/resume.go
index 9a19918f..946c8831 100644
--- a/v2/pkg/types/resume.go
+++ b/pkg/types/resume.go
@@ -6,7 +6,7 @@ import (
"path/filepath"
"sync"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
"github.com/rs/xid"
)
diff --git a/v2/pkg/types/scanstrategy/scan_strategy.go b/pkg/types/scanstrategy/scan_strategy.go
similarity index 100%
rename from v2/pkg/types/scanstrategy/scan_strategy.go
rename to pkg/types/scanstrategy/scan_strategy.go
diff --git a/v2/pkg/types/types.go b/pkg/types/types.go
similarity index 98%
rename from v2/pkg/types/types.go
rename to pkg/types/types.go
index 28e003f3..9e58f628 100644
--- a/v2/pkg/types/types.go
+++ b/pkg/types/types.go
@@ -8,10 +8,10 @@ import (
"time"
"github.com/projectdiscovery/goflags"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/severity"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/severity"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
errorutil "github.com/projectdiscovery/utils/errors"
fileutil "github.com/projectdiscovery/utils/file"
folderutil "github.com/projectdiscovery/utils/folder"
diff --git a/v2/pkg/utils/http_probe.go b/pkg/utils/http_probe.go
similarity index 100%
rename from v2/pkg/utils/http_probe.go
rename to pkg/utils/http_probe.go
diff --git a/v2/pkg/utils/index.go b/pkg/utils/index.go
similarity index 100%
rename from v2/pkg/utils/index.go
rename to pkg/utils/index.go
diff --git a/v2/pkg/utils/insertion_ordered_map.go b/pkg/utils/insertion_ordered_map.go
similarity index 100%
rename from v2/pkg/utils/insertion_ordered_map.go
rename to pkg/utils/insertion_ordered_map.go
diff --git a/v2/pkg/utils/insertion_ordered_map_test.go b/pkg/utils/insertion_ordered_map_test.go
similarity index 100%
rename from v2/pkg/utils/insertion_ordered_map_test.go
rename to pkg/utils/insertion_ordered_map_test.go
diff --git a/v2/pkg/utils/monitor/monitor.go b/pkg/utils/monitor/monitor.go
similarity index 100%
rename from v2/pkg/utils/monitor/monitor.go
rename to pkg/utils/monitor/monitor.go
diff --git a/v2/pkg/utils/monitor/monitor_test.go b/pkg/utils/monitor/monitor_test.go
similarity index 100%
rename from v2/pkg/utils/monitor/monitor_test.go
rename to pkg/utils/monitor/monitor_test.go
diff --git a/v2/pkg/utils/stats/doc.go b/pkg/utils/stats/doc.go
similarity index 100%
rename from v2/pkg/utils/stats/doc.go
rename to pkg/utils/stats/doc.go
diff --git a/v2/pkg/utils/stats/stats.go b/pkg/utils/stats/stats.go
similarity index 100%
rename from v2/pkg/utils/stats/stats.go
rename to pkg/utils/stats/stats.go
diff --git a/v2/pkg/utils/template_path.go b/pkg/utils/template_path.go
similarity index 92%
rename from v2/pkg/utils/template_path.go
rename to pkg/utils/template_path.go
index 813f3858..7bbbe14f 100644
--- a/v2/pkg/utils/template_path.go
+++ b/pkg/utils/template_path.go
@@ -3,7 +3,7 @@ package utils
import (
"strings"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
)
const (
diff --git a/v2/pkg/utils/utils.go b/pkg/utils/utils.go
similarity index 90%
rename from v2/pkg/utils/utils.go
rename to pkg/utils/utils.go
index 9b6e42c1..87303c9e 100644
--- a/v2/pkg/utils/utils.go
+++ b/pkg/utils/utils.go
@@ -6,9 +6,9 @@ import (
"net/url"
"strings"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog"
- "github.com/projectdiscovery/nuclei/v2/pkg/catalog/config"
- "github.com/projectdiscovery/nuclei/v2/pkg/utils/yaml"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog"
+ "github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
+ "github.com/projectdiscovery/nuclei/v3/pkg/utils/yaml"
"github.com/projectdiscovery/retryablehttp-go"
fileutil "github.com/projectdiscovery/utils/file"
)
diff --git a/v2/pkg/utils/utils_test.go b/pkg/utils/utils_test.go
similarity index 100%
rename from v2/pkg/utils/utils_test.go
rename to pkg/utils/utils_test.go
diff --git a/v2/pkg/utils/yaml/preprocess.go b/pkg/utils/yaml/preprocess.go
similarity index 97%
rename from v2/pkg/utils/yaml/preprocess.go
rename to pkg/utils/yaml/preprocess.go
index c918f07b..64e19892 100644
--- a/v2/pkg/utils/yaml/preprocess.go
+++ b/pkg/utils/yaml/preprocess.go
@@ -7,7 +7,7 @@ import (
"regexp"
"strings"
- "github.com/projectdiscovery/nuclei/v2/pkg/templates/extensions"
+ "github.com/projectdiscovery/nuclei/v3/pkg/templates/extensions"
fileutil "github.com/projectdiscovery/utils/file"
stringsutil "github.com/projectdiscovery/utils/strings"
)
diff --git a/v2/pkg/utils/yaml/yaml_decode_wrapper.go b/pkg/utils/yaml/yaml_decode_wrapper.go
similarity index 100%
rename from v2/pkg/utils/yaml/yaml_decode_wrapper.go
rename to pkg/utils/yaml/yaml_decode_wrapper.go
diff --git a/v2/pkg/workflows/doc.go b/pkg/workflows/doc.go
similarity index 100%
rename from v2/pkg/workflows/doc.go
rename to pkg/workflows/doc.go
diff --git a/v2/pkg/workflows/workflows.go b/pkg/workflows/workflows.go
similarity index 94%
rename from v2/pkg/workflows/workflows.go
rename to pkg/workflows/workflows.go
index 32d76f46..5f41329a 100644
--- a/v2/pkg/workflows/workflows.go
+++ b/pkg/workflows/workflows.go
@@ -3,10 +3,10 @@ package workflows
import (
"fmt"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/stringslice"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
- "github.com/projectdiscovery/nuclei/v2/pkg/protocols"
- templateTypes "github.com/projectdiscovery/nuclei/v2/pkg/templates/types"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/stringslice"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/protocols"
+ templateTypes "github.com/projectdiscovery/nuclei/v3/pkg/templates/types"
)
// Workflow is a workflow to execute with chained requests, etc.
diff --git a/v2/pkg/workflows/workflows_test.go b/pkg/workflows/workflows_test.go
similarity index 94%
rename from v2/pkg/workflows/workflows_test.go
rename to pkg/workflows/workflows_test.go
index 9a8b187e..21733701 100644
--- a/v2/pkg/workflows/workflows_test.go
+++ b/pkg/workflows/workflows_test.go
@@ -3,8 +3,8 @@ package workflows
import (
"testing"
- "github.com/projectdiscovery/nuclei/v2/pkg/model/types/stringslice"
- "github.com/projectdiscovery/nuclei/v2/pkg/operators"
+ "github.com/projectdiscovery/nuclei/v3/pkg/model/types/stringslice"
+ "github.com/projectdiscovery/nuclei/v3/pkg/operators"
"github.com/stretchr/testify/require"
)
diff --git a/v2/detect-ssl-issuer.yaml b/v2/detect-ssl-issuer.yaml
deleted file mode 100644
index 0b4c5027..00000000
--- a/v2/detect-ssl-issuer.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-id: ssl-issuer
-
-info:
- name: Detect SSL Certificate Issuer
- author: Lingtren
- severity: info
- description: |
- Extract the issuer's organization from the target's certificate. Issuers are entities which sign and distribute certificates.
- tags: ssl
- metadata:
- max-request: 1
-
-ssl:
- - address: "{{Host}}:{{Port}}"
-
- extractors:
- - type: json
- json:
- - " .issuer_org[]"
-# digest: 4b0a00483046022100bd4c4049c78917614a2b671e1221dcbe381ce1815e59b2417440e4a8eff70e13022100856bfb849ee53d189f9cdd14940de44c326f1a20837bf65bb5b4a3595fa33138
\ No newline at end of file
diff --git a/v2/key.go b/v2/key.go
deleted file mode 100644
index cc5adad5..00000000
--- a/v2/key.go
+++ /dev/null
@@ -1,6 +0,0 @@
-package v2
-
-import _ "embed"
-
-//go:embed nuclei.crt
-var NucleiCert []byte
diff --git a/v2/pkg/js/devtools/bindgen/cmd/bindgen/main.go b/v2/pkg/js/devtools/bindgen/cmd/bindgen/main.go
deleted file mode 100644
index 36c1f104..00000000
--- a/v2/pkg/js/devtools/bindgen/cmd/bindgen/main.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package main
-
-import (
- "flag"
- "fmt"
- "log"
- "path"
- "path/filepath"
-
- "github.com/pkg/errors"
- generator "github.com/projectdiscovery/nuclei/v2/pkg/js/devtools/bindgen"
- fileutil "github.com/projectdiscovery/utils/file"
-)
-
-var (
- dir string
- generatedDir string
- targetModules string
-)
-
-func main() {
- flag.StringVar(&dir, "dir", "libs", "directory to process")
- flag.StringVar(&generatedDir, "out", "generated", "directory to output generated files")
- flag.StringVar(&targetModules, "target", "", "target modules to generate")
- flag.Parse()
- log.SetFlags(0)
- if !fileutil.FolderExists(dir) {
- log.Fatalf("directory %s does not exist", dir)
- }
- if err := process(); err != nil {
- log.Fatal(err)
- }
-}
-
-func process() error {
- modules, err := generator.GetLibraryModules(dir)
- if err != nil {
- return errors.Wrap(err, "could not get library modules")
- }
- if len(modules) == 0 && fileutil.FolderExists(dir) {
- // if no modules are found, then given directory is the module itself
- targetModules = path.Base(dir)
- modules = append(modules, targetModules)
- dir = filepath.Dir(dir)
- }
- for _, module := range modules {
- log.Printf("[module] Generating %s", module)
-
- data, err := generator.CreateTemplateData(filepath.Join(dir, module), "github.com/projectdiscovery/nuclei/v2/pkg/js/libs/")
- if err != nil {
- return fmt.Errorf("could not create template data: %v", err)
- }
-
- prefixed := "lib" + module
- err = data.WriteJSTemplate(filepath.Join(generatedDir, "js/"+prefixed), module)
- if err != nil {
- return fmt.Errorf("could not write js template: %v", err)
- }
- err = data.WriteGoTemplate(path.Join(generatedDir, "go/"+prefixed), module)
- if err != nil {
- return fmt.Errorf("could not write go template: %v", err)
- }
- // disabled for now since we have static website for docs
- // err = data.WriteMarkdownLibraryDocumentation(path.Join(generatedDir, "markdown/"), module)
- // if err != nil {
- // return fmt.Errorf("could not write markdown template: %v", err)
- // }
-
- // err = data.WriteMarkdownIndexTemplate(path.Join(generatedDir, "markdown/"))
- // if err != nil {
- // return fmt.Errorf("could not write markdown index template: %v", err)
- // }
- data.InitNativeScripts()
- }
- return nil
-}
diff --git a/v2/pkg/js/devtools/jsdocgen/jsdocgen b/v2/pkg/js/devtools/jsdocgen/jsdocgen
deleted file mode 100755
index f0320860..00000000
Binary files a/v2/pkg/js/devtools/jsdocgen/jsdocgen and /dev/null differ