From dc44105bafcc2858d507d941d31592de24be230e Mon Sep 17 00:00:00 2001 From: Tarun Koyalwar <45962551+tarunKoyalwar@users.noreply.github.com> Date: Tue, 17 Oct 2023 17:44:13 +0530 Subject: [PATCH] nuclei v3 : misc updates (#4247) * use parsed options while signing * update project layout to v3 * fix .gitignore * remove example template * misc updates * bump tlsx version * hide template sig warning with env * js: retain value while using log * fix nil pointer derefernce * misc doc update --------- Co-authored-by: sandeep <8293321+ehsandeep@users.noreply.github.com> --- .github/dependabot.yml | 2 +- .github/workflows/build-test.yml | 10 +- .github/workflows/functional-test.yml | 2 +- .github/workflows/lint-test.yml | 3 +- .github/workflows/performance-test.yaml | 3 +- .github/workflows/publish-docs.yaml | 1 - .github/workflows/release-binary.yml | 1 - .github/workflows/release-test.yml | 3 +- .github/workflows/template-validate.yml | 2 +- .gitignore | 40 +++---- v2/.goreleaser.yml => .goreleaser.yml | 0 .run/DSLFunctionsIT.run.xml | 4 +- .run/RegressionTests.run.xml | 4 +- .run/UnitTests.run.xml | 2 +- DESIGN.md | 106 +++++++++--------- Dockerfile | 4 +- v2/Makefile => Makefile | 2 +- README.md | 4 +- README_CN.md | 2 +- README_ID.md | 2 +- README_KR.md | 2 +- {v2/cmd => cmd}/docgen/docgen.go | 4 +- {v2/cmd => cmd}/functional-test/main.go | 2 +- {v2/cmd => cmd}/functional-test/run.sh | 2 +- .../functional-test/targets-1000.txt | 0 .../functional-test/targets-150.txt | 0 .../functional-test/targets-250.txt | 0 {v2/cmd => cmd}/functional-test/targets.txt | 0 {v2/cmd => cmd}/functional-test/testcases.txt | 0 {v2/cmd => cmd}/generate-checksum/main.go | 0 {v2/cmd => cmd}/integration-test/code.go | 6 +- .../integration-test/custom-dir.go | 2 +- {v2/cmd => cmd}/integration-test/dns.go | 2 +- {v2/cmd => cmd}/integration-test/dsl.go | 2 +- {v2/cmd => cmd}/integration-test/file.go | 2 +- {v2/cmd => cmd}/integration-test/flow.go | 2 +- {v2/cmd => cmd}/integration-test/fuzz.go | 4 +- {v2/cmd => cmd}/integration-test/generic.go | 2 +- {v2/cmd => cmd}/integration-test/headless.go | 2 +- {v2/cmd => cmd}/integration-test/http.go | 2 +- .../integration-test/integration-test.go | 2 +- .../integration-test/interactsh.go | 0 .../integration-test/javascript.go | 2 +- {v2/cmd => cmd}/integration-test/library.go | 32 +++--- {v2/cmd => cmd}/integration-test/loader.go | 2 +- {v2/cmd => cmd}/integration-test/multi.go | 2 +- {v2/cmd => cmd}/integration-test/network.go | 2 +- .../integration-test/offline-http.go | 2 +- {v2/cmd => cmd}/integration-test/ssl.go | 2 +- .../integration-test/template-dir.go | 2 +- .../integration-test/template-path.go | 6 +- {v2/cmd => cmd}/integration-test/websocket.go | 2 +- {v2/cmd => cmd}/integration-test/whois.go | 2 +- {v2/cmd => cmd}/integration-test/workflow.go | 2 +- .../nuclei/issue-tracker-config.yaml | 0 {v2/cmd => cmd}/nuclei/main.go | 30 ++--- {v2/cmd => cmd}/tmc/main.go | 14 +-- {v2/cmd => cmd}/tmc/types.go | 0 {v2/cmd => cmd}/tools/fuzzplayground/main.go | 0 docs/getting-started/install.mdx | 4 +- docs/getting-started/running.mdx | 2 +- docs/template-guide/javascript.mdx | 2 +- .../advanced/advanced.go | 2 +- {v2/examples => examples}/simple/simple.go | 2 +- v2/gh_retry.sh => gh_retry.sh | 0 v2/go.mod => go.mod | 4 +- v2/go.sum => go.sum | 4 +- integration_tests/debug.sh | 6 +- .../protocols/code/py-env-var.yaml | 2 +- integration_tests/protocols/code/py-file.yaml | 2 +- .../protocols/code/py-interactsh.yaml | 2 +- .../protocols/code/py-snippet.yaml | 2 +- integration_tests/run.sh | 8 +- .../colorizer/colorizer.go | 2 +- {v2/internal => internal}/installer/doc.go | 0 .../installer/template.go | 4 +- .../installer/template_test.go | 2 +- {v2/internal => internal}/installer/util.go | 2 +- .../installer/versioncheck.go | 2 +- .../installer/versioncheck_test.go | 2 +- .../installer/zipslip_unix_test.go | 0 {v2/internal => internal}/runner/banner.go | 2 +- {v2/internal => internal}/runner/cloud.go | 6 +- {v2/internal => internal}/runner/defaults.go | 0 {v2/internal => internal}/runner/doc.go | 0 {v2/internal => internal}/runner/enumerate.go | 14 +-- .../runner/healthcheck.go | 4 +- {v2/internal => internal}/runner/inputs.go | 4 +- .../runner/nucleicloud/cloud.go | 2 +- .../runner/nucleicloud/types.go | 4 +- .../runner/nucleicloud/utils.go | 2 +- {v2/internal => internal}/runner/options.go | 12 +- .../runner/options_test.go | 2 +- {v2/internal => internal}/runner/proxy.go | 2 +- {v2/internal => internal}/runner/runner.go | 72 ++++++------ .../runner/runner_test.go | 10 +- {v2/internal => internal}/runner/templates.go | 10 +- {v2/lib => lib}/README.md | 6 +- {v2/lib => lib}/config.go | 16 +-- {v2/lib => lib}/example_test.go | 2 +- {v2/lib => lib}/helper.go | 6 +- {v2/lib => lib}/multi.go | 16 +-- {v2/lib => lib}/sdk.go | 28 ++--- {v2/lib => lib}/sdk_private.go | 36 +++--- {v2/lib => lib}/sdk_test.go | 2 +- {v2/pkg => pkg}/catalog/aws/catalog.go | 0 {v2/pkg => pkg}/catalog/aws/catalog_test.go | 0 {v2/pkg => pkg}/catalog/catalogue.go | 0 {v2/pkg => pkg}/catalog/config/constants.go | 0 {v2/pkg => pkg}/catalog/config/ignorefile.go | 0 .../catalog/config/nucleiconfig.go | 10 +- {v2/pkg => pkg}/catalog/config/template.go | 2 +- {v2/pkg => pkg}/catalog/disk/catalog.go | 0 {v2/pkg => pkg}/catalog/disk/find.go | 2 +- {v2/pkg => pkg}/catalog/disk/known-files.go | 0 {v2/pkg => pkg}/catalog/disk/path.go | 2 +- .../catalog/loader/filter/path_filter.go | 2 +- .../catalog/loader/filter/tag_filter.go | 14 +-- .../catalog/loader/filter/tag_filter_test.go | 14 +-- {v2/pkg => pkg}/catalog/loader/loader.go | 24 ++-- {v2/pkg => pkg}/catalog/loader/loader_test.go | 4 +- .../catalog/loader/remote_loader.go | 4 +- {v2/pkg => pkg}/core/engine.go | 8 +- {v2/pkg => pkg}/core/engine_test.go | 0 {v2/pkg => pkg}/core/execute_options.go | 10 +- {v2/pkg => pkg}/core/executors.go | 10 +- {v2/pkg => pkg}/core/inputs/hybrid/hmap.go | 8 +- .../core/inputs/hybrid/hmap_test.go | 6 +- {v2/pkg => pkg}/core/inputs/hybrid/options.go | 0 .../core/inputs/hybrid/tests/AS134029.txt | 0 .../core/inputs/hybrid/tests/AS14421.txt | 0 {v2/pkg => pkg}/core/inputs/inputs.go | 4 +- {v2/pkg => pkg}/core/workflow_execute.go | 6 +- {v2/pkg => pkg}/core/workflow_execute_test.go | 16 +-- {v2/pkg => pkg}/core/workpool.go | 2 +- .../external/customtemplates/azure_blob.go | 4 +- .../external/customtemplates/github.go | 4 +- .../external/customtemplates/github_test.go | 4 +- .../external/customtemplates/gitlab.go | 4 +- .../external/customtemplates/s3.go | 4 +- .../customtemplates/templates_provider.go | 2 +- {v2/pkg => pkg}/input/input.go | 2 +- {v2/pkg => pkg}/input/input_test.go | 0 {v2/pkg => pkg}/js/CONTRIBUTE.md | 0 {v2/pkg => pkg}/js/DESIGN.md | 0 {v2/pkg => pkg}/js/THANKS.md | 0 {v2/pkg => pkg}/js/compiler/compiler.go | 48 ++++---- {v2/pkg => pkg}/js/compiler/compiler_test.go | 0 {v2/pkg => pkg}/js/devtools/README.md | 0 .../js/devtools/bindgen/INSTALL.md | 0 {v2/pkg => pkg}/js/devtools/bindgen/README.md | 0 .../js/devtools/bindgen/generator.go | 2 +- {v2/pkg => pkg}/js/devtools/bindgen/output.go | 0 .../devtools/bindgen/templates/go_class.tmpl | 0 .../devtools/bindgen/templates/js_class.tmpl | 0 .../bindgen/templates/markdown_class.tmpl | 0 .../js/devtools/jsdocgen/README.md | 0 {v2/pkg => pkg}/js/devtools/jsdocgen/main.go | 0 .../js/devtools/scrapefuncs/README.md | 0 .../js/devtools/scrapefuncs/main.go | 0 {v2/pkg => pkg}/js/generated/README.md | 0 .../js/generated/go/libbytes/bytes.go | 4 +- {v2/pkg => pkg}/js/generated/go/libfs/fs.go | 4 +- .../js/generated/go/libgoconsole/goconsole.go | 4 +- .../js/generated/go/libikev2/ikev2.go | 4 +- .../js/generated/go/libkerberos/kerberos.go | 4 +- .../js/generated/go/libldap/ldap.go | 4 +- .../js/generated/go/libmssql/mssql.go | 4 +- .../js/generated/go/libmysql/mysql.go | 4 +- {v2/pkg => pkg}/js/generated/go/libnet/net.go | 4 +- .../js/generated/go/liboracle/oracle.go | 4 +- .../js/generated/go/libpop3/pop3.go | 4 +- .../js/generated/go/libpostgres/postgres.go | 4 +- {v2/pkg => pkg}/js/generated/go/librdp/rdp.go | 4 +- .../js/generated/go/libredis/redis.go | 4 +- .../js/generated/go/librsync/rsync.go | 4 +- {v2/pkg => pkg}/js/generated/go/libsmb/smb.go | 4 +- .../js/generated/go/libsmtp/smtp.go | 4 +- {v2/pkg => pkg}/js/generated/go/libssh/ssh.go | 4 +- .../js/generated/go/libstructs/structs.go | 4 +- .../js/generated/go/libtelnet/telnet.go | 4 +- {v2/pkg => pkg}/js/generated/go/libvnc/vnc.go | 4 +- {v2/pkg => pkg}/js/generated/js/global.js | 0 .../js/generated/js/libbytes/bytes.js | 0 {v2/pkg => pkg}/js/generated/js/libfs/fs.js | 0 .../js/generated/js/libgoconsole/goconsole.js | 0 .../js/generated/js/libikev2/ikev2.js | 0 .../js/generated/js/libkerberos/kerberos.js | 0 .../js/generated/js/libldap/ldap.js | 0 .../js/generated/js/libmssql/mssql.js | 0 .../js/generated/js/libmysql/mysql.js | 0 {v2/pkg => pkg}/js/generated/js/libnet/net.js | 0 .../js/generated/js/liboracle/oracle.js | 0 .../js/generated/js/libpop3/pop3.js | 0 .../js/generated/js/libpostgres/postgres.js | 0 {v2/pkg => pkg}/js/generated/js/librdp/rdp.js | 0 .../js/generated/js/libredis/redis.js | 0 .../js/generated/js/librsync/rsync.js | 0 {v2/pkg => pkg}/js/generated/js/libsmb/smb.js | 0 .../js/generated/js/libsmtp/smtp.js | 0 {v2/pkg => pkg}/js/generated/js/libssh/ssh.js | 0 .../js/generated/js/libstructs/structs.js | 0 .../js/generated/js/libtelnet/telnet.js | 0 {v2/pkg => pkg}/js/generated/js/libvnc/vnc.js | 0 {v2/pkg => pkg}/js/global/exports.js | 0 .../js/global/js/active_directory.js | 0 {v2/pkg => pkg}/js/global/js/dump.js | 0 {v2/pkg => pkg}/js/global/scripts.go | 8 +- {v2/pkg => pkg}/js/global/scripts_test.go | 0 {v2/pkg => pkg}/js/gojs/gojs.go | 0 {v2/pkg => pkg}/js/gojs/set.go | 0 {v2/pkg => pkg}/js/libs/LICENSE.md | 0 {v2/pkg => pkg}/js/libs/bytes/buffer.go | 2 +- {v2/pkg => pkg}/js/libs/fs/fs.go | 2 +- {v2/pkg => pkg}/js/libs/goconsole/log.go | 0 {v2/pkg => pkg}/js/libs/ikev2/ikev2.go | 0 {v2/pkg => pkg}/js/libs/kerberos/kerberos.go | 2 +- {v2/pkg => pkg}/js/libs/ldap/ldap.go | 2 +- {v2/pkg => pkg}/js/libs/mssql/mssql.go | 2 +- {v2/pkg => pkg}/js/libs/mysql/mysql.go | 4 +- {v2/pkg => pkg}/js/libs/net/net.go | 4 +- {v2/pkg => pkg}/js/libs/oracle/oracle.go | 2 +- {v2/pkg => pkg}/js/libs/pop3/pop3.go | 2 +- {v2/pkg => pkg}/js/libs/postgres/postgres.go | 4 +- {v2/pkg => pkg}/js/libs/rdp/rdp.go | 2 +- {v2/pkg => pkg}/js/libs/redis/redis.go | 2 +- {v2/pkg => pkg}/js/libs/rsync/rsync.go | 2 +- {v2/pkg => pkg}/js/libs/smb/metadata.go | 2 +- {v2/pkg => pkg}/js/libs/smb/smb.go | 2 +- {v2/pkg => pkg}/js/libs/smb/smbghost.go | 4 +- {v2/pkg => pkg}/js/libs/smtp/smtp.go | 2 +- {v2/pkg => pkg}/js/libs/ssh/ssh.go | 2 +- {v2/pkg => pkg}/js/libs/structs/smbexploit.js | 0 {v2/pkg => pkg}/js/libs/structs/structs.go | 0 {v2/pkg => pkg}/js/libs/telnet/telnet.go | 2 +- {v2/pkg => pkg}/js/libs/vnc/vnc.go | 2 +- {v2/pkg => pkg}/js/utils/util.go | 0 pkg/keys/key.go | 7 ++ {v2 => pkg/keys}/nuclei.crt | 0 {v2/pkg => pkg}/model/model.go | 4 +- {v2/pkg => pkg}/model/model_test.go | 4 +- .../model/types/severity/severities.go | 2 +- .../model/types/severity/severity.go | 0 .../model/types/severity/severity_test.go | 0 .../model/types/stringslice/stringslice.go | 2 +- .../types/stringslice/stringslice_raw.go | 0 .../model/types/userAgent/user_agent.go | 0 {v2/pkg => pkg}/model/worflow_loader.go | 0 {v2/pkg => pkg}/operators/common/dsl/dsl.go | 4 +- .../operators/common/dsl/dsl_test.go | 0 .../operators/extractors/compile.go | 2 +- {v2/pkg => pkg}/operators/extractors/doc.go | 0 .../operators/extractors/extract.go | 2 +- .../operators/extractors/extract_test.go | 0 .../operators/extractors/extractor_types.go | 0 .../operators/extractors/extractors.go | 0 {v2/pkg => pkg}/operators/extractors/util.go | 0 {v2/pkg => pkg}/operators/matchers/compile.go | 2 +- {v2/pkg => pkg}/operators/matchers/doc.go | 0 {v2/pkg => pkg}/operators/matchers/match.go | 4 +- .../operators/matchers/match_test.go | 2 +- .../operators/matchers/matchers.go | 0 .../operators/matchers/matchers_types.go | 0 .../operators/matchers/validate.go | 0 .../operators/matchers/validate_test.go | 0 {v2/pkg => pkg}/operators/operators.go | 8 +- {v2/pkg => pkg}/operators/operators_test.go | 0 {v2/pkg => pkg}/output/doc.go | 0 {v2/pkg => pkg}/output/file_output_writer.go | 0 {v2/pkg => pkg}/output/format_json.go | 0 {v2/pkg => pkg}/output/format_screen.go | 2 +- {v2/pkg => pkg}/output/output.go | 12 +- {v2/pkg => pkg}/output/output_test.go | 2 +- {v2/pkg => pkg}/parsers/parser.go | 16 +-- {v2/pkg => pkg}/parsers/parser_test.go | 12 +- {v2/pkg => pkg}/parsers/workflow_loader.go | 8 +- {v2/pkg => pkg}/progress/doc.go | 0 {v2/pkg => pkg}/progress/progress.go | 0 {v2/pkg => pkg}/projectfile/httputil.go | 0 {v2/pkg => pkg}/projectfile/project.go | 0 {v2/pkg => pkg}/protocols/code/code.go | 28 ++--- {v2/pkg => pkg}/protocols/code/code_test.go | 10 +- .../common/automaticscan/automaticscan.go | 18 +-- .../automaticscan/automaticscan_test.go | 0 .../protocols/common/automaticscan/doc.go | 0 .../common/contextargs/contextargs.go | 0 .../protocols/common/contextargs/doc.go | 0 .../protocols/common/contextargs/metainput.go | 0 .../protocols/common/contextargs/variables.go | 0 .../common/expressions/expressions.go | 6 +- .../common/expressions/expressions_test.go | 0 .../protocols/common/expressions/variables.go | 2 +- .../common/expressions/variables_test.go | 0 {v2/pkg => pkg}/protocols/common/fuzz/doc.go | 0 .../protocols/common/fuzz/execute.go | 6 +- .../protocols/common/fuzz/execute_test.go | 0 {v2/pkg => pkg}/protocols/common/fuzz/fuzz.go | 4 +- .../protocols/common/fuzz/fuzz_test.go | 0 .../protocols/common/fuzz/parts.go | 6 +- .../protocols/common/fuzz/parts_test.go | 6 +- .../common/generators/attack_types.go | 0 .../protocols/common/generators/env.go | 0 .../protocols/common/generators/generators.go | 4 +- .../common/generators/generators_test.go | 4 +- .../protocols/common/generators/load.go | 2 +- .../protocols/common/generators/load_test.go | 4 +- .../protocols/common/generators/maps.go | 0 .../protocols/common/generators/maps_test.go | 0 .../protocols/common/generators/options.go | 2 +- .../protocols/common/generators/slice.go | 0 .../protocols/common/generators/validate.go | 2 +- .../deserialization/deserialization.go | 0 .../common/helpers/deserialization/helpers.go | 0 .../common/helpers/deserialization/java.go | 0 .../deserialization/testdata/Deserialize.java | 0 .../deserialization/testdata/README.md | 0 .../deserialization/testdata/ValueObject.java | 0 .../helpers/eventcreator/eventcreator.go | 8 +- .../helpers/responsehighlighter/hexdump.go | 0 .../response_highlighter.go | 2 +- .../response_highlighter_test.go | 2 +- .../protocols/common/helpers/writer/writer.go | 6 +- .../common/hosterrorscache/hosterrorscache.go | 0 .../hosterrorscache/hosterrorscache_test.go | 0 .../protocols/common/interactsh/const.go | 0 .../protocols/common/interactsh/interactsh.go | 8 +- .../protocols/common/interactsh/options.go | 6 +- .../protocols/common/marker/marker.go | 0 .../protocols/common/protocolinit/init.go | 14 +-- .../protocols/common/protocolstate/file.go | 2 +- .../common/protocolstate/headless.go | 0 .../protocols/common/protocolstate/js.go | 0 .../protocols/common/protocolstate/state.go | 2 +- .../protocols/common/randomip/randomip.go | 0 .../common/randomip/randomip_test.go | 0 .../protocols/common/replacer/replacer.go | 4 +- .../common/replacer/replacer_test.go | 0 .../protocols/common/tostring/tostring.go | 0 .../protocols/common/uncover/uncover.go | 2 +- .../utils/excludematchers/excludematchers.go | 0 .../excludematchers/excludematchers_test.go | 0 .../protocols/common/utils/vardump/dump.go | 2 +- .../protocols/common/variables/doc.go | 0 .../protocols/common/variables/variables.go | 12 +- .../common/variables/variables_test.go | 0 {v2/pkg => pkg}/protocols/dns/cluster.go | 0 {v2/pkg => pkg}/protocols/dns/dns.go | 12 +- {v2/pkg => pkg}/protocols/dns/dns_test.go | 6 +- {v2/pkg => pkg}/protocols/dns/dns_types.go | 0 .../protocols/dns/dnsclientpool/clientpool.go | 2 +- {v2/pkg => pkg}/protocols/dns/operators.go | 14 +-- .../protocols/dns/operators_test.go | 14 +-- {v2/pkg => pkg}/protocols/dns/request.go | 22 ++-- {v2/pkg => pkg}/protocols/dns/request_test.go | 16 +-- {v2/pkg => pkg}/protocols/file/file.go | 4 +- {v2/pkg => pkg}/protocols/file/find.go | 0 {v2/pkg => pkg}/protocols/file/find_test.go | 6 +- {v2/pkg => pkg}/protocols/file/operators.go | 14 +-- .../protocols/file/operators_test.go | 14 +-- {v2/pkg => pkg}/protocols/file/request.go | 18 +-- .../protocols/file/request_test.go | 16 +-- .../nuclei/.templates-config.json | 1 + .../protocols/headless/engine/action.go | 0 .../protocols/headless/engine/action_types.go | 0 .../protocols/headless/engine/engine.go | 2 +- .../protocols/headless/engine/hijack.go | 0 .../protocols/headless/engine/http_client.go | 6 +- .../protocols/headless/engine/instance.go | 2 +- .../protocols/headless/engine/page.go | 6 +- .../protocols/headless/engine/page_actions.go | 12 +- .../headless/engine/page_actions_test.go | 8 +- .../protocols/headless/engine/rules.go | 2 +- .../protocols/headless/engine/util.go | 2 +- .../protocols/headless/headless.go | 12 +- .../protocols/headless/operators.go | 14 +-- .../protocols/headless/operators_test.go | 0 {v2/pkg => pkg}/protocols/headless/request.go | 26 ++--- .../protocols/http/build_request.go | 20 ++-- .../protocols/http/build_request_test.go | 12 +- {v2/pkg => pkg}/protocols/http/cluster.go | 0 .../protocols/http/cluster_test.go | 0 {v2/pkg => pkg}/protocols/http/http.go | 14 +-- .../protocols/http/http_method_types.go | 0 {v2/pkg => pkg}/protocols/http/http_test.go | 8 +- .../http/httpclientpool/clientpool.go | 8 +- {v2/pkg => pkg}/protocols/http/operators.go | 18 +-- .../protocols/http/operators_test.go | 14 +-- .../protocols/http/race/syncedreadcloser.go | 0 {v2/pkg => pkg}/protocols/http/raw/doc.go | 0 {v2/pkg => pkg}/protocols/http/raw/raw.go | 0 .../protocols/http/raw/raw_test.go | 0 {v2/pkg => pkg}/protocols/http/request.go | 36 +++--- .../protocols/http/request_annotations.go | 0 .../http/request_annotations_test.go | 2 +- .../protocols/http/request_condition.go | 0 .../protocols/http/request_generator.go | 4 +- .../protocols/http/request_generator_test.go | 6 +- .../protocols/http/request_test.go | 16 +-- {v2/pkg => pkg}/protocols/http/signature.go | 2 +- .../protocols/http/signer/aws-sign.go | 0 .../protocols/http/signer/signer.go | 2 +- .../protocols/http/signerpool/signerpool.go | 4 +- {v2/pkg => pkg}/protocols/http/utils.go | 4 +- {v2/pkg => pkg}/protocols/http/validate.go | 0 {v2/pkg => pkg}/protocols/javascript/js.go | 34 +++--- .../protocols/javascript/js_test.go | 14 +-- .../javascript/testcases/ms-sql-detect.yaml | 0 .../testcases/redis-pass-brute.yaml | 0 .../testcases/ssh-server-fingerprint.yaml | 0 {v2/pkg => pkg}/protocols/network/network.go | 10 +- .../protocols/network/network_input_types.go | 0 .../protocols/network/network_test.go | 6 +- .../network/networkclientpool/clientpool.go | 4 +- .../protocols/network/operators.go | 14 +-- .../protocols/network/operators_test.go | 14 +-- {v2/pkg => pkg}/protocols/network/request.go | 26 ++--- .../protocols/network/request_test.go | 16 +-- {v2/pkg => pkg}/protocols/offlinehttp/find.go | 0 .../protocols/offlinehttp/find_test.go | 8 +- .../protocols/offlinehttp/offlinehttp.go | 4 +- .../protocols/offlinehttp/operators.go | 18 +-- .../protocols/offlinehttp/operators_test.go | 14 +-- .../protocols/offlinehttp/read_response.go | 0 .../offlinehttp/read_response_test.go | 0 .../protocols/offlinehttp/request.go | 16 +-- {v2/pkg => pkg}/protocols/protocols.go | 38 +++---- {v2/pkg => pkg}/protocols/ssl/ssl.go | 32 +++--- {v2/pkg => pkg}/protocols/ssl/ssl_test.go | 10 +- .../protocols/utils/http/requtils.go | 4 +- .../protocols/utils/http/requtils_test.go | 0 {v2/pkg => pkg}/protocols/utils/utils.go | 2 +- {v2/pkg => pkg}/protocols/utils/utils_test.go | 0 {v2/pkg => pkg}/protocols/utils/variables.go | 4 +- .../protocols/utils/variables_test.go | 2 +- .../protocols/websocket/websocket.go | 30 ++--- .../whois/rdapclientpool/clientpool.go | 2 +- {v2/pkg => pkg}/protocols/whois/whois.go | 32 +++--- {v2/pkg => pkg}/reporting/client.go | 2 +- {v2/pkg => pkg}/reporting/dedupe/dedupe.go | 4 +- .../reporting/dedupe/dedupe_test.go | 2 +- .../reporting/exporters/es/elasticsearch.go | 4 +- .../exporters/jsonexporter/jsonexporter.go | 2 +- .../reporting/exporters/jsonl/jsonl.go | 2 +- .../reporting/exporters/markdown/markdown.go | 6 +- .../markdown/util/markdown_formatter.go | 0 .../exporters/markdown/util/markdown_utils.go | 0 .../markdown/util/markdown_utils_test.go | 0 .../reporting/exporters/sarif/sarif.go | 4 +- .../reporting/exporters/splunk/splunkhec.go | 4 +- {v2/pkg => pkg}/reporting/format/format.go | 0 .../reporting/format/format_utils.go | 12 +- .../reporting/format/format_utils_test.go | 8 +- {v2/pkg => pkg}/reporting/options.go | 18 +-- {v2/pkg => pkg}/reporting/reporting.go | 28 ++--- .../reporting/trackers/github/github.go | 8 +- .../reporting/trackers/gitlab/gitlab.go | 6 +- .../reporting/trackers/jira/jira.go | 6 +- .../reporting/trackers/jira/jira_test.go | 0 {v2/pkg => pkg}/templates/cache/cache.go | 0 {v2/pkg => pkg}/templates/cache/cache_test.go | 0 {v2/pkg => pkg}/templates/cluster.go | 14 +-- {v2/pkg => pkg}/templates/cluster_test.go | 4 +- {v2/pkg => pkg}/templates/compile.go | 18 +-- {v2/pkg => pkg}/templates/compile_test.go | 32 +++--- {v2/pkg => pkg}/templates/doc.go | 0 .../templates/extensions/extensions.go | 0 {v2/pkg => pkg}/templates/log.go | 4 +- {v2/pkg => pkg}/templates/log_test.go | 0 {v2/pkg => pkg}/templates/preprocessors.go | 0 .../nuclei/.templates-config.json | 1 + {v2/pkg => pkg}/templates/signer/default.go | 6 +- {v2/pkg => pkg}/templates/signer/handler.go | 0 .../templates/signer/handler_test.go | 0 .../templates/signer/tmpl_signer.go | 2 +- {v2/pkg => pkg}/templates/template_sign.go | 20 ++-- {v2/pkg => pkg}/templates/templates.go | 30 ++--- {v2/pkg => pkg}/templates/templates_doc.go | 0 .../templates/templates_doc_examples.go | 20 ++-- {v2/pkg => pkg}/templates/templates_test.go | 0 .../templates/tests/json-template.json | 0 {v2/pkg => pkg}/templates/tests/match-1.yaml | 0 .../templates/tests/multiproto.json | 0 .../templates/tests/multiproto.yaml | 0 .../templates/tests/no-author.yaml | 0 {v2/pkg => pkg}/templates/tests/no-req.yaml | 0 {v2/pkg => pkg}/templates/tests/workflow.yaml | 0 {v2/pkg => pkg}/templates/types/types.go | 2 +- {v2/pkg => pkg}/templates/workflows.go | 6 +- {v2/pkg => pkg}/testutils/integration.go | 0 .../testutils/testheadless/headless_local.go | 0 .../testheadless/headless_runtime.go | 0 {v2/pkg => pkg}/testutils/testutils.go | 20 ++-- {v2/pkg => pkg}/tmplexec/README.md | 0 {v2/pkg => pkg}/tmplexec/doc.go | 0 {v2/pkg => pkg}/tmplexec/exec.go | 16 +-- {v2/pkg => pkg}/tmplexec/flow/README.md | 0 .../tmplexec/flow/builtin/dedupe.go | 2 +- {v2/pkg => pkg}/tmplexec/flow/doc.go | 0 .../tmplexec/flow/flow_executor.go | 16 +-- .../tmplexec/flow/flow_executor_test.go | 16 +-- .../tmplexec/flow/flow_internal.go | 10 +- {v2/pkg => pkg}/tmplexec/flow/options.go | 2 +- .../testcases/condition-flow-extractors.yaml | 0 .../condition-flow-no-operators.yaml | 0 .../flow/testcases/condition-flow.yaml | 0 .../flow/testcases/nuclei-flow-dns-id.yaml | 0 .../testcases/nuclei-flow-dns-prefix.yaml | 0 .../flow/testcases/nuclei-flow-dns.yaml | 0 {v2/pkg => pkg}/tmplexec/flow/util.go | 2 +- {v2/pkg => pkg}/tmplexec/generic/exec.go | 6 +- {v2/pkg => pkg}/tmplexec/interface.go | 10 +- {v2/pkg => pkg}/tmplexec/multiproto/README.md | 0 {v2/pkg => pkg}/tmplexec/multiproto/doc.go | 0 {v2/pkg => pkg}/tmplexec/multiproto/multi.go | 10 +- .../tmplexec/multiproto/multi_test.go | 16 +-- .../testcases/multiprotodynamic.yaml | 0 .../testcases/multiprotowithprefix.yaml | 0 {v2/pkg => pkg}/types/interfaces.go | 2 +- {v2/pkg => pkg}/types/proxy.go | 0 {v2/pkg => pkg}/types/resume.go | 2 +- .../types/scanstrategy/scan_strategy.go | 0 {v2/pkg => pkg}/types/types.go | 8 +- {v2/pkg => pkg}/utils/http_probe.go | 0 {v2/pkg => pkg}/utils/index.go | 0 .../utils/insertion_ordered_map.go | 0 .../utils/insertion_ordered_map_test.go | 0 {v2/pkg => pkg}/utils/monitor/monitor.go | 0 {v2/pkg => pkg}/utils/monitor/monitor_test.go | 0 {v2/pkg => pkg}/utils/stats/doc.go | 0 {v2/pkg => pkg}/utils/stats/stats.go | 0 {v2/pkg => pkg}/utils/template_path.go | 2 +- {v2/pkg => pkg}/utils/utils.go | 6 +- {v2/pkg => pkg}/utils/utils_test.go | 0 {v2/pkg => pkg}/utils/yaml/preprocess.go | 2 +- .../utils/yaml/yaml_decode_wrapper.go | 0 {v2/pkg => pkg}/workflows/doc.go | 0 {v2/pkg => pkg}/workflows/workflows.go | 8 +- {v2/pkg => pkg}/workflows/workflows_test.go | 4 +- v2/detect-ssl-issuer.yaml | 20 ---- v2/key.go | 6 - .../js/devtools/bindgen/cmd/bindgen/main.go | 76 ------------- v2/pkg/js/devtools/jsdocgen/jsdocgen | Bin 7564178 -> 0 bytes 542 files changed, 1254 insertions(+), 1340 deletions(-) rename v2/.goreleaser.yml => .goreleaser.yml (100%) rename v2/Makefile => Makefile (96%) rename {v2/cmd => cmd}/docgen/docgen.go (91%) rename {v2/cmd => cmd}/functional-test/main.go (98%) rename {v2/cmd => cmd}/functional-test/run.sh (97%) rename {v2/cmd => cmd}/functional-test/targets-1000.txt (100%) rename {v2/cmd => cmd}/functional-test/targets-150.txt (100%) rename {v2/cmd => cmd}/functional-test/targets-250.txt (100%) rename {v2/cmd => cmd}/functional-test/targets.txt (100%) rename {v2/cmd => cmd}/functional-test/testcases.txt (100%) rename {v2/cmd => cmd}/generate-checksum/main.go (100%) rename {v2/cmd => cmd}/integration-test/code.go (95%) rename {v2/cmd => cmd}/integration-test/custom-dir.go (94%) rename {v2/cmd => cmd}/integration-test/dns.go (98%) rename {v2/cmd => cmd}/integration-test/dsl.go (96%) rename {v2/cmd => cmd}/integration-test/file.go (96%) rename {v2/cmd => cmd}/integration-test/flow.go (97%) rename {v2/cmd => cmd}/integration-test/fuzz.go (98%) rename {v2/cmd => cmd}/integration-test/generic.go (98%) rename {v2/cmd => cmd}/integration-test/headless.go (99%) rename {v2/cmd => cmd}/integration-test/http.go (99%) rename {v2/cmd => cmd}/integration-test/integration-test.go (99%) rename {v2/cmd => cmd}/integration-test/interactsh.go (100%) rename {v2/cmd => cmd}/integration-test/javascript.go (98%) rename {v2/cmd => cmd}/integration-test/library.go (79%) rename {v2/cmd => cmd}/integration-test/loader.go (99%) rename {v2/cmd => cmd}/integration-test/multi.go (92%) rename {v2/cmd => cmd}/integration-test/network.go (98%) rename {v2/cmd => cmd}/integration-test/offline-http.go (96%) rename {v2/cmd => cmd}/integration-test/ssl.go (98%) rename {v2/cmd => cmd}/integration-test/template-dir.go (93%) rename {v2/cmd => cmd}/integration-test/template-path.go (92%) rename {v2/cmd => cmd}/integration-test/websocket.go (98%) rename {v2/cmd => cmd}/integration-test/whois.go (89%) rename {v2/cmd => cmd}/integration-test/workflow.go (98%) rename {v2/cmd => cmd}/nuclei/issue-tracker-config.yaml (100%) rename {v2/cmd => cmd}/nuclei/main.go (97%) rename {v2/cmd => cmd}/tmc/main.go (97%) rename {v2/cmd => cmd}/tmc/types.go (100%) rename {v2/cmd => cmd}/tools/fuzzplayground/main.go (100%) rename {v2/examples => examples}/advanced/advanced.go (95%) rename {v2/examples => examples}/simple/simple.go (90%) rename v2/gh_retry.sh => gh_retry.sh (100%) rename v2/go.mod => go.mod (99%) rename v2/go.sum => go.sum (99%) rename {v2/internal => internal}/colorizer/colorizer.go (92%) rename {v2/internal => internal}/installer/doc.go (100%) rename {v2/internal => internal}/installer/template.go (99%) rename {v2/internal => internal}/installer/template_test.go (96%) rename {v2/internal => internal}/installer/util.go (98%) rename {v2/internal => internal}/installer/versioncheck.go (98%) rename {v2/internal => internal}/installer/versioncheck_test.go (90%) rename {v2/internal => internal}/installer/zipslip_unix_test.go (100%) rename {v2/internal => internal}/runner/banner.go (91%) rename {v2/internal => internal}/runner/cloud.go (98%) rename {v2/internal => internal}/runner/defaults.go (100%) rename {v2/internal => internal}/runner/doc.go (100%) rename {v2/internal => internal}/runner/enumerate.go (92%) rename {v2/internal => internal}/runner/healthcheck.go (95%) rename {v2/internal => internal}/runner/inputs.go (93%) rename {v2/internal => internal}/runner/nucleicloud/cloud.go (99%) rename {v2/internal => internal}/runner/nucleicloud/types.go (97%) rename {v2/internal => internal}/runner/nucleicloud/utils.go (95%) rename {v2/internal => internal}/runner/options.go (97%) rename {v2/internal => internal}/runner/options_test.go (95%) rename {v2/internal => internal}/runner/proxy.go (97%) rename {v2/internal => internal}/runner/runner.go (91%) rename {v2/internal => internal}/runner/runner_test.go (90%) rename {v2/internal => internal}/runner/templates.go (90%) rename {v2/lib => lib}/README.md (93%) rename {v2/lib => lib}/config.go (95%) rename {v2/lib => lib}/example_test.go (97%) rename {v2/lib => lib}/helper.go (87%) rename {v2/lib => lib}/multi.go (91%) rename {v2/lib => lib}/sdk.go (86%) rename {v2/lib => lib}/sdk_private.go (83%) rename {v2/lib => lib}/sdk_test.go (97%) rename {v2/pkg => pkg}/catalog/aws/catalog.go (100%) rename {v2/pkg => pkg}/catalog/aws/catalog_test.go (100%) rename {v2/pkg => pkg}/catalog/catalogue.go (100%) rename {v2/pkg => pkg}/catalog/config/constants.go (100%) rename {v2/pkg => pkg}/catalog/config/ignorefile.go (100%) rename {v2/pkg => pkg}/catalog/config/nucleiconfig.go (97%) rename {v2/pkg => pkg}/catalog/config/template.go (98%) rename {v2/pkg => pkg}/catalog/disk/catalog.go (100%) rename {v2/pkg => pkg}/catalog/disk/find.go (99%) rename {v2/pkg => pkg}/catalog/disk/known-files.go (100%) rename {v2/pkg => pkg}/catalog/disk/path.go (98%) rename {v2/pkg => pkg}/catalog/loader/filter/path_filter.go (96%) rename {v2/pkg => pkg}/catalog/loader/filter/tag_filter.go (97%) rename {v2/pkg => pkg}/catalog/loader/filter/tag_filter_test.go (96%) rename {v2/pkg => pkg}/catalog/loader/loader.go (95%) rename {v2/pkg => pkg}/catalog/loader/loader_test.go (96%) rename {v2/pkg => pkg}/catalog/loader/remote_loader.go (96%) rename {v2/pkg => pkg}/core/engine.go (90%) rename {v2/pkg => pkg}/core/engine_test.go (100%) rename {v2/pkg => pkg}/core/execute_options.go (94%) rename {v2/pkg => pkg}/core/executors.go (96%) rename {v2/pkg => pkg}/core/inputs/hybrid/hmap.go (97%) rename {v2/pkg => pkg}/core/inputs/hybrid/hmap_test.go (96%) rename {v2/pkg => pkg}/core/inputs/hybrid/options.go (100%) rename {v2/pkg => pkg}/core/inputs/hybrid/tests/AS134029.txt (100%) rename {v2/pkg => pkg}/core/inputs/hybrid/tests/AS14421.txt (100%) rename {v2/pkg => pkg}/core/inputs/inputs.go (89%) rename {v2/pkg => pkg}/core/workflow_execute.go (96%) rename {v2/pkg => pkg}/core/workflow_execute_test.go (94%) rename {v2/pkg => pkg}/core/workpool.go (96%) rename {v2/pkg => pkg}/external/customtemplates/azure_blob.go (98%) rename {v2/pkg => pkg}/external/customtemplates/github.go (98%) rename {v2/pkg => pkg}/external/customtemplates/github_test.go (90%) rename {v2/pkg => pkg}/external/customtemplates/gitlab.go (97%) rename {v2/pkg => pkg}/external/customtemplates/s3.go (96%) rename {v2/pkg => pkg}/external/customtemplates/templates_provider.go (97%) rename {v2/pkg => pkg}/input/input.go (98%) rename {v2/pkg => pkg}/input/input_test.go (100%) rename {v2/pkg => pkg}/js/CONTRIBUTE.md (100%) rename {v2/pkg => pkg}/js/DESIGN.md (100%) rename {v2/pkg => pkg}/js/THANKS.md (100%) rename {v2/pkg => pkg}/js/compiler/compiler.go (79%) rename {v2/pkg => pkg}/js/compiler/compiler_test.go (100%) rename {v2/pkg => pkg}/js/devtools/README.md (100%) rename {v2/pkg => pkg}/js/devtools/bindgen/INSTALL.md (100%) rename {v2/pkg => pkg}/js/devtools/bindgen/README.md (100%) rename {v2/pkg => pkg}/js/devtools/bindgen/generator.go (99%) rename {v2/pkg => pkg}/js/devtools/bindgen/output.go (100%) rename {v2/pkg => pkg}/js/devtools/bindgen/templates/go_class.tmpl (100%) rename {v2/pkg => pkg}/js/devtools/bindgen/templates/js_class.tmpl (100%) rename {v2/pkg => pkg}/js/devtools/bindgen/templates/markdown_class.tmpl (100%) rename {v2/pkg => pkg}/js/devtools/jsdocgen/README.md (100%) rename {v2/pkg => pkg}/js/devtools/jsdocgen/main.go (100%) rename {v2/pkg => pkg}/js/devtools/scrapefuncs/README.md (100%) rename {v2/pkg => pkg}/js/devtools/scrapefuncs/main.go (100%) rename {v2/pkg => pkg}/js/generated/README.md (100%) rename {v2/pkg => pkg}/js/generated/go/libbytes/bytes.go (78%) rename {v2/pkg => pkg}/js/generated/go/libfs/fs.go (81%) rename {v2/pkg => pkg}/js/generated/go/libgoconsole/goconsole.go (81%) rename {v2/pkg => pkg}/js/generated/go/libikev2/ikev2.go (92%) rename {v2/pkg => pkg}/js/generated/go/libkerberos/kerberos.go (87%) rename {v2/pkg => pkg}/js/generated/go/libldap/ldap.go (85%) rename {v2/pkg => pkg}/js/generated/go/libmssql/mssql.go (81%) rename {v2/pkg => pkg}/js/generated/go/libmysql/mysql.go (81%) rename {v2/pkg => pkg}/js/generated/go/libnet/net.go (81%) rename {v2/pkg => pkg}/js/generated/go/liboracle/oracle.go (86%) rename {v2/pkg => pkg}/js/generated/go/libpop3/pop3.go (85%) rename {v2/pkg => pkg}/js/generated/go/libpostgres/postgres.go (81%) rename {v2/pkg => pkg}/js/generated/go/librdp/rdp.go (88%) rename {v2/pkg => pkg}/js/generated/go/libredis/redis.go (83%) rename {v2/pkg => pkg}/js/generated/go/librsync/rsync.go (85%) rename {v2/pkg => pkg}/js/generated/go/libsmb/smb.go (80%) rename {v2/pkg => pkg}/js/generated/go/libsmtp/smtp.go (85%) rename {v2/pkg => pkg}/js/generated/go/libssh/ssh.go (80%) rename {v2/pkg => pkg}/js/generated/go/libstructs/structs.go (80%) rename {v2/pkg => pkg}/js/generated/go/libtelnet/telnet.go (86%) rename {v2/pkg => pkg}/js/generated/go/libvnc/vnc.go (84%) rename {v2/pkg => pkg}/js/generated/js/global.js (100%) rename {v2/pkg => pkg}/js/generated/js/libbytes/bytes.js (100%) rename {v2/pkg => pkg}/js/generated/js/libfs/fs.js (100%) rename {v2/pkg => pkg}/js/generated/js/libgoconsole/goconsole.js (100%) rename {v2/pkg => pkg}/js/generated/js/libikev2/ikev2.js (100%) rename {v2/pkg => pkg}/js/generated/js/libkerberos/kerberos.js (100%) rename {v2/pkg => pkg}/js/generated/js/libldap/ldap.js (100%) rename {v2/pkg => pkg}/js/generated/js/libmssql/mssql.js (100%) rename {v2/pkg => pkg}/js/generated/js/libmysql/mysql.js (100%) rename {v2/pkg => pkg}/js/generated/js/libnet/net.js (100%) rename {v2/pkg => pkg}/js/generated/js/liboracle/oracle.js (100%) rename {v2/pkg => pkg}/js/generated/js/libpop3/pop3.js (100%) rename {v2/pkg => pkg}/js/generated/js/libpostgres/postgres.js (100%) rename {v2/pkg => pkg}/js/generated/js/librdp/rdp.js (100%) rename {v2/pkg => pkg}/js/generated/js/libredis/redis.js (100%) rename {v2/pkg => pkg}/js/generated/js/librsync/rsync.js (100%) rename {v2/pkg => pkg}/js/generated/js/libsmb/smb.js (100%) rename {v2/pkg => pkg}/js/generated/js/libsmtp/smtp.js (100%) rename {v2/pkg => pkg}/js/generated/js/libssh/ssh.js (100%) rename {v2/pkg => pkg}/js/generated/js/libstructs/structs.js (100%) rename {v2/pkg => pkg}/js/generated/js/libtelnet/telnet.js (100%) rename {v2/pkg => pkg}/js/generated/js/libvnc/vnc.js (100%) rename {v2/pkg => pkg}/js/global/exports.js (100%) rename {v2/pkg => pkg}/js/global/js/active_directory.js (100%) rename {v2/pkg => pkg}/js/global/js/dump.js (100%) rename {v2/pkg => pkg}/js/global/scripts.go (96%) rename {v2/pkg => pkg}/js/global/scripts_test.go (100%) rename {v2/pkg => pkg}/js/gojs/gojs.go (100%) rename {v2/pkg => pkg}/js/gojs/set.go (100%) rename {v2/pkg => pkg}/js/libs/LICENSE.md (100%) rename {v2/pkg => pkg}/js/libs/bytes/buffer.go (96%) rename {v2/pkg => pkg}/js/libs/fs/fs.go (96%) rename {v2/pkg => pkg}/js/libs/goconsole/log.go (100%) rename {v2/pkg => pkg}/js/libs/ikev2/ikev2.go (100%) rename {v2/pkg => pkg}/js/libs/kerberos/kerberos.go (98%) rename {v2/pkg => pkg}/js/libs/ldap/ldap.go (98%) rename {v2/pkg => pkg}/js/libs/mssql/mssql.go (97%) rename {v2/pkg => pkg}/js/libs/mysql/mysql.go (96%) rename {v2/pkg => pkg}/js/libs/net/net.go (97%) rename {v2/pkg => pkg}/js/libs/oracle/oracle.go (94%) rename {v2/pkg => pkg}/js/libs/pop3/pop3.go (94%) rename {v2/pkg => pkg}/js/libs/postgres/postgres.go (96%) rename {v2/pkg => pkg}/js/libs/rdp/rdp.go (96%) rename {v2/pkg => pkg}/js/libs/redis/redis.go (98%) rename {v2/pkg => pkg}/js/libs/rsync/rsync.go (94%) rename {v2/pkg => pkg}/js/libs/smb/metadata.go (91%) rename {v2/pkg => pkg}/js/libs/smb/smb.go (97%) rename {v2/pkg => pkg}/js/libs/smb/smbghost.go (93%) rename {v2/pkg => pkg}/js/libs/smtp/smtp.go (94%) rename {v2/pkg => pkg}/js/libs/ssh/ssh.go (97%) rename {v2/pkg => pkg}/js/libs/structs/smbexploit.js (100%) rename {v2/pkg => pkg}/js/libs/structs/structs.go (100%) rename {v2/pkg => pkg}/js/libs/telnet/telnet.go (94%) rename {v2/pkg => pkg}/js/libs/vnc/vnc.go (94%) rename {v2/pkg => pkg}/js/utils/util.go (100%) create mode 100644 pkg/keys/key.go rename {v2 => pkg/keys}/nuclei.crt (100%) rename {v2/pkg => pkg}/model/model.go (98%) rename {v2/pkg => pkg}/model/model_test.go (96%) rename {v2/pkg => pkg}/model/types/severity/severities.go (97%) rename {v2/pkg => pkg}/model/types/severity/severity.go (100%) rename {v2/pkg => pkg}/model/types/severity/severity_test.go (100%) rename {v2/pkg => pkg}/model/types/stringslice/stringslice.go (98%) rename {v2/pkg => pkg}/model/types/stringslice/stringslice_raw.go (100%) rename {v2/pkg => pkg}/model/types/userAgent/user_agent.go (100%) rename {v2/pkg => pkg}/model/worflow_loader.go (100%) rename {v2/pkg => pkg}/operators/common/dsl/dsl.go (96%) rename {v2/pkg => pkg}/operators/common/dsl/dsl_test.go (100%) rename {v2/pkg => pkg}/operators/extractors/compile.go (96%) rename {v2/pkg => pkg}/operators/extractors/doc.go (100%) rename {v2/pkg => pkg}/operators/extractors/extract.go (98%) rename {v2/pkg => pkg}/operators/extractors/extract_test.go (100%) rename {v2/pkg => pkg}/operators/extractors/extractor_types.go (100%) rename {v2/pkg => pkg}/operators/extractors/extractors.go (100%) rename {v2/pkg => pkg}/operators/extractors/util.go (100%) rename {v2/pkg => pkg}/operators/matchers/compile.go (97%) rename {v2/pkg => pkg}/operators/matchers/doc.go (100%) rename {v2/pkg => pkg}/operators/matchers/match.go (98%) rename {v2/pkg => pkg}/operators/matchers/match_test.go (99%) rename {v2/pkg => pkg}/operators/matchers/matchers.go (100%) rename {v2/pkg => pkg}/operators/matchers/matchers_types.go (100%) rename {v2/pkg => pkg}/operators/matchers/validate.go (100%) rename {v2/pkg => pkg}/operators/matchers/validate_test.go (100%) rename {v2/pkg => pkg}/operators/operators.go (97%) rename {v2/pkg => pkg}/operators/operators_test.go (100%) rename {v2/pkg => pkg}/output/doc.go (100%) rename {v2/pkg => pkg}/output/file_output_writer.go (100%) rename {v2/pkg => pkg}/output/format_json.go (100%) rename {v2/pkg => pkg}/output/format_screen.go (98%) rename {v2/pkg => pkg}/output/output.go (97%) rename {v2/pkg => pkg}/output/output_test.go (97%) rename {v2/pkg => pkg}/parsers/parser.go (92%) rename {v2/pkg => pkg}/parsers/parser_test.go (92%) rename {v2/pkg => pkg}/parsers/workflow_loader.go (92%) rename {v2/pkg => pkg}/progress/doc.go (100%) rename {v2/pkg => pkg}/progress/progress.go (100%) rename {v2/pkg => pkg}/projectfile/httputil.go (100%) rename {v2/pkg => pkg}/projectfile/project.go (100%) rename {v2/pkg => pkg}/protocols/code/code.go (92%) rename {v2/pkg => pkg}/protocols/code/code_test.go (76%) rename {v2/pkg => pkg}/protocols/common/automaticscan/automaticscan.go (92%) rename {v2/pkg => pkg}/protocols/common/automaticscan/automaticscan_test.go (100%) rename {v2/pkg => pkg}/protocols/common/automaticscan/doc.go (100%) rename {v2/pkg => pkg}/protocols/common/contextargs/contextargs.go (100%) rename {v2/pkg => pkg}/protocols/common/contextargs/doc.go (100%) rename {v2/pkg => pkg}/protocols/common/contextargs/metainput.go (100%) rename {v2/pkg => pkg}/protocols/common/contextargs/variables.go (100%) rename {v2/pkg => pkg}/protocols/common/expressions/expressions.go (95%) rename {v2/pkg => pkg}/protocols/common/expressions/expressions_test.go (100%) rename {v2/pkg => pkg}/protocols/common/expressions/variables.go (98%) rename {v2/pkg => pkg}/protocols/common/expressions/variables_test.go (100%) rename {v2/pkg => pkg}/protocols/common/fuzz/doc.go (100%) rename {v2/pkg => pkg}/protocols/common/fuzz/execute.go (96%) rename {v2/pkg => pkg}/protocols/common/fuzz/execute_test.go (100%) rename {v2/pkg => pkg}/protocols/common/fuzz/fuzz.go (97%) rename {v2/pkg => pkg}/protocols/common/fuzz/fuzz_test.go (100%) rename {v2/pkg => pkg}/protocols/common/fuzz/parts.go (97%) rename {v2/pkg => pkg}/protocols/common/fuzz/parts_test.go (95%) rename {v2/pkg => pkg}/protocols/common/generators/attack_types.go (100%) rename {v2/pkg => pkg}/protocols/common/generators/env.go (100%) rename {v2/pkg => pkg}/protocols/common/generators/generators.go (98%) rename {v2/pkg => pkg}/protocols/common/generators/generators_test.go (96%) rename {v2/pkg => pkg}/protocols/common/generators/load.go (96%) rename {v2/pkg => pkg}/protocols/common/generators/load_test.go (97%) rename {v2/pkg => pkg}/protocols/common/generators/maps.go (100%) rename {v2/pkg => pkg}/protocols/common/generators/maps_test.go (100%) rename {v2/pkg => pkg}/protocols/common/generators/options.go (89%) rename {v2/pkg => pkg}/protocols/common/generators/slice.go (100%) rename {v2/pkg => pkg}/protocols/common/generators/validate.go (96%) rename {v2/pkg => pkg}/protocols/common/helpers/deserialization/deserialization.go (100%) rename {v2/pkg => pkg}/protocols/common/helpers/deserialization/helpers.go (100%) rename {v2/pkg => pkg}/protocols/common/helpers/deserialization/java.go (100%) rename {v2/pkg => pkg}/protocols/common/helpers/deserialization/testdata/Deserialize.java (100%) rename {v2/pkg => pkg}/protocols/common/helpers/deserialization/testdata/README.md (100%) rename {v2/pkg => pkg}/protocols/common/helpers/deserialization/testdata/ValueObject.java (100%) rename {v2/pkg => pkg}/protocols/common/helpers/eventcreator/eventcreator.go (89%) rename {v2/pkg => pkg}/protocols/common/helpers/responsehighlighter/hexdump.go (100%) rename {v2/pkg => pkg}/protocols/common/helpers/responsehighlighter/response_highlighter.go (96%) rename {v2/pkg => pkg}/protocols/common/helpers/responsehighlighter/response_highlighter_test.go (99%) rename {v2/pkg => pkg}/protocols/common/helpers/writer/writer.go (84%) rename {v2/pkg => pkg}/protocols/common/hosterrorscache/hosterrorscache.go (100%) rename {v2/pkg => pkg}/protocols/common/hosterrorscache/hosterrorscache_test.go (100%) rename {v2/pkg => pkg}/protocols/common/interactsh/const.go (100%) rename {v2/pkg => pkg}/protocols/common/interactsh/interactsh.go (98%) rename {v2/pkg => pkg}/protocols/common/interactsh/options.go (93%) rename {v2/pkg => pkg}/protocols/common/marker/marker.go (100%) rename {v2/pkg => pkg}/protocols/common/protocolinit/init.go (91%) rename {v2/pkg => pkg}/protocols/common/protocolstate/file.go (94%) rename {v2/pkg => pkg}/protocols/common/protocolstate/headless.go (100%) rename {v2/pkg => pkg}/protocols/common/protocolstate/js.go (100%) rename {v2/pkg => pkg}/protocols/common/protocolstate/state.go (98%) rename {v2/pkg => pkg}/protocols/common/randomip/randomip.go (100%) rename {v2/pkg => pkg}/protocols/common/randomip/randomip_test.go (100%) rename {v2/pkg => pkg}/protocols/common/replacer/replacer.go (91%) rename {v2/pkg => pkg}/protocols/common/replacer/replacer_test.go (100%) rename {v2/pkg => pkg}/protocols/common/tostring/tostring.go (100%) rename {v2/pkg => pkg}/protocols/common/uncover/uncover.go (98%) rename {v2/pkg => pkg}/protocols/common/utils/excludematchers/excludematchers.go (100%) rename {v2/pkg => pkg}/protocols/common/utils/excludematchers/excludematchers_test.go (100%) rename {v2/pkg => pkg}/protocols/common/utils/vardump/dump.go (96%) rename {v2/pkg => pkg}/protocols/common/variables/doc.go (100%) rename {v2/pkg => pkg}/protocols/common/variables/variables.go (92%) rename {v2/pkg => pkg}/protocols/common/variables/variables_test.go (100%) rename {v2/pkg => pkg}/protocols/dns/cluster.go (100%) rename {v2/pkg => pkg}/protocols/dns/dns.go (96%) rename {v2/pkg => pkg}/protocols/dns/dns_test.go (93%) rename {v2/pkg => pkg}/protocols/dns/dns_types.go (100%) rename {v2/pkg => pkg}/protocols/dns/dnsclientpool/clientpool.go (97%) rename {v2/pkg => pkg}/protocols/dns/operators.go (93%) rename {v2/pkg => pkg}/protocols/dns/operators_test.go (96%) rename {v2/pkg => pkg}/protocols/dns/request.go (92%) rename {v2/pkg => pkg}/protocols/dns/request_test.go (86%) rename {v2/pkg => pkg}/protocols/file/file.go (98%) rename {v2/pkg => pkg}/protocols/file/find.go (100%) rename {v2/pkg => pkg}/protocols/file/find_test.go (91%) rename {v2/pkg => pkg}/protocols/file/operators.go (90%) rename {v2/pkg => pkg}/protocols/file/operators_test.go (96%) rename {v2/pkg => pkg}/protocols/file/request.go (95%) rename {v2/pkg => pkg}/protocols/file/request_test.go (84%) create mode 100644 pkg/protocols/headless/engine/.nuclei-config/nuclei/.templates-config.json rename {v2/pkg => pkg}/protocols/headless/engine/action.go (100%) rename {v2/pkg => pkg}/protocols/headless/engine/action_types.go (100%) rename {v2/pkg => pkg}/protocols/headless/engine/engine.go (98%) rename {v2/pkg => pkg}/protocols/headless/engine/hijack.go (100%) rename {v2/pkg => pkg}/protocols/headless/engine/http_client.go (93%) rename {v2/pkg => pkg}/protocols/headless/engine/instance.go (97%) rename {v2/pkg => pkg}/protocols/headless/engine/page.go (97%) rename {v2/pkg => pkg}/protocols/headless/engine/page_actions.go (98%) rename {v2/pkg => pkg}/protocols/headless/engine/page_actions_test.go (99%) rename {v2/pkg => pkg}/protocols/headless/engine/rules.go (98%) rename {v2/pkg => pkg}/protocols/headless/engine/util.go (79%) rename {v2/pkg => pkg}/protocols/headless/headless.go (94%) rename {v2/pkg => pkg}/protocols/headless/operators.go (91%) rename {v2/pkg => pkg}/protocols/headless/operators_test.go (100%) rename {v2/pkg => pkg}/protocols/headless/request.go (91%) rename {v2/pkg => pkg}/protocols/http/build_request.go (96%) rename {v2/pkg => pkg}/protocols/http/build_request_test.go (96%) rename {v2/pkg => pkg}/protocols/http/cluster.go (100%) rename {v2/pkg => pkg}/protocols/http/cluster_test.go (100%) rename {v2/pkg => pkg}/protocols/http/http.go (97%) rename {v2/pkg => pkg}/protocols/http/http_method_types.go (100%) rename {v2/pkg => pkg}/protocols/http/http_test.go (84%) rename {v2/pkg => pkg}/protocols/http/httpclientpool/clientpool.go (97%) rename {v2/pkg => pkg}/protocols/http/operators.go (91%) rename {v2/pkg => pkg}/protocols/http/operators_test.go (97%) rename {v2/pkg => pkg}/protocols/http/race/syncedreadcloser.go (100%) rename {v2/pkg => pkg}/protocols/http/raw/doc.go (100%) rename {v2/pkg => pkg}/protocols/http/raw/raw.go (100%) rename {v2/pkg => pkg}/protocols/http/raw/raw_test.go (100%) rename {v2/pkg => pkg}/protocols/http/request.go (97%) rename {v2/pkg => pkg}/protocols/http/request_annotations.go (100%) rename {v2/pkg => pkg}/protocols/http/request_annotations_test.go (96%) rename {v2/pkg => pkg}/protocols/http/request_condition.go (100%) rename {v2/pkg => pkg}/protocols/http/request_generator.go (97%) rename {v2/pkg => pkg}/protocols/http/request_generator_test.go (92%) rename {v2/pkg => pkg}/protocols/http/request_test.go (92%) rename {v2/pkg => pkg}/protocols/http/signature.go (97%) rename {v2/pkg => pkg}/protocols/http/signer/aws-sign.go (100%) rename {v2/pkg => pkg}/protocols/http/signer/signer.go (95%) rename {v2/pkg => pkg}/protocols/http/signerpool/signerpool.go (91%) rename {v2/pkg => pkg}/protocols/http/utils.go (97%) rename {v2/pkg => pkg}/protocols/http/validate.go (100%) rename {v2/pkg => pkg}/protocols/javascript/js.go (96%) rename {v2/pkg => pkg}/protocols/javascript/js_test.go (82%) rename {v2/pkg => pkg}/protocols/javascript/testcases/ms-sql-detect.yaml (100%) rename {v2/pkg => pkg}/protocols/javascript/testcases/redis-pass-brute.yaml (100%) rename {v2/pkg => pkg}/protocols/javascript/testcases/ssh-server-fingerprint.yaml (100%) rename {v2/pkg => pkg}/protocols/network/network.go (96%) rename {v2/pkg => pkg}/protocols/network/network_input_types.go (100%) rename {v2/pkg => pkg}/protocols/network/network_test.go (84%) rename {v2/pkg => pkg}/protocols/network/networkclientpool/clientpool.go (88%) rename {v2/pkg => pkg}/protocols/network/operators.go (90%) rename {v2/pkg => pkg}/protocols/network/operators_test.go (94%) rename {v2/pkg => pkg}/protocols/network/request.go (94%) rename {v2/pkg => pkg}/protocols/network/request_test.go (91%) rename {v2/pkg => pkg}/protocols/offlinehttp/find.go (100%) rename {v2/pkg => pkg}/protocols/offlinehttp/find_test.go (89%) rename {v2/pkg => pkg}/protocols/offlinehttp/offlinehttp.go (95%) rename {v2/pkg => pkg}/protocols/offlinehttp/operators.go (90%) rename {v2/pkg => pkg}/protocols/offlinehttp/operators_test.go (96%) rename {v2/pkg => pkg}/protocols/offlinehttp/read_response.go (100%) rename {v2/pkg => pkg}/protocols/offlinehttp/read_response_test.go (100%) rename {v2/pkg => pkg}/protocols/offlinehttp/request.go (87%) rename {v2/pkg => pkg}/protocols/protocols.go (90%) rename {v2/pkg => pkg}/protocols/ssl/ssl.go (93%) rename {v2/pkg => pkg}/protocols/ssl/ssl_test.go (78%) rename {v2/pkg => pkg}/protocols/utils/http/requtils.go (93%) rename {v2/pkg => pkg}/protocols/utils/http/requtils_test.go (100%) rename {v2/pkg => pkg}/protocols/utils/utils.go (97%) rename {v2/pkg => pkg}/protocols/utils/utils_test.go (100%) rename {v2/pkg => pkg}/protocols/utils/variables.go (97%) rename {v2/pkg => pkg}/protocols/utils/variables_test.go (98%) rename {v2/pkg => pkg}/protocols/websocket/websocket.go (94%) rename {v2/pkg => pkg}/protocols/whois/rdapclientpool/clientpool.go (95%) rename {v2/pkg => pkg}/protocols/whois/whois.go (88%) rename {v2/pkg => pkg}/reporting/client.go (84%) rename {v2/pkg => pkg}/reporting/dedupe/dedupe.go (96%) rename {v2/pkg => pkg}/reporting/dedupe/dedupe_test.go (93%) rename {v2/pkg => pkg}/reporting/exporters/es/elasticsearch.go (97%) rename {v2/pkg => pkg}/reporting/exporters/jsonexporter/jsonexporter.go (97%) rename {v2/pkg => pkg}/reporting/exporters/jsonl/jsonl.go (98%) rename {v2/pkg => pkg}/reporting/exporters/markdown/markdown.go (96%) rename {v2/pkg => pkg}/reporting/exporters/markdown/util/markdown_formatter.go (100%) rename {v2/pkg => pkg}/reporting/exporters/markdown/util/markdown_utils.go (100%) rename {v2/pkg => pkg}/reporting/exporters/markdown/util/markdown_utils_test.go (100%) rename {v2/pkg => pkg}/reporting/exporters/sarif/sarif.go (97%) rename {v2/pkg => pkg}/reporting/exporters/splunk/splunkhec.go (96%) rename {v2/pkg => pkg}/reporting/format/format.go (100%) rename {v2/pkg => pkg}/reporting/format/format_utils.go (95%) rename {v2/pkg => pkg}/reporting/format/format_utils_test.go (86%) rename {v2/pkg => pkg}/reporting/options.go (73%) rename {v2/pkg => pkg}/reporting/reporting.go (89%) rename {v2/pkg => pkg}/reporting/trackers/github/github.go (95%) rename {v2/pkg => pkg}/reporting/trackers/gitlab/gitlab.go (95%) rename {v2/pkg => pkg}/reporting/trackers/jira/jira.go (97%) rename {v2/pkg => pkg}/reporting/trackers/jira/jira_test.go (100%) rename {v2/pkg => pkg}/templates/cache/cache.go (100%) rename {v2/pkg => pkg}/templates/cache/cache_test.go (100%) rename {v2/pkg => pkg}/templates/cluster.go (96%) rename {v2/pkg => pkg}/templates/cluster_test.go (92%) rename {v2/pkg => pkg}/templates/compile.go (95%) rename {v2/pkg => pkg}/templates/compile_test.go (87%) rename {v2/pkg => pkg}/templates/doc.go (100%) rename {v2/pkg => pkg}/templates/extensions/extensions.go (100%) rename {v2/pkg => pkg}/templates/log.go (94%) rename {v2/pkg => pkg}/templates/log_test.go (100%) rename {v2/pkg => pkg}/templates/preprocessors.go (100%) create mode 100644 pkg/templates/signer/.nuclei-config/nuclei/.templates-config.json rename {v2/pkg => pkg}/templates/signer/default.go (88%) rename {v2/pkg => pkg}/templates/signer/handler.go (100%) rename {v2/pkg => pkg}/templates/signer/handler_test.go (100%) rename {v2/pkg => pkg}/templates/signer/tmpl_signer.go (99%) rename {v2/pkg => pkg}/templates/template_sign.go (83%) rename {v2/pkg => pkg}/templates/templates.go (95%) rename {v2/pkg => pkg}/templates/templates_doc.go (100%) rename {v2/pkg => pkg}/templates/templates_doc_examples.go (80%) rename {v2/pkg => pkg}/templates/templates_test.go (100%) rename {v2/pkg => pkg}/templates/tests/json-template.json (100%) rename {v2/pkg => pkg}/templates/tests/match-1.yaml (100%) rename {v2/pkg => pkg}/templates/tests/multiproto.json (100%) rename {v2/pkg => pkg}/templates/tests/multiproto.yaml (100%) rename {v2/pkg => pkg}/templates/tests/no-author.yaml (100%) rename {v2/pkg => pkg}/templates/tests/no-req.yaml (100%) rename {v2/pkg => pkg}/templates/tests/workflow.yaml (100%) rename {v2/pkg => pkg}/templates/types/types.go (98%) rename {v2/pkg => pkg}/templates/workflows.go (95%) rename {v2/pkg => pkg}/testutils/integration.go (100%) rename {v2/pkg => pkg}/testutils/testheadless/headless_local.go (100%) rename {v2/pkg => pkg}/testutils/testheadless/headless_runtime.go (100%) rename {v2/pkg => pkg}/testutils/testutils.go (91%) rename {v2/pkg => pkg}/tmplexec/README.md (100%) rename {v2/pkg => pkg}/tmplexec/doc.go (100%) rename {v2/pkg => pkg}/tmplexec/exec.go (91%) rename {v2/pkg => pkg}/tmplexec/flow/README.md (100%) rename {v2/pkg => pkg}/tmplexec/flow/builtin/dedupe.go (96%) rename {v2/pkg => pkg}/tmplexec/flow/doc.go (100%) rename {v2/pkg => pkg}/tmplexec/flow/flow_executor.go (95%) rename {v2/pkg => pkg}/tmplexec/flow/flow_executor_test.go (93%) rename {v2/pkg => pkg}/tmplexec/flow/flow_internal.go (96%) rename {v2/pkg => pkg}/tmplexec/flow/options.go (96%) rename {v2/pkg => pkg}/tmplexec/flow/testcases/condition-flow-extractors.yaml (100%) rename {v2/pkg => pkg}/tmplexec/flow/testcases/condition-flow-no-operators.yaml (100%) rename {v2/pkg => pkg}/tmplexec/flow/testcases/condition-flow.yaml (100%) rename {v2/pkg => pkg}/tmplexec/flow/testcases/nuclei-flow-dns-id.yaml (100%) rename {v2/pkg => pkg}/tmplexec/flow/testcases/nuclei-flow-dns-prefix.yaml (100%) rename {v2/pkg => pkg}/tmplexec/flow/testcases/nuclei-flow-dns.yaml (100%) rename {v2/pkg => pkg}/tmplexec/flow/util.go (87%) rename {v2/pkg => pkg}/tmplexec/generic/exec.go (94%) rename {v2/pkg => pkg}/tmplexec/interface.go (76%) rename {v2/pkg => pkg}/tmplexec/multiproto/README.md (100%) rename {v2/pkg => pkg}/tmplexec/multiproto/doc.go (100%) rename {v2/pkg => pkg}/tmplexec/multiproto/multi.go (93%) rename {v2/pkg => pkg}/tmplexec/multiproto/multi_test.go (81%) rename {v2/pkg => pkg}/tmplexec/multiproto/testcases/multiprotodynamic.yaml (100%) rename {v2/pkg => pkg}/tmplexec/multiproto/testcases/multiprotowithprefix.yaml (100%) rename {v2/pkg => pkg}/types/interfaces.go (98%) rename {v2/pkg => pkg}/types/proxy.go (100%) rename {v2/pkg => pkg}/types/resume.go (97%) rename {v2/pkg => pkg}/types/scanstrategy/scan_strategy.go (100%) rename {v2/pkg => pkg}/types/types.go (98%) rename {v2/pkg => pkg}/utils/http_probe.go (100%) rename {v2/pkg => pkg}/utils/index.go (100%) rename {v2/pkg => pkg}/utils/insertion_ordered_map.go (100%) rename {v2/pkg => pkg}/utils/insertion_ordered_map_test.go (100%) rename {v2/pkg => pkg}/utils/monitor/monitor.go (100%) rename {v2/pkg => pkg}/utils/monitor/monitor_test.go (100%) rename {v2/pkg => pkg}/utils/stats/doc.go (100%) rename {v2/pkg => pkg}/utils/stats/stats.go (100%) rename {v2/pkg => pkg}/utils/template_path.go (92%) rename {v2/pkg => pkg}/utils/utils.go (90%) rename {v2/pkg => pkg}/utils/utils_test.go (100%) rename {v2/pkg => pkg}/utils/yaml/preprocess.go (97%) rename {v2/pkg => pkg}/utils/yaml/yaml_decode_wrapper.go (100%) rename {v2/pkg => pkg}/workflows/doc.go (100%) rename {v2/pkg => pkg}/workflows/workflows.go (94%) rename {v2/pkg => pkg}/workflows/workflows_test.go (94%) delete mode 100644 v2/detect-ssl-issuer.yaml delete mode 100644 v2/key.go delete mode 100644 v2/pkg/js/devtools/bindgen/cmd/bindgen/main.go delete mode 100755 v2/pkg/js/devtools/jsdocgen/jsdocgen diff --git a/.github/dependabot.yml b/.github/dependabot.yml index dbe5721d0b..fe641f88a4 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 252203d0d5..7ebdaee1c0 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 a6bafd84fd..912080d8a0 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 24ba452e40..4292a42f19 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 2e59772307..65ca4f7063 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 2fca548ace..2e30c3cb4f 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 314d7b06ed..9622650d1f 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 df645d6e8f..4a13baae63 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 566e5ed337..a3ca5bd9f1 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 ea395911b6..99221d2ae1 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 ca4f6c111a..49cf9c5847 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 f6f789b59a..70229deba1 100644 --- a/.run/RegressionTests.run.xml +++ b/.run/RegressionTests.run.xml @@ -2,10 +2,10 @@