Skip to content

Commit

Permalink
Merge branch 'projectdiscovery-main'
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
wesky2012 committed Nov 25, 2024
2 parents 28a878f + 35b1f2d commit 0344a14
Show file tree
Hide file tree
Showing 371 changed files with 12,028 additions and 2,600 deletions.
72 changes: 72 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
@@ -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
37 changes: 37 additions & 0 deletions .github/ISSUE_TEMPLATE/feature-request.yml
Original file line number Diff line number Diff line change
@@ -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
8 changes: 8 additions & 0 deletions .github/auto_assign.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
addReviewers: true
reviewers:
- dogancanbakir
- dwisiswant0

numberOfReviewers: 1
skipKeywords:
- '@dependabot'
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
name: 🤖 dep auto merge
name: 🤖 Auto Merge

on:
pull_request:
branches:
- dev
workflow_dispatch:
pull_request_review:
types: [submitted]
workflow_run:
workflows: ["♾️ Compatibility Check"]
types:
- completed

permissions:
pull-requests: write
issues: write
repository-projects: write

jobs:
automerge:
auto-merge:
runs-on: ubuntu-latest
if: github.actor == 'dependabot[bot]'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
token: ${{ secrets.DEPENDABOT_PAT }}

Expand Down
74 changes: 0 additions & 74 deletions .github/workflows/build-test.yml

This file was deleted.

39 changes: 0 additions & 39 deletions .github/workflows/codeql-analysis.yml

This file was deleted.

19 changes: 19 additions & 0 deletions .github/workflows/compability-check.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: ♾️ Compatibility Check

on:
pull_request:
types: [opened, synchronize]
branches:
- dev

jobs:
check:
if: github.actor == 'dependabot[bot]'
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macOS-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: projectdiscovery/actions/setup/go@v1
- run: go mod download && go mod verify && go vet ./...
4 changes: 2 additions & 2 deletions .github/workflows/dockerhub-push.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 🌥 Docker Push
name: 🐳 Docker Push

on:
workflow_run:
Expand All @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest-16-cores
steps:
- name: Git Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Get GitHub tag
id: meta
Expand Down
33 changes: 0 additions & 33 deletions .github/workflows/functional-test.yml

This file was deleted.

27 changes: 27 additions & 0 deletions .github/workflows/generate-docs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: ⏰ Generate Docs

on:
push:
branches:
- dev
workflow_dispatch:

jobs:
publish-docs:
if: "${{ !endsWith(github.actor, '[bot]') }}"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: projectdiscovery/actions/setup/go@v1
- uses: projectdiscovery/actions/setup/git@v1
- run: make syntax-docs
- run: git status -s | wc -l | xargs -I {} echo CHANGES={} >> $GITHUB_OUTPUT
id: status
- uses: projectdiscovery/actions/commit@v1
if: steps.status.outputs.CHANGES > 0
with:
files: |
SYNTAX-REFERENCE.md
nuclei-jsonschema.json
message: 'docs: update syntax & JSON schema 🤖'
- run: git push origin $GITHUB_REF
27 changes: 0 additions & 27 deletions .github/workflows/lint-test.yml

This file was deleted.

Loading

0 comments on commit 0344a14

Please sign in to comment.