diff --git a/v2/go.sum b/v2/go.sum
index 97e87b5d9..b0bc19b38 100644
--- a/v2/go.sum
+++ b/v2/go.sum
@@ -96,7 +96,6 @@ github.com/corpix/uarand v0.1.1 h1:RMr1TWc9F4n5jiPDzFHtmaUXLKLNUFK0SgCLo4BhX/U=
github.com/corpix/uarand v0.1.1/go.mod h1:SFKZvkcRoLqVRFZ4u25xPmp6m9ktANfbpXZ7SJ0/FNU=
github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/dave/dst v0.26.2 h1:lnxLAKI3tx7MgLNVDirFCsDTlTG9nKTk7GcptKcWSwY=
github.com/dave/dst v0.26.2/go.mod h1:UMDJuIRPfyUCC78eFuB+SV/WI8oDeyFDvM/JR6NI3IU=
github.com/dave/gopackages v0.0.0-20170318123100-46e7023ec56e/go.mod h1:i00+b/gKdIDIxuLDFob7ustLAVqhsZRk2qVZrArELGQ=
github.com/dave/jennifer v1.2.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg=
@@ -792,7 +791,6 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-mvdan.cc/gofumpt v0.1.1 h1:bi/1aS/5W00E2ny5q65w9SnKpWEF/UIOqDYBILpo9rA=
mvdan.cc/gofumpt v0.1.1/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
diff --git a/v2/nuclei-jsonschema.json b/v2/nuclei-jsonschema.json
index 6092a125a..5eb5c9889 100755
--- a/v2/nuclei-jsonschema.json
+++ b/v2/nuclei-jsonschema.json
@@ -309,12 +309,12 @@
},
"class": {
"enum": [
- "inet",
- "csnet",
- "chaos",
- "hesiod",
- "none",
- "any"
+ "INET",
+ "CSNET",
+ "CHAOS",
+ "HESIOD",
+ "NONE",
+ "ANY"
],
"type": "string",
"title": "class of DNS request",
@@ -662,11 +662,6 @@
"type": "boolean",
"title": "preserve request history",
"description": "Automatically assigns numbers to requests and preserves their history"
- },
- "stop-at-first-match": {
- "type": "boolean",
- "title": "stop at first match",
- "description": "Stop the execution after a match is found"
}
},
"additionalProperties": false,
diff --git a/v2/pkg/templates/templates_doc.go b/v2/pkg/templates/templates_doc.go
index 04b8682cb..88fa78220 100644
--- a/v2/pkg/templates/templates_doc.go
+++ b/v2/pkg/templates/templates_doc.go
@@ -188,7 +188,7 @@ func init() {
FieldName: "requests",
},
}
- HTTPRequestDoc.Fields = make([]encoder.Doc, 25)
+ HTTPRequestDoc.Fields = make([]encoder.Doc, 24)
HTTPRequestDoc.Fields[0].Name = "matchers"
HTTPRequestDoc.Fields[0].Type = "[]matchers.Matcher"
HTTPRequestDoc.Fields[0].Note = ""
@@ -349,11 +349,6 @@ func init() {
HTTPRequestDoc.Fields[23].Note = ""
HTTPRequestDoc.Fields[23].Description = "ReqCondition automatically assigns numbers to requests and preserves their history.\n\nThis allows matching on them later for multi-request conditions."
HTTPRequestDoc.Fields[23].Comments[encoder.LineComment] = "ReqCondition automatically assigns numbers to requests and preserves their history."
- HTTPRequestDoc.Fields[24].Name = "stop-at-first-match"
- HTTPRequestDoc.Fields[24].Type = "bool"
- HTTPRequestDoc.Fields[24].Note = ""
- HTTPRequestDoc.Fields[24].Description = "StopAtFirstMatch stops the execution of the requests as soon as a match is found."
- HTTPRequestDoc.Fields[24].Comments[encoder.LineComment] = "StopAtFirstMatch stops the execution of the requests as soon as a match is found."
MATCHERSMatcherDoc.Type = "matchers.Matcher"
MATCHERSMatcherDoc.Comments[encoder.LineComment] = " Matcher is used to match a part in the output from a protocol."
@@ -530,8 +525,8 @@ func init() {
EXTRACTORSExtractorDoc.Fields[2].Name = "regex"
EXTRACTORSExtractorDoc.Fields[2].Type = "[]string"
EXTRACTORSExtractorDoc.Fields[2].Note = ""
- EXTRACTORSExtractorDoc.Fields[2].Description = "Regex contains the regular expression patterns to extract from a part.\n\nGo regex engine does not support lookaheads or lookbehinds, so as a result\nthey are also not supported in nuclei."
- EXTRACTORSExtractorDoc.Fields[2].Comments[encoder.LineComment] = "Regex contains the regular expression patterns to extract from a part."
+ EXTRACTORSExtractorDoc.Fields[2].Description = "Regex contains the regular expression patterns to exract from a part.\n\nGo regex engine does not supports lookaheads or lookbehinds, so as a result\nthey are also not supported in nuclei."
+ EXTRACTORSExtractorDoc.Fields[2].Comments[encoder.LineComment] = "Regex contains the regular expression patterns to exract from a part."
EXTRACTORSExtractorDoc.Fields[2].AddExample("Braintree Access Token Regex", []string{"access_token\\$production\\$[0-9a-z]{16}\\$[0-9a-f]{32}"})
@@ -657,12 +652,12 @@ func init() {
DNSRequestDoc.Fields[6].Description = "Class is the class of the DNS request.\n\nUsually it's enough to just leave it as INET."
DNSRequestDoc.Fields[6].Comments[encoder.LineComment] = "Class is the class of the DNS request."
DNSRequestDoc.Fields[6].Values = []string{
- "inet",
- "csnet",
- "chaos",
- "hesiod",
- "none",
- "any",
+ "INET",
+ "CSNET",
+ "CHAOS",
+ "HESIOD",
+ "NONE",
+ "ANY",
}
DNSRequestDoc.Fields[7].Name = "retries"
DNSRequestDoc.Fields[7].Type = "int"
diff --git a/v2/syntax-reference.md b/v2/syntax-reference.md
index 5b47f5b00..bbe6ebe6b 100755
--- a/v2/syntax-reference.md
+++ b/v2/syntax-reference.md
@@ -60,8 +60,10 @@ Examples:
```yaml
info:
name: Argument Injection in Ruby Dragonfly
- author: 0xspara
- tags: cve,cve2021,rce,ruby
+ author:
+ - 0xspara
+ tags:
+ - cve,cve2021,rce,ruby
reference: https://zxsecurity.co.nz/research/argunment-injection-ruby-dragonfly/
severity: high
```
@@ -246,8 +248,10 @@ Appears in:
```yaml
name: Argument Injection in Ruby Dragonfly
-author: 0xspara
-tags: cve,cve2021,rce,ruby
+author:
+ - 0xspara
+tags:
+ - cve,cve2021,rce,ruby
reference: https://zxsecurity.co.nz/research/argunment-injection-ruby-dragonfly/
severity: high
```
@@ -1001,19 +1005,6 @@ This allows matching on them later for multi-request conditions.
-
-
-stop-at-first-match bool
-
-
-
-
-StopAtFirstMatch stops the execution of the requests as soon as a match is found.
-
-
-
-
-
@@ -1429,9 +1420,9 @@ Valid values:
-Regex contains the regular expression patterns to extract from a part.
+Regex contains the regular expression patterns to exract from a part.
-Go regex engine does not support lookaheads or lookbehinds, so as a result
+Go regex engine does not supports lookaheads or lookbehinds, so as a result
they are also not supported in nuclei.
@@ -1807,17 +1798,17 @@ Usually it's enough to just leave it as INET.
Valid values:
- - inet
+ - INET
- - csnet
+ - CSNET
- - chaos
+ - CHAOS
- - hesiod
+ - HESIOD
- - none
+ - NONE
- - any
+ - ANY