Skip to content

Commit 0344a14

Browse files
author
wesky2012
committed
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
2 parents 28a878f + 35b1f2d commit 0344a14

File tree

371 files changed

+12028
-2600
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

371 files changed

+12028
-2600
lines changed
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
name: Bug Report
2+
description: Create a report to help us to improve the Nuclei.
3+
title: "[BUG] ..."
4+
labels: ["Type: Bug"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Thanks for taking the time to fill out this bug report!
10+
11+
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.
12+
13+
:warning: **Issues missing important information may be closed without further investigation.**
14+
- type: checkboxes
15+
attributes:
16+
label: Is there an existing issue for this?
17+
description: Please search to see if an issue already exists for the bug you encountered.
18+
options:
19+
- label: I have searched the existing issues.
20+
required: true
21+
- type: textarea
22+
attributes:
23+
label: Current Behavior
24+
description: A concise description of what you're experiencing.
25+
validations:
26+
required: true
27+
- type: textarea
28+
attributes:
29+
label: Expected Behavior
30+
description: A concise description of what you expected to happen.
31+
validations:
32+
required: true
33+
- type: textarea
34+
attributes:
35+
label: Steps To Reproduce
36+
description: |
37+
Steps to reproduce the behavior, for example, commands to run Nuclei.
38+
39+
:warning: **Please redact any literal target hosts/URLs or other sensitive information.**
40+
placeholder: |
41+
1. Run `nuclei -t ...`
42+
validations:
43+
required: true
44+
- type: textarea
45+
attributes:
46+
label: Relevant log output
47+
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
48+
render: shell
49+
- type: textarea
50+
attributes:
51+
label: Environment
52+
description: |
53+
Examples:
54+
- **OS**: Ubuntu 20.04
55+
- **Nuclei** (`nuclei -version`): v3.3.1
56+
- **Go** (`go version`): go1.22.0 _(only if you've installed it via the `go install` command)_
57+
value: |
58+
- OS:
59+
- Nuclei:
60+
- Go:
61+
render: markdown
62+
validations:
63+
required: true
64+
- type: textarea
65+
attributes:
66+
label: Anything else?
67+
description: |
68+
Links? References? Templates? Anything that will give us more context about the issue you are encountering!
69+
70+
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
71+
validations:
72+
required: false
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Feature Request
2+
description: Request feature to implement in the Nuclei.
3+
title: "[FEATURE] ..."
4+
labels: ["Type: Enhancement"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Thanks for taking the time to fill out this feature request!
10+
11+
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.
12+
13+
Join our [Discord server](https://discord.gg/projectdiscovery) to discuss the idea on the **#nuclei** channel.
14+
- type: textarea
15+
attributes:
16+
label: Describe your feature request
17+
description: A clear and concise description of feature to implement.
18+
validations:
19+
required: true
20+
- type: textarea
21+
attributes:
22+
label: Describe the use case of the feature
23+
description: A clear and concise description of the feature request's motivation and the use-cases in which it could be useful.
24+
validations:
25+
required: true
26+
- type: textarea
27+
attributes:
28+
label: Describe alternatives you've considered
29+
description: A clear and concise description of any alternative solutions or features you've considered.
30+
validations:
31+
required: false
32+
- type: textarea
33+
attributes:
34+
label: Additional context
35+
description: Add any other context about the feature request here.
36+
validations:
37+
required: false

.github/auto_assign.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
addReviewers: true
2+
reviewers:
3+
- dogancanbakir
4+
- dwisiswant0
5+
6+
numberOfReviewers: 1
7+
skipKeywords:
8+
- '@dependabot'

.github/workflows/dep-auto-merge.yml renamed to .github/workflows/auto-merge.yaml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
1-
name: 🤖 dep auto merge
1+
name: 🤖 Auto Merge
22

33
on:
4-
pull_request:
5-
branches:
6-
- dev
7-
workflow_dispatch:
4+
pull_request_review:
5+
types: [submitted]
6+
workflow_run:
7+
workflows: ["♾️ Compatibility Check"]
8+
types:
9+
- completed
810

911
permissions:
1012
pull-requests: write
1113
issues: write
1214
repository-projects: write
1315

1416
jobs:
15-
automerge:
17+
auto-merge:
1618
runs-on: ubuntu-latest
1719
if: github.actor == 'dependabot[bot]'
1820
steps:
19-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
2022
with:
2123
token: ${{ secrets.DEPENDABOT_PAT }}
2224

.github/workflows/build-test.yml

Lines changed: 0 additions & 74 deletions
This file was deleted.

.github/workflows/codeql-analysis.yml

Lines changed: 0 additions & 39 deletions
This file was deleted.
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: ♾️ Compatibility Check
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize]
6+
branches:
7+
- dev
8+
9+
jobs:
10+
check:
11+
if: github.actor == 'dependabot[bot]'
12+
strategy:
13+
matrix:
14+
os: [ubuntu-latest, windows-latest, macOS-latest]
15+
runs-on: ${{ matrix.os }}
16+
steps:
17+
- uses: actions/checkout@v4
18+
- uses: projectdiscovery/actions/setup/go@v1
19+
- run: go mod download && go mod verify && go vet ./...

.github/workflows/dockerhub-push.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: 🌥 Docker Push
1+
name: 🐳 Docker Push
22

33
on:
44
workflow_run:
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest-16-cores
1313
steps:
1414
- name: Git Checkout
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616

1717
- name: Get GitHub tag
1818
id: meta

.github/workflows/functional-test.yml

Lines changed: 0 additions & 33 deletions
This file was deleted.
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: ⏰ Generate Docs
2+
3+
on:
4+
push:
5+
branches:
6+
- dev
7+
workflow_dispatch:
8+
9+
jobs:
10+
publish-docs:
11+
if: "${{ !endsWith(github.actor, '[bot]') }}"
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v4
15+
- uses: projectdiscovery/actions/setup/go@v1
16+
- uses: projectdiscovery/actions/setup/git@v1
17+
- run: make syntax-docs
18+
- run: git status -s | wc -l | xargs -I {} echo CHANGES={} >> $GITHUB_OUTPUT
19+
id: status
20+
- uses: projectdiscovery/actions/commit@v1
21+
if: steps.status.outputs.CHANGES > 0
22+
with:
23+
files: |
24+
SYNTAX-REFERENCE.md
25+
nuclei-jsonschema.json
26+
message: 'docs: update syntax & JSON schema 🤖'
27+
- run: git push origin $GITHUB_REF

0 commit comments

Comments
 (0)