From 458dbc1b3891bf1cae0aa3b84b39630001f4ea04 Mon Sep 17 00:00:00 2001 From: Ice3man543 Date: Wed, 1 Jul 2020 16:17:24 +0530 Subject: [PATCH] v2 update --- .goreleaser.yml | 2 +- Dockerfile | 2 +- {cmd => v2/cmd}/nuclei/main.go | 2 +- v2/go.mod | 22 ++++++++++++++++++++ {internal => v2/internal}/runner/banner.go | 0 {internal => v2/internal}/runner/doc.go | 0 {internal => v2/internal}/runner/options.go | 2 +- {internal => v2/internal}/runner/runner.go | 8 +++---- {internal => v2/internal}/runner/update.go | 0 {internal => v2/internal}/runner/validate.go | 0 {pkg => v2/pkg}/executor/dns_utils.go | 0 {pkg => v2/pkg}/executor/executer_http.go | 8 +++---- {pkg => v2/pkg}/executor/executor_dns.go | 6 +++--- {pkg => v2/pkg}/executor/http_utils.go | 0 {pkg => v2/pkg}/executor/output_dns.go | 2 +- {pkg => v2/pkg}/executor/output_http.go | 4 ++-- {pkg => v2/pkg}/extractors/compile.go | 0 {pkg => v2/pkg}/extractors/doc.go | 0 {pkg => v2/pkg}/extractors/extract.go | 0 {pkg => v2/pkg}/extractors/extractors.go | 0 {pkg => v2/pkg}/generators/attack.go | 0 {pkg => v2/pkg}/generators/clusterbomb.go | 0 {pkg => v2/pkg}/generators/dsl.go | 0 {pkg => v2/pkg}/generators/pitchfork.go | 0 {pkg => v2/pkg}/generators/sniper.go | 0 {pkg => v2/pkg}/generators/util.go | 0 {pkg => v2/pkg}/matchers/compile.go | 2 +- {pkg => v2/pkg}/matchers/doc.go | 0 {pkg => v2/pkg}/matchers/match.go | 0 {pkg => v2/pkg}/matchers/match_test.go | 0 {pkg => v2/pkg}/matchers/matchers.go | 0 {pkg => v2/pkg}/matchers/util.go | 0 {pkg => v2/pkg}/requests/dns-request.go | 4 ++-- {pkg => v2/pkg}/requests/doc.go | 0 {pkg => v2/pkg}/requests/http-request.go | 6 +++--- {pkg => v2/pkg}/requests/util.go | 0 {pkg => v2/pkg}/templates/compile.go | 4 ++-- {pkg => v2/pkg}/templates/doc.go | 0 {pkg => v2/pkg}/templates/templates.go | 2 +- {pkg => v2/pkg}/workflows/compile.go | 0 {pkg => v2/pkg}/workflows/doc.go | 0 {pkg => v2/pkg}/workflows/var.go | 2 +- {pkg => v2/pkg}/workflows/workflows.go | 0 43 files changed, 50 insertions(+), 28 deletions(-) rename {cmd => v2/cmd}/nuclei/main.go (85%) create mode 100644 v2/go.mod rename {internal => v2/internal}/runner/banner.go (100%) rename {internal => v2/internal}/runner/doc.go (100%) rename {internal => v2/internal}/runner/options.go (98%) rename {internal => v2/internal}/runner/runner.go (98%) rename {internal => v2/internal}/runner/update.go (100%) rename {internal => v2/internal}/runner/validate.go (100%) rename {pkg => v2/pkg}/executor/dns_utils.go (100%) rename {pkg => v2/pkg}/executor/executer_http.go (97%) rename {pkg => v2/pkg}/executor/executor_dns.go (96%) rename {pkg => v2/pkg}/executor/http_utils.go (100%) rename {pkg => v2/pkg}/executor/output_dns.go (97%) rename {pkg => v2/pkg}/executor/output_http.go (95%) rename {pkg => v2/pkg}/extractors/compile.go (100%) rename {pkg => v2/pkg}/extractors/doc.go (100%) rename {pkg => v2/pkg}/extractors/extract.go (100%) rename {pkg => v2/pkg}/extractors/extractors.go (100%) rename {pkg => v2/pkg}/generators/attack.go (100%) rename {pkg => v2/pkg}/generators/clusterbomb.go (100%) rename {pkg => v2/pkg}/generators/dsl.go (100%) rename {pkg => v2/pkg}/generators/pitchfork.go (100%) rename {pkg => v2/pkg}/generators/sniper.go (100%) rename {pkg => v2/pkg}/generators/util.go (100%) rename {pkg => v2/pkg}/matchers/compile.go (96%) rename {pkg => v2/pkg}/matchers/doc.go (100%) rename {pkg => v2/pkg}/matchers/match.go (100%) rename {pkg => v2/pkg}/matchers/match_test.go (100%) rename {pkg => v2/pkg}/matchers/matchers.go (100%) rename {pkg => v2/pkg}/matchers/util.go (100%) rename {pkg => v2/pkg}/requests/dns-request.go (96%) rename {pkg => v2/pkg}/requests/doc.go (100%) rename {pkg => v2/pkg}/requests/http-request.go (98%) rename {pkg => v2/pkg}/requests/util.go (100%) rename {pkg => v2/pkg}/templates/compile.go (95%) rename {pkg => v2/pkg}/templates/doc.go (100%) rename {pkg => v2/pkg}/templates/templates.go (93%) rename {pkg => v2/pkg}/workflows/compile.go (100%) rename {pkg => v2/pkg}/workflows/doc.go (100%) rename {pkg => v2/pkg}/workflows/var.go (97%) rename {pkg => v2/pkg}/workflows/workflows.go (100%) diff --git a/.goreleaser.yml b/.goreleaser.yml index 56b8218a..b1eb345e 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -1,6 +1,6 @@ builds: - binary: nuclei - main: cmd/nuclei/main.go + main: v2/cmd/nuclei/main.go goos: - linux - windows diff --git a/Dockerfile b/Dockerfile index cfed3b9a..4be863ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,6 @@ RUN go get -u github.com/golang/dep/cmd/dep WORKDIR /go/src/app # Install -RUN go get -u github.com/projectdiscovery/nuclei/cmd/nuclei +RUN GO111MODULE=on go get -u github.com/projectdiscovery/nuclei/v2/cmd/nuclei ENTRYPOINT ["nuclei"] \ No newline at end of file diff --git a/cmd/nuclei/main.go b/v2/cmd/nuclei/main.go similarity index 85% rename from cmd/nuclei/main.go rename to v2/cmd/nuclei/main.go index ad64b621..a10484ff 100644 --- a/cmd/nuclei/main.go +++ b/v2/cmd/nuclei/main.go @@ -2,7 +2,7 @@ package main import ( "github.com/projectdiscovery/gologger" - "github.com/projectdiscovery/nuclei/internal/runner" + "github.com/projectdiscovery/nuclei/v2/internal/runner" ) func main() { diff --git a/v2/go.mod b/v2/go.mod new file mode 100644 index 00000000..bffaf20f --- /dev/null +++ b/v2/go.mod @@ -0,0 +1,22 @@ +module github.com/projectdiscovery/nuclei/v2 + +go 1.14 + +require ( + github.com/Knetic/govaluate v3.0.0+incompatible + github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 + github.com/blang/semver v3.5.1+incompatible + github.com/d5/tengo v1.24.8 + github.com/d5/tengo/v2 v2.6.0 + github.com/google/go-github v17.0.0+incompatible + github.com/google/go-github/v32 v32.0.0 + github.com/json-iterator/go v1.1.10 + github.com/karrick/godirwalk v1.15.6 + github.com/miekg/dns v1.1.29 + github.com/pkg/errors v0.9.1 + github.com/projectdiscovery/gologger v1.0.0 + github.com/projectdiscovery/retryabledns v1.0.4 + github.com/projectdiscovery/retryablehttp-go v1.0.1 + golang.org/x/net v0.0.0-20200528225125-3c3fba18258b + gopkg.in/yaml.v2 v2.3.0 +) diff --git a/internal/runner/banner.go b/v2/internal/runner/banner.go similarity index 100% rename from internal/runner/banner.go rename to v2/internal/runner/banner.go diff --git a/internal/runner/doc.go b/v2/internal/runner/doc.go similarity index 100% rename from internal/runner/doc.go rename to v2/internal/runner/doc.go diff --git a/internal/runner/options.go b/v2/internal/runner/options.go similarity index 98% rename from internal/runner/options.go rename to v2/internal/runner/options.go index 8fe52b1d..baab72b9 100644 --- a/internal/runner/options.go +++ b/v2/internal/runner/options.go @@ -5,7 +5,7 @@ import ( "os" "github.com/projectdiscovery/gologger" - "github.com/projectdiscovery/nuclei/pkg/requests" + "github.com/projectdiscovery/nuclei/v2/pkg/requests" ) // Options contains the configuration options for tuning diff --git a/internal/runner/runner.go b/v2/internal/runner/runner.go similarity index 98% rename from internal/runner/runner.go rename to v2/internal/runner/runner.go index 96ab4e9f..4d2713d0 100644 --- a/internal/runner/runner.go +++ b/v2/internal/runner/runner.go @@ -14,10 +14,10 @@ import ( "github.com/d5/tengo/v2" "github.com/karrick/godirwalk" "github.com/projectdiscovery/gologger" - "github.com/projectdiscovery/nuclei/pkg/executor" - "github.com/projectdiscovery/nuclei/pkg/requests" - "github.com/projectdiscovery/nuclei/pkg/templates" - "github.com/projectdiscovery/nuclei/pkg/workflows" + "github.com/projectdiscovery/nuclei/v2/pkg/executor" + "github.com/projectdiscovery/nuclei/v2/pkg/requests" + "github.com/projectdiscovery/nuclei/v2/pkg/templates" + "github.com/projectdiscovery/nuclei/v2/pkg/workflows" ) // Runner is a client for running the enumeration process. diff --git a/internal/runner/update.go b/v2/internal/runner/update.go similarity index 100% rename from internal/runner/update.go rename to v2/internal/runner/update.go diff --git a/internal/runner/validate.go b/v2/internal/runner/validate.go similarity index 100% rename from internal/runner/validate.go rename to v2/internal/runner/validate.go diff --git a/pkg/executor/dns_utils.go b/v2/pkg/executor/dns_utils.go similarity index 100% rename from pkg/executor/dns_utils.go rename to v2/pkg/executor/dns_utils.go diff --git a/pkg/executor/executer_http.go b/v2/pkg/executor/executer_http.go similarity index 97% rename from pkg/executor/executer_http.go rename to v2/pkg/executor/executer_http.go index 058f7544..c743d47b 100644 --- a/pkg/executor/executer_http.go +++ b/v2/pkg/executor/executer_http.go @@ -17,10 +17,10 @@ import ( "github.com/pkg/errors" "github.com/projectdiscovery/gologger" - "github.com/projectdiscovery/nuclei/pkg/extractors" - "github.com/projectdiscovery/nuclei/pkg/matchers" - "github.com/projectdiscovery/nuclei/pkg/requests" - "github.com/projectdiscovery/nuclei/pkg/templates" + "github.com/projectdiscovery/nuclei/v2/pkg/extractors" + "github.com/projectdiscovery/nuclei/v2/pkg/matchers" + "github.com/projectdiscovery/nuclei/v2/pkg/requests" + "github.com/projectdiscovery/nuclei/v2/pkg/templates" "github.com/projectdiscovery/retryablehttp-go" "golang.org/x/net/proxy" ) diff --git a/pkg/executor/executor_dns.go b/v2/pkg/executor/executor_dns.go similarity index 96% rename from pkg/executor/executor_dns.go rename to v2/pkg/executor/executor_dns.go index 34307678..a50d7dad 100644 --- a/pkg/executor/executor_dns.go +++ b/v2/pkg/executor/executor_dns.go @@ -9,9 +9,9 @@ import ( "github.com/pkg/errors" "github.com/projectdiscovery/gologger" - "github.com/projectdiscovery/nuclei/pkg/matchers" - "github.com/projectdiscovery/nuclei/pkg/requests" - "github.com/projectdiscovery/nuclei/pkg/templates" + "github.com/projectdiscovery/nuclei/v2/pkg/matchers" + "github.com/projectdiscovery/nuclei/v2/pkg/requests" + "github.com/projectdiscovery/nuclei/v2/pkg/templates" retryabledns "github.com/projectdiscovery/retryabledns" ) diff --git a/pkg/executor/http_utils.go b/v2/pkg/executor/http_utils.go similarity index 100% rename from pkg/executor/http_utils.go rename to v2/pkg/executor/http_utils.go diff --git a/pkg/executor/output_dns.go b/v2/pkg/executor/output_dns.go similarity index 97% rename from pkg/executor/output_dns.go rename to v2/pkg/executor/output_dns.go index 4b09b749..fd66c665 100644 --- a/pkg/executor/output_dns.go +++ b/v2/pkg/executor/output_dns.go @@ -5,7 +5,7 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/projectdiscovery/gologger" - "github.com/projectdiscovery/nuclei/pkg/matchers" + "github.com/projectdiscovery/nuclei/v2/pkg/matchers" ) // writeOutputDNS writes dns output to streams diff --git a/pkg/executor/output_http.go b/v2/pkg/executor/output_http.go similarity index 95% rename from pkg/executor/output_http.go rename to v2/pkg/executor/output_http.go index 25a27a5e..22d4bad4 100644 --- a/pkg/executor/output_http.go +++ b/v2/pkg/executor/output_http.go @@ -5,8 +5,8 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/projectdiscovery/gologger" - "github.com/projectdiscovery/nuclei/pkg/matchers" - "github.com/projectdiscovery/nuclei/pkg/requests" + "github.com/projectdiscovery/nuclei/v2/pkg/matchers" + "github.com/projectdiscovery/nuclei/v2/pkg/requests" ) // writeOutputHTTP writes http output to streams diff --git a/pkg/extractors/compile.go b/v2/pkg/extractors/compile.go similarity index 100% rename from pkg/extractors/compile.go rename to v2/pkg/extractors/compile.go diff --git a/pkg/extractors/doc.go b/v2/pkg/extractors/doc.go similarity index 100% rename from pkg/extractors/doc.go rename to v2/pkg/extractors/doc.go diff --git a/pkg/extractors/extract.go b/v2/pkg/extractors/extract.go similarity index 100% rename from pkg/extractors/extract.go rename to v2/pkg/extractors/extract.go diff --git a/pkg/extractors/extractors.go b/v2/pkg/extractors/extractors.go similarity index 100% rename from pkg/extractors/extractors.go rename to v2/pkg/extractors/extractors.go diff --git a/pkg/generators/attack.go b/v2/pkg/generators/attack.go similarity index 100% rename from pkg/generators/attack.go rename to v2/pkg/generators/attack.go diff --git a/pkg/generators/clusterbomb.go b/v2/pkg/generators/clusterbomb.go similarity index 100% rename from pkg/generators/clusterbomb.go rename to v2/pkg/generators/clusterbomb.go diff --git a/pkg/generators/dsl.go b/v2/pkg/generators/dsl.go similarity index 100% rename from pkg/generators/dsl.go rename to v2/pkg/generators/dsl.go diff --git a/pkg/generators/pitchfork.go b/v2/pkg/generators/pitchfork.go similarity index 100% rename from pkg/generators/pitchfork.go rename to v2/pkg/generators/pitchfork.go diff --git a/pkg/generators/sniper.go b/v2/pkg/generators/sniper.go similarity index 100% rename from pkg/generators/sniper.go rename to v2/pkg/generators/sniper.go diff --git a/pkg/generators/util.go b/v2/pkg/generators/util.go similarity index 100% rename from pkg/generators/util.go rename to v2/pkg/generators/util.go diff --git a/pkg/matchers/compile.go b/v2/pkg/matchers/compile.go similarity index 96% rename from pkg/matchers/compile.go rename to v2/pkg/matchers/compile.go index b0ddfb8f..e670c53c 100644 --- a/pkg/matchers/compile.go +++ b/v2/pkg/matchers/compile.go @@ -5,7 +5,7 @@ import ( "regexp" "github.com/Knetic/govaluate" - "github.com/projectdiscovery/nuclei/pkg/generators" + "github.com/projectdiscovery/nuclei/v2/pkg/generators" ) // CompileMatchers performs the initial setup operation on a matcher diff --git a/pkg/matchers/doc.go b/v2/pkg/matchers/doc.go similarity index 100% rename from pkg/matchers/doc.go rename to v2/pkg/matchers/doc.go diff --git a/pkg/matchers/match.go b/v2/pkg/matchers/match.go similarity index 100% rename from pkg/matchers/match.go rename to v2/pkg/matchers/match.go diff --git a/pkg/matchers/match_test.go b/v2/pkg/matchers/match_test.go similarity index 100% rename from pkg/matchers/match_test.go rename to v2/pkg/matchers/match_test.go diff --git a/pkg/matchers/matchers.go b/v2/pkg/matchers/matchers.go similarity index 100% rename from pkg/matchers/matchers.go rename to v2/pkg/matchers/matchers.go diff --git a/pkg/matchers/util.go b/v2/pkg/matchers/util.go similarity index 100% rename from pkg/matchers/util.go rename to v2/pkg/matchers/util.go diff --git a/pkg/requests/dns-request.go b/v2/pkg/requests/dns-request.go similarity index 96% rename from pkg/requests/dns-request.go rename to v2/pkg/requests/dns-request.go index 7ba11d69..ba695c2d 100644 --- a/pkg/requests/dns-request.go +++ b/v2/pkg/requests/dns-request.go @@ -4,8 +4,8 @@ import ( "strings" "github.com/miekg/dns" - "github.com/projectdiscovery/nuclei/pkg/extractors" - "github.com/projectdiscovery/nuclei/pkg/matchers" + "github.com/projectdiscovery/nuclei/v2/pkg/extractors" + "github.com/projectdiscovery/nuclei/v2/pkg/matchers" ) // DNSRequest contains a request to be made from a template diff --git a/pkg/requests/doc.go b/v2/pkg/requests/doc.go similarity index 100% rename from pkg/requests/doc.go rename to v2/pkg/requests/doc.go diff --git a/pkg/requests/http-request.go b/v2/pkg/requests/http-request.go similarity index 98% rename from pkg/requests/http-request.go rename to v2/pkg/requests/http-request.go index 00badcf7..b6f28342 100644 --- a/pkg/requests/http-request.go +++ b/v2/pkg/requests/http-request.go @@ -10,9 +10,9 @@ import ( "strings" "github.com/Knetic/govaluate" - "github.com/projectdiscovery/nuclei/pkg/extractors" - "github.com/projectdiscovery/nuclei/pkg/generators" - "github.com/projectdiscovery/nuclei/pkg/matchers" + "github.com/projectdiscovery/nuclei/v2/pkg/extractors" + "github.com/projectdiscovery/nuclei/v2/pkg/generators" + "github.com/projectdiscovery/nuclei/v2/pkg/matchers" retryablehttp "github.com/projectdiscovery/retryablehttp-go" ) diff --git a/pkg/requests/util.go b/v2/pkg/requests/util.go similarity index 100% rename from pkg/requests/util.go rename to v2/pkg/requests/util.go diff --git a/pkg/templates/compile.go b/v2/pkg/templates/compile.go similarity index 95% rename from pkg/templates/compile.go rename to v2/pkg/templates/compile.go index cb66d843..5e2f1e16 100644 --- a/pkg/templates/compile.go +++ b/v2/pkg/templates/compile.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "github.com/projectdiscovery/nuclei/pkg/generators" - "github.com/projectdiscovery/nuclei/pkg/matchers" + "github.com/projectdiscovery/nuclei/v2/pkg/generators" + "github.com/projectdiscovery/nuclei/v2/pkg/matchers" "gopkg.in/yaml.v2" ) diff --git a/pkg/templates/doc.go b/v2/pkg/templates/doc.go similarity index 100% rename from pkg/templates/doc.go rename to v2/pkg/templates/doc.go diff --git a/pkg/templates/templates.go b/v2/pkg/templates/templates.go similarity index 93% rename from pkg/templates/templates.go rename to v2/pkg/templates/templates.go index 73719673..eebbf6ce 100644 --- a/pkg/templates/templates.go +++ b/v2/pkg/templates/templates.go @@ -1,7 +1,7 @@ package templates import ( - "github.com/projectdiscovery/nuclei/pkg/requests" + "github.com/projectdiscovery/nuclei/v2/pkg/requests" ) // Template is a request template parsed from a yaml file diff --git a/pkg/workflows/compile.go b/v2/pkg/workflows/compile.go similarity index 100% rename from pkg/workflows/compile.go rename to v2/pkg/workflows/compile.go diff --git a/pkg/workflows/doc.go b/v2/pkg/workflows/doc.go similarity index 100% rename from pkg/workflows/doc.go rename to v2/pkg/workflows/doc.go diff --git a/pkg/workflows/var.go b/v2/pkg/workflows/var.go similarity index 97% rename from pkg/workflows/var.go rename to v2/pkg/workflows/var.go index 786934d5..5d8897e4 100644 --- a/pkg/workflows/var.go +++ b/v2/pkg/workflows/var.go @@ -3,7 +3,7 @@ package workflows import ( "github.com/d5/tengo/v2" "github.com/projectdiscovery/gologger" - "github.com/projectdiscovery/nuclei/pkg/executor" + "github.com/projectdiscovery/nuclei/v2/pkg/executor" ) // NucleiVar within the scripting engine diff --git a/pkg/workflows/workflows.go b/v2/pkg/workflows/workflows.go similarity index 100% rename from pkg/workflows/workflows.go rename to v2/pkg/workflows/workflows.go