Merge branch 'projectdiscovery-main'

* projectdiscovery-main: (283 commits) upgrade ci(generate-docs): push w/o pull (projectdiscovery#5843) auto gen docs update handle env variables in dynamic secret file (projectdiscovery#5835) disable self-contained and file protocol templates as default (projectdiscovery#5825) chore(deps): bump github.com/projectdiscovery/hmap from 0.0.65 to 0.0.67 (projectdiscovery#5832) feat: Added time based delay analyzer to fuzzing implementation (projectdiscovery#5781) fix: data race at `protocolstate`, `contextargs` & some outdated test cases (projectdiscovery#5820) chore(deps): bump github.com/projectdiscovery/retryabledns chore(deps): bump github.com/projectdiscovery/goflags chore(deps): bump github.com/projectdiscovery/dsl from 0.3.0 to 0.3.3 chore(deps): bump github.com/projectdiscovery/rawhttp Batch JSONL output and add trailing commas (projectdiscovery#5705) ci: refactor workflows (projectdiscovery#5818) chore(deps): bump github.com/golang-jwt/jwt/v4 from 4.5.0 to 4.5.1 (projectdiscovery#5795) chore(deps): bump github.com/projectdiscovery/rawhttp (projectdiscovery#5809) chore(deps): bump github.com/projectdiscovery/wappalyzergo (projectdiscovery#5808) update version chore(deps): bump github.com/projectdiscovery/gologger chore(deps): bump github.com/projectdiscovery/useragent ... # Conflicts: # .github/ISSUE_TEMPLATE/feature_request.md # .github/ISSUE_TEMPLATE/issue-report.md # .run/DSLFunctionsIT.run.xml # DESIGN.md # README.md # README_CN.md # README_ID.md # README_KR.md # cmd/docgen/docgen.go # cmd/functional-test/main.go # cmd/functional-test/run.sh # cmd/integration-test/custom-dir.go # cmd/integration-test/dns.go # cmd/integration-test/file.go # cmd/integration-test/fuzz.go # cmd/integration-test/headless.go # cmd/integration-test/http.go # cmd/integration-test/integration-test.go # cmd/integration-test/library.go # cmd/integration-test/loader.go # cmd/integration-test/offline-http.go # cmd/integration-test/ssl.go # cmd/integration-test/template-dir.go # cmd/integration-test/template-path.go # cmd/integration-test/websocket.go # cmd/integration-test/whois.go # cmd/integration-test/workflow.go # cmd/nuclei/main.go # examples/advanced/advanced.go # examples/simple/simple.go # go.mod # go.sum # internal/colorizer/colorizer.go # internal/runner/banner.go # internal/runner/healthcheck.go # internal/runner/lazy.go # internal/runner/options.go # internal/runner/proxy.go # internal/runner/runner.go # internal/runner/runner_test.go # internal/runner/templates.go # lib/example_test.go # lib/sdk.go # lib/sdk_private.go # pkg/catalog/disk/find.go # pkg/catalog/loader/filter/path_filter.go # pkg/catalog/loader/loader.go # pkg/catalog/loader/loader_test.go # pkg/catalog/loader/remote_loader.go # pkg/core/engine.go # pkg/core/executors.go # pkg/core/workflow_execute.go # pkg/core/workflow_execute_test.go # pkg/external/customtemplates/azure_blob.go # pkg/external/customtemplates/github.go # pkg/external/customtemplates/github_test.go # pkg/external/customtemplates/gitlab.go # pkg/external/customtemplates/s3.go # pkg/external/customtemplates/templates_provider.go # pkg/fuzz/component/path.go # pkg/fuzz/fuzz.go # pkg/input/formats/swagger/swagger.go # pkg/input/provider/list/hmap.go # pkg/input/provider/list/hmap_test.go # pkg/input/transform.go # pkg/installer/template.go # pkg/installer/template_test.go # pkg/installer/util.go # pkg/installer/versioncheck.go # pkg/installer/versioncheck_test.go # pkg/js/compiler/compiler.go # pkg/js/compiler/init.go # pkg/js/global/scripts.go # pkg/js/libs/mssql/mssql.go # pkg/js/libs/postgres/postgres.go # pkg/loader/workflow/workflow_loader.go # pkg/model/model.go # pkg/model/model_test.go # pkg/model/types/severity/severities.go # pkg/model/types/stringslice/stringslice.go # pkg/operators/common/dsl/dsl.go # pkg/operators/extractors/compile.go # pkg/operators/extractors/extract.go # pkg/operators/matchers/compile.go # pkg/operators/matchers/match.go # pkg/operators/operators.go # pkg/output/format_screen.go # pkg/output/output.go # pkg/output/output_test.go # pkg/protocols/common/expressions/expressions.go # pkg/protocols/common/expressions/variables.go # pkg/protocols/common/generators/generators.go # pkg/protocols/common/generators/generators_test.go # pkg/protocols/common/generators/options.go # pkg/protocols/common/generators/validate.go # pkg/protocols/common/helpers/eventcreator/eventcreator.go # pkg/protocols/common/helpers/responsehighlighter/response_highlighter.go # pkg/protocols/common/helpers/responsehighlighter/response_highlighter_test.go # pkg/protocols/common/helpers/writer/writer.go # pkg/protocols/common/interactsh/interactsh.go # pkg/protocols/common/interactsh/options.go # pkg/protocols/common/protocolstate/state.go # pkg/protocols/common/replacer/replacer.go # pkg/protocols/common/uncover/uncover.go # pkg/protocols/common/utils/vardump/dump.go # pkg/protocols/common/variables/variables.go # pkg/protocols/dns/dns.go # pkg/protocols/dns/dns_test.go # pkg/protocols/dns/dnsclientpool/clientpool.go # pkg/protocols/dns/operators.go # pkg/protocols/dns/operators_test.go # pkg/protocols/dns/request.go # pkg/protocols/dns/request_test.go # pkg/protocols/file/file.go # pkg/protocols/file/find_test.go # pkg/protocols/file/operators.go # pkg/protocols/file/operators_test.go # pkg/protocols/file/request.go # pkg/protocols/file/request_test.go # pkg/protocols/headless/engine/engine.go # pkg/protocols/headless/engine/http_client.go # pkg/protocols/headless/engine/instance.go # pkg/protocols/headless/engine/page_actions.go # pkg/protocols/headless/engine/page_actions_test.go # pkg/protocols/headless/engine/util.go # pkg/protocols/headless/headless.go # pkg/protocols/headless/operators.go # pkg/protocols/headless/request.go # pkg/protocols/http/build_request.go # pkg/protocols/http/build_request_test.go # pkg/protocols/http/cluster.go # pkg/protocols/http/http.go # pkg/protocols/http/http_test.go # pkg/protocols/http/httpclientpool/clientpool.go # pkg/protocols/http/operators.go # pkg/protocols/http/operators_test.go # pkg/protocols/http/request.go # pkg/protocols/http/request_annotations.go # pkg/protocols/http/request_annotations_test.go # pkg/protocols/http/request_fuzz.go # pkg/protocols/http/request_generator.go # pkg/protocols/http/request_generator_test.go # pkg/protocols/http/signature.go # pkg/protocols/http/signer/signer.go # pkg/protocols/http/signerpool/signerpool.go # pkg/protocols/javascript/js.go # pkg/protocols/network/network.go # pkg/protocols/network/network_test.go # pkg/protocols/network/networkclientpool/clientpool.go # pkg/protocols/network/operators.go # pkg/protocols/network/operators_test.go # pkg/protocols/network/request.go # pkg/protocols/network/request_test.go # pkg/protocols/offlinehttp/find_test.go # pkg/protocols/offlinehttp/offlinehttp.go # pkg/protocols/offlinehttp/operators.go # pkg/protocols/offlinehttp/operators_test.go # pkg/protocols/offlinehttp/request.go # pkg/protocols/protocols.go # pkg/protocols/ssl/ssl.go # pkg/protocols/ssl/ssl_test.go # pkg/protocols/utils/http/variables.go # pkg/protocols/utils/http/variables_test.go # pkg/protocols/utils/utils.go # pkg/protocols/websocket/websocket.go # pkg/protocols/whois/rdapclientpool/clientpool.go # pkg/protocols/whois/whois.go # pkg/reporting/client.go # pkg/reporting/dedupe/dedupe.go # pkg/reporting/dedupe/dedupe_test.go # pkg/reporting/exporters/es/elasticsearch.go # pkg/reporting/exporters/jsonexporter/jsonexporter.go # pkg/reporting/exporters/markdown/markdown.go # pkg/reporting/exporters/sarif/sarif.go # pkg/reporting/exporters/splunk/splunkhec.go # pkg/reporting/format/format_utils.go # pkg/reporting/format/format_utils_test.go # pkg/reporting/options.go # pkg/reporting/reporting.go # pkg/reporting/trackers/jira/jira.go # pkg/scan/scan_context.go # pkg/templates/cluster.go # pkg/templates/compile.go # pkg/templates/compile_test.go # pkg/templates/parser_test.go # pkg/templates/tag_filter.go # pkg/templates/tag_filter_test.go # pkg/templates/templates.go # pkg/templates/templates_doc_examples.go # pkg/templates/types/types.go # pkg/templates/workflows.go # pkg/testutils/testutils.go # pkg/tmplexec/exec.go # pkg/tmplexec/flow/flow_executor.go # pkg/tmplexec/interface.go # pkg/tmplexec/multiproto/multi.go # pkg/tmplexec/multiproto/multi_test.go # pkg/types/interfaces.go # pkg/types/resume.go # pkg/types/types.go # pkg/utils/template_path.go # pkg/utils/utils.go # pkg/utils/yaml/preprocess.go # pkg/workflows/workflows.go # pkg/workflows/workflows_test.go
Explorer1092 · Nov 25, 2024 · 74103df · 74103df
1 parent 0344a14
commit 74103df
Show file tree

Hide file tree

Showing 364 changed files with 423 additions and 3,464 deletions.
diff --git a/DESIGN.md b/DESIGN.md
@@ -395,15 +395,7 @@ Step by step description of how to add a new protocol to Nuclei -
 
 import (
 	...
-<<<<<<< HEAD
-	"github.com/Explorer1092/nuclei/v3/pkg/protocols/others/websocket"
-=======
-<<<<<<< HEAD
-	"github.com/Explorer1092/nuclei/v2/pkg/protocols/others/websocket"
-=======
 	"github.com/projectdiscovery/nuclei/v3/pkg/protocols/others/websocket"
->>>>>>> 419f08f61ce5ca2d3f0eae9fe36dc7c44c1f532a
->>>>>>> projectdiscovery-main
 )
 
 // Template is a YAML input file which defines all the requests and

diff --git a/README.md b/README.md
@@ -67,20 +67,10 @@ Nuclei is a modern, high-performance vulnerability scanner that leverages simple
 
 Install Nuclei on your machine. Get started by following the installation guide [here](https://docs.projectdiscovery.io/tools/nuclei/install?utm_source=github&utm_medium=web&utm_campaign=nuclei_readme). Additionally, We provide [a free cloud tier](https://cloud.projectdiscovery.io/sign-up) and comes with a generous monthly free limits:
 
-<<<<<<< HEAD
-```sh
-<<<<<<< HEAD
-go install -v github.com/Explorer1092/nuclei/v3/cmd/nuclei@latest
-=======
-go install -v github.com/Explorer1092/nuclei/v2/cmd/nuclei@latest
->>>>>>> projectdiscovery-main
-```
-=======
 - Store and visualize your vulnerability findings
 - Write and manage your nuclei templates
 - Access latest nuclei templates
 - Discover and store your targets
->>>>>>> 419f08f61ce5ca2d3f0eae9fe36dc7c44c1f532a
 
 ### **2. Pro and Enterprise Editions**
 
@@ -358,9 +348,6 @@ Additional documentation is available at: [https://docs.nuclei.sh/getting-starte
 
 ### Single target scan
 
-<<<<<<< HEAD
-Complete guide of using Nuclei as Library/SDK is available at [godoc](https://pkg.go.dev/github.com/Explorer1092/nuclei/v3/lib#section-readme)
-=======
 To perform a quick scan on web-application:
 
 ```sh
@@ -408,7 +395,6 @@ nuclei -target https://example.com -dashboard
 Try it online with our free AI powered Nuclei Templates Editor by [clicking here.](https://cloud.projectdiscovery.io/templates)
 
 Nuclei Templates offer a streamlined way to identify and communicate vulnerabilities, combining essential details like severity ratings and detection methods. This open-source, community-developed tool accelerates threat response and is widely recognized in the cybersecurity world. Nuclei templates are actively contributed by thousands of security researchers globally. We run two programs for our contributors: [Pioneers](https://projectdiscovery.io/pioneers) and [💎 bounties](https://github.com/projectdiscovery/nuclei-templates/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22%F0%9F%92%8E%20Bounty%22).
->>>>>>> projectdiscovery-main
 
 
 <p align="left">

diff --git a/README_CN.md b/README_CN.md
@@ -61,15 +61,7 @@ Nuclei使用零误报的定制模板向目标发送请求，同时可以对主
 Nuclei需要 **go1.21** 才能安装成功。执行下列命令安装最新版本的Nuclei
 
 ```sh
-<<<<<<< HEAD
-go install -v github.com/Explorer1092/nuclei/v3/cmd/nuclei@latest
-=======
-<<<<<<< HEAD
-go install -v github.com/Explorer1092/nuclei/v2/cmd/nuclei@latest
-=======
 go install -v github.com/projectdiscovery/nuclei/v3/cmd/nuclei@latest
->>>>>>> 419f08f61ce5ca2d3f0eae9fe36dc7c44c1f532a
->>>>>>> projectdiscovery-main
 ```
 
 <details>
@@ -420,7 +412,7 @@ Nuclei构建很简单，通过数百名安全研究员的社区模板，Nuclei
 
 ### 将nuclei加入您的代码
 
-有关使用Nuclei作为Library/SDK的完整指南，请访问[godoc](https://pkg.go.dev/github.com/Explorer1092/nuclei/v3/lib#section-readme)
+有关使用Nuclei作为Library/SDK的完整指南，请访问[godoc](https://pkg.go.dev/github.com/projectdiscovery/nuclei/v3/lib#section-readme)
 
 ### 资源
 

diff --git a/README_ID.md b/README_ID.md
@@ -56,15 +56,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
-<<<<<<< HEAD
-go install -v github.com/Explorer1092/nuclei/v3/cmd/nuclei@latest
-=======
-<<<<<<< HEAD
-go install -v github.com/Explorer1092/nuclei/v2/cmd/nuclei@latest
-=======
 go install -v github.com/projectdiscovery/nuclei/v3/cmd/nuclei@latest
->>>>>>> 419f08f61ce5ca2d3f0eae9fe36dc7c44c1f532a
->>>>>>> projectdiscovery-main
 ```
 
 **Metode [instalasi lain dapat ditemukan di sini](https://nuclei.projectdiscovery.io/nuclei/get-started/).**

diff --git a/README_KR.md b/README_KR.md
@@ -54,15 +54,7 @@ Nuclei는 템플릿을 기반으로 대상 간에 요청을 보내기 위해 사
 Nuclei를 성공적으로 설치하기 위해서 **go1.21**가 필요합니다. 다음 명령을 실행하여 최신 버전을 설치합니다.
 
 ```sh
-<<<<<<< HEAD
-go install -v github.com/Explorer1092/nuclei/v3/cmd/nuclei@latest
-=======
-<<<<<<< HEAD
-go install -v github.com/Explorer1092/nuclei/v2/cmd/nuclei@latest
-=======
 go install -v github.com/projectdiscovery/nuclei/v3/cmd/nuclei@latest
->>>>>>> 419f08f61ce5ca2d3f0eae9fe36dc7c44c1f532a
->>>>>>> projectdiscovery-main
 ```
 
 **자세한 설치 방법은 [여기](https://nuclei.projectdiscovery.io/nuclei/get-started/)에서 찾을 수 있습니다.**

diff --git a/cmd/docgen/docgen.go b/cmd/docgen/docgen.go
@@ -11,18 +11,10 @@ import (
 
 	"github.com/invopop/jsonschema"
 
-<<<<<<< HEAD
-	"github.com/Explorer1092/nuclei/v3/pkg/templates"
-=======
-<<<<<<< HEAD:v2/cmd/docgen/docgen.go
-	"github.com/Explorer1092/nuclei/v2/pkg/templates"
-=======
 	"github.com/projectdiscovery/nuclei/v3/pkg/templates"
->>>>>>> 419f08f61ce5ca2d3f0eae9fe36dc7c44c1f532a:cmd/docgen/docgen.go
->>>>>>> projectdiscovery-main
 )
 
-var pathRegex = regexp.MustCompile(`github\.com/Explorer1092/nuclei/v3/(?: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/cmd/functional-test/main.go b/cmd/functional-test/main.go
@@ -12,15 +12,7 @@ import (
 	"github.com/logrusorgru/aurora"
 	"github.com/pkg/errors"
 
-<<<<<<< HEAD
-	"github.com/Explorer1092/nuclei/v3/pkg/testutils"
-=======
-<<<<<<< HEAD:v2/cmd/functional-test/main.go
-	"github.com/Explorer1092/nuclei/v2/pkg/testutils"
-=======
 	"github.com/projectdiscovery/nuclei/v3/pkg/testutils"
->>>>>>> 419f08f61ce5ca2d3f0eae9fe36dc7c44c1f532a:cmd/functional-test/main.go
->>>>>>> projectdiscovery-main
 )
 
 var (

diff --git a/cmd/functional-test/run.sh b/cmd/functional-test/run.sh
@@ -20,15 +20,7 @@ echo "::group::Installing nuclei templates"
 echo "::endgroup::"
 
 echo "::group::Building latest release of nuclei"
-<<<<<<< HEAD
-go build -o nuclei$extension -v github.com/Explorer1092/nuclei/v3/cmd/nuclei
-=======
-<<<<<<< HEAD:v2/cmd/functional-test/run.sh
-go build -o nuclei$extension -v github.com/Explorer1092/nuclei/v2/cmd/nuclei
-=======
 go build -o nuclei$extension -v github.com/projectdiscovery/nuclei/v3/cmd/nuclei
->>>>>>> 419f08f61ce5ca2d3f0eae9fe36dc7c44c1f532a:cmd/functional-test/run.sh
->>>>>>> projectdiscovery-main
 echo "::endgroup::"
 
 echo 'Starting Nuclei functional test'

diff --git a/cmd/integration-test/code.go b/cmd/integration-test/code.go
@@ -8,9 +8,9 @@ import (
 
 	osutils "github.com/projectdiscovery/utils/os"
 
-	"github.com/Explorer1092/nuclei/v3/pkg/templates"
-	"github.com/Explorer1092/nuclei/v3/pkg/templates/signer"
-	"github.com/Explorer1092/nuclei/v3/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 isCodeDisabled = func() bool { return osutils.IsWindows() && os.Getenv("CI") == "true" }

diff --git a/cmd/integration-test/custom-dir.go b/cmd/integration-test/custom-dir.go
@@ -3,15 +3,7 @@ package main
 import (
 	"os"
 
-<<<<<<< HEAD
-	"github.com/Explorer1092/nuclei/v3/pkg/testutils"
-=======
-<<<<<<< HEAD:v2/cmd/integration-test/custom-dir.go
-	"github.com/Explorer1092/nuclei/v2/pkg/testutils"
-=======
 	"github.com/projectdiscovery/nuclei/v3/pkg/testutils"
->>>>>>> 419f08f61ce5ca2d3f0eae9fe36dc7c44c1f532a:cmd/integration-test/custom-dir.go
->>>>>>> projectdiscovery-main
 )
 
 type customConfigDirTest struct{}

diff --git a/cmd/integration-test/dns.go b/cmd/integration-test/dns.go
@@ -1,15 +1,7 @@
 package main
 
 import (
-<<<<<<< HEAD
-	"github.com/Explorer1092/nuclei/v3/pkg/testutils"
-=======
-<<<<<<< HEAD:v2/cmd/integration-test/dns.go
-	"github.com/Explorer1092/nuclei/v2/pkg/testutils"
-=======
 	"github.com/projectdiscovery/nuclei/v3/pkg/testutils"
->>>>>>> 419f08f61ce5ca2d3f0eae9fe36dc7c44c1f532a:cmd/integration-test/dns.go
->>>>>>> projectdiscovery-main
 )
 
 var dnsTestCases = []TestCaseInfo{

diff --git a/cmd/integration-test/dsl.go b/cmd/integration-test/dsl.go
@@ -5,8 +5,8 @@ import (
 	"net/http"
 	"net/http/httptest"
 
-	"github.com/Explorer1092/nuclei/v3/pkg/testutils"
 	"github.com/julienschmidt/httprouter"
+	"github.com/projectdiscovery/nuclei/v3/pkg/testutils"
 )
 
 var dslTestcases = []TestCaseInfo{

diff --git a/cmd/integration-test/file.go b/cmd/integration-test/file.go
@@ -1,15 +1,7 @@
 package main
 
 import (
-<<<<<<< HEAD
-	"github.com/Explorer1092/nuclei/v3/pkg/testutils"
-=======
-<<<<<<< HEAD:v2/cmd/integration-test/file.go
-	"github.com/Explorer1092/nuclei/v2/pkg/testutils"
-=======
 	"github.com/projectdiscovery/nuclei/v3/pkg/testutils"
->>>>>>> 419f08f61ce5ca2d3f0eae9fe36dc7c44c1f532a:cmd/integration-test/file.go
->>>>>>> projectdiscovery-main
 )
 
 var fileTestcases = []TestCaseInfo{

diff --git a/cmd/integration-test/flow.go b/cmd/integration-test/flow.go
@@ -6,8 +6,8 @@ import (
 	"net/http"
 	"net/http/httptest"
 
-	"github.com/Explorer1092/nuclei/v3/pkg/testutils"
 	"github.com/julienschmidt/httprouter"
+	"github.com/projectdiscovery/nuclei/v3/pkg/testutils"
 )
 
 var flowTestcases = []TestCaseInfo{

diff --git a/cmd/integration-test/fuzz.go b/cmd/integration-test/fuzz.go
@@ -7,19 +7,9 @@ import (
 	"net/http/httptest"
 	"net/url"
 
-	"github.com/Explorer1092/nuclei/v3/pkg/output"
-	"github.com/Explorer1092/nuclei/v3/pkg/testutils"
 	"github.com/julienschmidt/httprouter"
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD:v2/cmd/integration-test/fuzz.go
-	"github.com/Explorer1092/nuclei/v2/pkg/output"
-	"github.com/Explorer1092/nuclei/v2/pkg/testutils"
-=======
 	"github.com/projectdiscovery/nuclei/v3/pkg/output"
 	"github.com/projectdiscovery/nuclei/v3/pkg/testutils"
->>>>>>> 419f08f61ce5ca2d3f0eae9fe36dc7c44c1f532a:cmd/integration-test/fuzz.go
->>>>>>> projectdiscovery-main
 )
 
 const (
@@ -210,4 +200,4 @@ func (h *fuzzMultipleMode) Execute(filePath string) error {
 		return err
 	}
 	return expectResultsCount(got, 1)
-}
+}
diff --git a/cmd/integration-test/generic.go b/cmd/integration-test/generic.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/julienschmidt/httprouter"
 
-	"github.com/Explorer1092/nuclei/v3/pkg/testutils"
+	"github.com/projectdiscovery/nuclei/v3/pkg/testutils"
 	permissionutil "github.com/projectdiscovery/utils/permission"
 )
 

diff --git a/cmd/integration-test/headless.go b/cmd/integration-test/headless.go
@@ -7,15 +7,7 @@ import (
 
 	"github.com/julienschmidt/httprouter"
 
-<<<<<<< HEAD
-	"github.com/Explorer1092/nuclei/v3/pkg/testutils"
-=======
-<<<<<<< HEAD:v2/cmd/integration-test/headless.go
-	"github.com/Explorer1092/nuclei/v2/pkg/testutils"
-=======
 	"github.com/projectdiscovery/nuclei/v3/pkg/testutils"
->>>>>>> 419f08f61ce5ca2d3f0eae9fe36dc7c44c1f532a:cmd/integration-test/headless.go
->>>>>>> projectdiscovery-main
 )
 
 var headlessTestcases = []TestCaseInfo{

diff --git a/cmd/integration-test/http.go b/cmd/integration-test/http.go
@@ -17,15 +17,7 @@ import (
 	"github.com/julienschmidt/httprouter"
 	"gopkg.in/yaml.v2"
 
-<<<<<<< HEAD
-	"github.com/Explorer1092/nuclei/v3/pkg/testutils"
-=======
-<<<<<<< HEAD:v2/cmd/integration-test/http.go
-	"github.com/Explorer1092/nuclei/v2/pkg/testutils"
-=======
 	"github.com/projectdiscovery/nuclei/v3/pkg/testutils"
->>>>>>> 419f08f61ce5ca2d3f0eae9fe36dc7c44c1f532a:cmd/integration-test/http.go
->>>>>>> projectdiscovery-main
 	"github.com/projectdiscovery/retryablehttp-go"
 	errorutil "github.com/projectdiscovery/utils/errors"
 	logutil "github.com/projectdiscovery/utils/log"

diff --git a/cmd/integration-test/integration-test.go b/cmd/integration-test/integration-test.go
@@ -10,19 +10,9 @@ import (
 	"github.com/kitabisa/go-ci"
 	"github.com/logrusorgru/aurora"
 
-<<<<<<< HEAD
-	"github.com/Explorer1092/nuclei/v3/pkg/testutils"
-	"github.com/Explorer1092/nuclei/v3/pkg/testutils/fuzzplayground"
-	"github.com/projectdiscovery/gologger"
-=======
-<<<<<<< HEAD:v2/cmd/integration-test/integration-test.go
-	"github.com/Explorer1092/nuclei/v2/pkg/testutils"
-=======
 	"github.com/projectdiscovery/gologger"
 	"github.com/projectdiscovery/nuclei/v3/pkg/testutils"
 	"github.com/projectdiscovery/nuclei/v3/pkg/testutils/fuzzplayground"
->>>>>>> 419f08f61ce5ca2d3f0eae9fe36dc7c44c1f532a:cmd/integration-test/integration-test.go
->>>>>>> projectdiscovery-main
 	sliceutil "github.com/projectdiscovery/utils/slice"
 )
 

diff --git a/cmd/integration-test/javascript.go b/cmd/integration-test/javascript.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/ory/dockertest/v3"
-	"github.com/Explorer1092/nuclei/v3/pkg/testutils"
+	"github.com/projectdiscovery/nuclei/v3/pkg/testutils"
 	osutils "github.com/projectdiscovery/utils/os"
 	"go.uber.org/multierr"
 )

diff --git a/cmd/integration-test/library.go b/cmd/integration-test/library.go
@@ -11,46 +11,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Explorer1092/nuclei/v3/pkg/catalog/config"
-	"github.com/Explorer1092/nuclei/v3/pkg/catalog/disk"
-	"github.com/Explorer1092/nuclei/v3/pkg/catalog/loader"
-	"github.com/Explorer1092/nuclei/v3/pkg/core"
-	"github.com/Explorer1092/nuclei/v3/pkg/input/provider"
-	parsers "github.com/Explorer1092/nuclei/v3/pkg/loader/workflow"
-	"github.com/Explorer1092/nuclei/v3/pkg/output"
-	"github.com/Explorer1092/nuclei/v3/pkg/protocols"
-	"github.com/Explorer1092/nuclei/v3/pkg/protocols/common/hosterrorscache"
-	"github.com/Explorer1092/nuclei/v3/pkg/protocols/common/interactsh"
-	"github.com/Explorer1092/nuclei/v3/pkg/protocols/common/protocolinit"
-	"github.com/Explorer1092/nuclei/v3/pkg/protocols/common/protocolstate"
-	"github.com/Explorer1092/nuclei/v3/pkg/reporting"
-	"github.com/Explorer1092/nuclei/v3/pkg/templates"
-	"github.com/Explorer1092/nuclei/v3/pkg/testutils"
-	"github.com/Explorer1092/nuclei/v3/pkg/types"
 	"github.com/julienschmidt/httprouter"
 	"github.com/logrusorgru/aurora"
 	"github.com/pkg/errors"
 	"github.com/projectdiscovery/goflags"
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD:v2/cmd/integration-test/code.go
-	"github.com/Explorer1092/nuclei/v2/pkg/catalog/config"
-	"github.com/Explorer1092/nuclei/v2/pkg/catalog/disk"
-	"github.com/Explorer1092/nuclei/v2/pkg/catalog/loader"
-	"github.com/Explorer1092/nuclei/v2/pkg/core"
-	"github.com/Explorer1092/nuclei/v2/pkg/core/inputs"
-	"github.com/Explorer1092/nuclei/v2/pkg/output"
-	"github.com/Explorer1092/nuclei/v2/pkg/parsers"
-	"github.com/Explorer1092/nuclei/v2/pkg/protocols"
-	"github.com/Explorer1092/nuclei/v2/pkg/protocols/common/contextargs"
-	"github.com/Explorer1092/nuclei/v2/pkg/protocols/common/hosterrorscache"
-	"github.com/Explorer1092/nuclei/v2/pkg/protocols/common/interactsh"
-	"github.com/Explorer1092/nuclei/v2/pkg/protocols/common/protocolinit"
-	"github.com/Explorer1092/nuclei/v2/pkg/protocols/common/protocolstate"
-	"github.com/Explorer1092/nuclei/v2/pkg/reporting"
-	"github.com/Explorer1092/nuclei/v2/pkg/testutils"
-	"github.com/Explorer1092/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"
@@ -67,8 +31,6 @@ import (
 	"github.com/projectdiscovery/nuclei/v3/pkg/templates"
 	"github.com/projectdiscovery/nuclei/v3/pkg/testutils"
 	"github.com/projectdiscovery/nuclei/v3/pkg/types"
->>>>>>> 419f08f61ce5ca2d3f0eae9fe36dc7c44c1f532a:cmd/integration-test/library.go
->>>>>>> projectdiscovery-main
 	"github.com/projectdiscovery/ratelimit"
 )