v2 update

projectdiscovery · Jul 1, 2020 · 458dbc1 · 458dbc1
1 parent c8e3107
commit 458dbc1
Show file tree

Hide file tree

Showing 43 changed files with 50 additions and 28 deletions.
diff --git 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
@@ -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"]
diff --git a/cmd/nuclei/main.go → v2/cmd/nuclei/main.go b/cmd/nuclei/main.go → 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
@@ -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 → v2/internal/runner/banner.go b/internal/runner/banner.go → v2/internal/runner/banner.go
diff --git a/internal/runner/doc.go → v2/internal/runner/doc.go b/internal/runner/doc.go → v2/internal/runner/doc.go
diff --git a/internal/runner/options.go → v2/internal/runner/options.go b/internal/runner/options.go → 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 → v2/internal/runner/runner.go b/internal/runner/runner.go → 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 → v2/internal/runner/update.go b/internal/runner/update.go → v2/internal/runner/update.go
diff --git a/internal/runner/validate.go → v2/internal/runner/validate.go b/internal/runner/validate.go → v2/internal/runner/validate.go
diff --git a/pkg/executor/dns_utils.go → v2/pkg/executor/dns_utils.go b/pkg/executor/dns_utils.go → v2/pkg/executor/dns_utils.go
diff --git a/pkg/executor/executer_http.go → v2/pkg/executor/executer_http.go b/pkg/executor/executer_http.go → 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 → v2/pkg/executor/executor_dns.go b/pkg/executor/executor_dns.go → 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 → v2/pkg/executor/http_utils.go b/pkg/executor/http_utils.go → v2/pkg/executor/http_utils.go
diff --git a/pkg/executor/output_dns.go → v2/pkg/executor/output_dns.go b/pkg/executor/output_dns.go → 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 → v2/pkg/executor/output_http.go b/pkg/executor/output_http.go → 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 → v2/pkg/extractors/compile.go b/pkg/extractors/compile.go → v2/pkg/extractors/compile.go
diff --git a/pkg/extractors/doc.go → v2/pkg/extractors/doc.go b/pkg/extractors/doc.go → v2/pkg/extractors/doc.go
diff --git a/pkg/extractors/extract.go → v2/pkg/extractors/extract.go b/pkg/extractors/extract.go → v2/pkg/extractors/extract.go
diff --git a/pkg/extractors/extractors.go → v2/pkg/extractors/extractors.go b/pkg/extractors/extractors.go → v2/pkg/extractors/extractors.go
diff --git a/pkg/generators/attack.go → v2/pkg/generators/attack.go b/pkg/generators/attack.go → v2/pkg/generators/attack.go
diff --git a/pkg/generators/clusterbomb.go → v2/pkg/generators/clusterbomb.go b/pkg/generators/clusterbomb.go → v2/pkg/generators/clusterbomb.go
diff --git a/pkg/generators/dsl.go → v2/pkg/generators/dsl.go b/pkg/generators/dsl.go → v2/pkg/generators/dsl.go
diff --git a/pkg/generators/pitchfork.go → v2/pkg/generators/pitchfork.go b/pkg/generators/pitchfork.go → v2/pkg/generators/pitchfork.go
diff --git a/pkg/generators/sniper.go → v2/pkg/generators/sniper.go b/pkg/generators/sniper.go → v2/pkg/generators/sniper.go
diff --git a/pkg/generators/util.go → v2/pkg/generators/util.go b/pkg/generators/util.go → v2/pkg/generators/util.go
diff --git a/pkg/matchers/compile.go → v2/pkg/matchers/compile.go b/pkg/matchers/compile.go → 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 → v2/pkg/matchers/doc.go b/pkg/matchers/doc.go → v2/pkg/matchers/doc.go
diff --git a/pkg/matchers/match.go → v2/pkg/matchers/match.go b/pkg/matchers/match.go → v2/pkg/matchers/match.go
diff --git a/pkg/matchers/match_test.go → v2/pkg/matchers/match_test.go b/pkg/matchers/match_test.go → v2/pkg/matchers/match_test.go
diff --git a/pkg/matchers/matchers.go → v2/pkg/matchers/matchers.go b/pkg/matchers/matchers.go → v2/pkg/matchers/matchers.go
diff --git a/pkg/matchers/util.go → v2/pkg/matchers/util.go b/pkg/matchers/util.go → v2/pkg/matchers/util.go
diff --git a/pkg/requests/dns-request.go → v2/pkg/requests/dns-request.go b/pkg/requests/dns-request.go → 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 → v2/pkg/requests/doc.go b/pkg/requests/doc.go → v2/pkg/requests/doc.go
diff --git a/pkg/requests/http-request.go → v2/pkg/requests/http-request.go b/pkg/requests/http-request.go → 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 → v2/pkg/requests/util.go b/pkg/requests/util.go → v2/pkg/requests/util.go
diff --git a/pkg/templates/compile.go → v2/pkg/templates/compile.go b/pkg/templates/compile.go → 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 → v2/pkg/templates/doc.go b/pkg/templates/doc.go → v2/pkg/templates/doc.go
diff --git a/pkg/templates/templates.go → v2/pkg/templates/templates.go b/pkg/templates/templates.go → 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 → v2/pkg/workflows/compile.go b/pkg/workflows/compile.go → v2/pkg/workflows/compile.go
diff --git a/pkg/workflows/doc.go → v2/pkg/workflows/doc.go b/pkg/workflows/doc.go → v2/pkg/workflows/doc.go
diff --git a/pkg/workflows/var.go → v2/pkg/workflows/var.go b/pkg/workflows/var.go → 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 → v2/pkg/workflows/workflows.go b/pkg/workflows/workflows.go → v2/pkg/workflows/workflows.go