fix merge conflict

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -0,0 +1,72 @@
+name: Bug Report
+description: Create a report to help us to improve the Nuclei.
+title: "[BUG] ..."
+labels: ["Type: Bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+
+        For support requests, FAQs or "How to" questions, please use the [GitHub Discussions](https://github.com/projectdiscovery/nuclei/discussions) section instead or join our [Discord server](https://discord.gg/projectdiscovery) to discuss the idea on the **#nuclei** channel.
+
+        :warning: **Issues missing important information may be closed without further investigation.**
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this?
+      description: Please search to see if an issue already exists for the bug you encountered.
+      options:
+      - label: I have searched the existing issues.
+        required: true
+  - type: textarea
+    attributes:
+      label: Current Behavior
+      description: A concise description of what you're experiencing.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected Behavior
+      description: A concise description of what you expected to happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps To Reproduce
+      description: |
+        Steps to reproduce the behavior, for example, commands to run Nuclei.
+
+        :warning: **Please redact any literal target hosts/URLs or other sensitive information.**
+      placeholder: |
+        1. Run `nuclei -t ...`
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+  - type: textarea
+    attributes:
+      label: Environment
+      description: |
+        Examples:
+          - **OS**: Ubuntu 20.04
+          - **Nuclei** (`nuclei -version`): v3.3.1
+          - **Go** (`go version`): go1.22.0 _(only if you've installed it via the `go install` command)_
+      value: |
+          - OS: 
+          - Nuclei: 
+          - Go: 
+      render: markdown
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Anything else?
+      description: |
+        Links? References? Templates? Anything that will give us more context about the issue you are encountering!
+
+        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -0,0 +1,37 @@
+name: Feature Request
+description: Request feature to implement in the Nuclei.
+title: "[FEATURE] ..."
+labels: ["Type: Enhancement"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this feature request!
+
+        Please make sure to provide a detailed description with all the relevant information that might be required to start working on this feature. In case you are not sure about your request or whether the particular feature is already supported or not, please [start a discussion](https://github.com/projectdiscovery/nuclei/discussions/categories/ideas) instead.
+
+        Join our [Discord server](https://discord.gg/projectdiscovery) to discuss the idea on the **#nuclei** channel.
+  - type: textarea
+    attributes:
+      label: Describe your feature request
+      description: A clear and concise description of feature to implement.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe the use case of the feature
+      description: A clear and concise description of the feature request's motivation and the use-cases in which it could be useful.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe alternatives you've considered
+      description: A clear and concise description of any alternative solutions or features you've considered.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context about the feature request here.
+    validations:
+      required: false

.github/auto_assign.yml

@@ -0,0 +1,8 @@
+addReviewers: true
+reviewers:
+  - dogancanbakir
+  - dwisiswant0
+
+numberOfReviewers: 1
+skipKeywords:
+  - '@dependabot'

.github/workflows/build-test.yml

@@ -12,28 +12,23 @@ jobs:
     name: Test Builds
     strategy:
       matrix:
-        go-version: [1.21.x]
         os: [ubuntu-latest, windows-latest, macOS-latest]
-
     runs-on: ${{ matrix.os }}
     steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
       - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: ${{ matrix.go-version }}
+        uses: projectdiscovery/actions/setup/go@v1
 
-      - name: Set up Python   # required for running python code in py-snippet.yaml integration test
+      # required for running python code in py-snippet.yaml integration test
+      - name: Set up Python
         uses: actions/setup-python@v4
         with:
           python-version: '3.10'
 
-      - name: Check out code
-        uses: actions/checkout@v3
-
-      - name: Go Mod hygiene
-        run: |
-          go clean -modcache
-          go mod tidy
+      - name: Verify Go modules
+        run: make verify
 
       - name: Build
         run: go build .
@@ -42,13 +37,15 @@ jobs:
       - name: Test
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          PDCP_API_KEY: "${{ secrets.PDCP_API_KEY }}"
         run: go test ./...
 
       - name: Integration Tests
         timeout-minutes: 50
         env:
           GH_ACTION: true
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          PDCP_API_KEY: "${{ secrets.PDCP_API_KEY }}"
         run: |
           chmod +x run.sh
           bash run.sh ${{ matrix.os }}
@@ -63,6 +60,11 @@ jobs:
         run: go run .
         working-directory: examples/simple/
 
-      - name: Example SDK Advanced
+      # Temporarily disabled very flaky in github actions
+      # - name: Example SDK Advanced
+      #   run: go run .
+      #   working-directory: examples/advanced/
+
+      - name: Example SDK with speed control
         run: go run .
-        working-directory: examples/advanced/
+        working-directory: examples/with_speed_control/

.github/workflows/functional-test.yml

@@ -15,13 +15,11 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: 1.21.x
-
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: projectdiscovery/actions/setup/go@v1
 
       - name: Functional Tests
         env:

.github/workflows/lint-test.yml

@@ -12,16 +12,11 @@ jobs:
     name: Lint Test
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: 1.21.x
-
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: projectdiscovery/actions/setup/go@v1
 
       - name: Run golangci-lint
-        uses: golangci/[email protected]
-        with:
-          version: latest
-          args: --timeout 5m
+        uses: projectdiscovery/actions/golangci-lint@v1

.github/workflows/performance-test.yaml

@@ -11,23 +11,19 @@ jobs:
     name: Test Performance
     strategy:
       matrix:
-        go-version: [1.21.x]
         os: [ubuntu-latest, macOS-latest]
 
     runs-on: ${{ matrix.os }}
+    if: github.repository == 'projectdiscovery/nuclei'
     steps:
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: ${{ matrix.go-version }}
-
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: projectdiscovery/actions/setup/go@v1
 
-      - name: Go Mod hygine
-        run: |
-          go clean -modcache
-          go mod tidy
+      - name: Verify Go modules
+        run: make verify
 
       # Max GH exection time 6H => timeout after that
       - name: Running performance with big list

.github/workflows/publish-docs.yaml

@@ -11,14 +11,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with: 
           fetch-depth: 0
 
       - name: "Set up Go"
-        uses: actions/setup-go@v4
-        with: 
-          go-version: 1.21.x
+        uses: projectdiscovery/actions/setup/go@v1
+
+      - name: "Set up Git"
+        uses: projectdiscovery/actions/setup/git@v1
 
       - name: Generate YAML Syntax Documentation
         id: generate-docs
@@ -29,14 +30,12 @@ jobs:
           fi
           go generate pkg/templates/templates.go
           go build -o "cmd/docgen/docgen" cmd/docgen/docgen.go 
-          ./cmd/docgen/docgen ../SYNTAX-REFERENCE.md ../nuclei-jsonschema.json
+          ./cmd/docgen/docgen SYNTAX-REFERENCE.md nuclei-jsonschema.json
           git status -s | wc -l | xargs -I {} echo CHANGES={} >> $GITHUB_OUTPUT
 
       - name: Commit files
         if: steps.generate-docs.outputs.CHANGES > 0
         run: |
-          git config --local user.email "[email protected]"
-          git config --local user.name "GitHub Action"
           git add SYNTAX-REFERENCE.md nuclei-jsonschema.json
           git commit -m "Auto Generate Syntax Docs + JSONSchema [$(date)] :robot:" -a
 

.github/workflows/release-binary.yml

@@ -9,20 +9,17 @@ on:
 jobs: 
   release: 
     runs-on: ubuntu-latest-16-cores
-
     steps: 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with: 
           fetch-depth: 0
 
-      - uses: actions/setup-go@v4
-        with: 
-          go-version: 1.21.x
+      - name: Set up Go
+        uses: projectdiscovery/actions/setup/go@v1
 
-      - uses: goreleaser/goreleaser-action@v4
+      - uses: projectdiscovery/actions/goreleaser@v1
         with: 
-          args: "release --rm-dist"
-          version: latest
+          release: true
         env: 
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           SLACK_WEBHOOK: "${{ secrets.RELEASE_SLACK_WEBHOOK }}"