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 @@