diff --git a/SYNTAX-REFERENCE.md b/SYNTAX-REFERENCE.md index da3484461..93037bbf2 100755 --- a/SYNTAX-REFERENCE.md +++ b/SYNTAX-REFERENCE.md @@ -101,6 +101,8 @@ requests: status: - 200 matchers-condition: and + templateid: "" + excludematchers: null path: - '{{BaseURL}}/.git/config' method: GET @@ -133,6 +135,8 @@ dns: - ec2-[-\d]+\.compute[-\d]*\.amazonaws\.com - ec2-[-\d]+\.[\w\d\-]+\.compute[-\d]*\.amazonaws\.com dsl: [] + templateid: "" + excludematchers: null name: '{{FQDN}}' type: CNAME class: inet @@ -166,6 +170,8 @@ file: regex: - amzn\.mws\.[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} dsl: [] + templateid: "" + excludematchers: null extensions: - all archive: false @@ -203,6 +209,8 @@ network: - type: word words: - zookeeper.version + templateid: "" + excludematchers: null ``` @@ -792,6 +800,8 @@ matchers: status: - 200 matchers-condition: and +templateid: "" +excludematchers: null path: - '{{BaseURL}}/.git/config' method: GET @@ -2295,6 +2305,8 @@ extractors: - ec2-[-\d]+\.compute[-\d]*\.amazonaws\.com - ec2-[-\d]+\.[\w\d\-]+\.compute[-\d]*\.amazonaws\.com dsl: [] +templateid: "" +excludematchers: null name: '{{FQDN}}' type: CNAME class: inet @@ -2615,6 +2627,8 @@ extractors: regex: - amzn\.mws\.[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} dsl: [] +templateid: "" +excludematchers: null extensions: - all archive: false @@ -2818,6 +2832,8 @@ matchers: - type: word words: - zookeeper.version +templateid: "" +excludematchers: null ``` Part Definitions: diff --git a/nuclei-jsonschema.json b/nuclei-jsonschema.json index 63b121a99..499048916 100755 --- a/nuclei-jsonschema.json +++ b/nuclei-jsonschema.json @@ -352,6 +352,11 @@ "title": "type of the attack", "description": "Type of the attack" }, + "excludematchers.ExcludeMatchers": { + "properties": {}, + "additionalProperties": false, + "type": "object" + }, "variables.Variable": { "properties": {}, "additionalProperties": false, @@ -375,6 +380,10 @@ "description": "Type is the type of DNS request to make" }, "dns.Request": { + "required": [ + "TemplateID", + "ExcludeMatchers" + ], "properties": { "matchers": { "items": { @@ -401,6 +410,12 @@ "title": "condition between the matchers", "description": "Conditions between the matchers" }, + "TemplateID": { + "type": "string" + }, + "ExcludeMatchers": { + "$ref": "#/definitions/excludematchers.ExcludeMatchers" + }, "id": { "type": "string", "title": "id of the dns request", @@ -464,6 +479,8 @@ }, "file.Request": { "required": [ + "TemplateID", + "ExcludeMatchers", "Archive", "MimeType" ], @@ -493,6 +510,12 @@ "title": "condition between the matchers", "description": "Conditions between the matchers" }, + "TemplateID": { + "type": "string" + }, + "ExcludeMatchers": { + "$ref": "#/definitions/excludematchers.ExcludeMatchers" + }, "extensions": { "items": { "type": "string" @@ -535,6 +558,10 @@ "type": "object" }, "headless.Request": { + "required": [ + "TemplateID", + "ExcludeMatchers" + ], "properties": { "id": { "type": "string", @@ -600,6 +627,12 @@ "type": "string", "title": "condition between the matchers", "description": "Conditions between the matchers" + }, + "TemplateID": { + "type": "string" + }, + "ExcludeMatchers": { + "$ref": "#/definitions/excludematchers.ExcludeMatchers" } }, "additionalProperties": false, @@ -688,6 +721,10 @@ "description": "Method is the HTTP Request Method" }, "http.Request": { + "required": [ + "TemplateID", + "ExcludeMatchers" + ], "properties": { "matchers": { "items": { @@ -716,6 +753,13 @@ "title": "condition between the matchers", "description": "Conditions between the matchers" }, + "TemplateID": { + "type": "string" + }, + "ExcludeMatchers": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/excludematchers.ExcludeMatchers" + }, "path": { "items": { "type": "string" @@ -923,6 +967,10 @@ "description": "description=Type of input specified in data field" }, "network.Request": { + "required": [ + "TemplateID", + "ExcludeMatchers" + ], "properties": { "id": { "type": "string", @@ -995,12 +1043,22 @@ "type": "string", "title": "condition between the matchers", "description": "Conditions between the matchers" + }, + "TemplateID": { + "type": "string" + }, + "ExcludeMatchers": { + "$ref": "#/definitions/excludematchers.ExcludeMatchers" } }, "additionalProperties": false, "type": "object" }, "ssl.Request": { + "required": [ + "TemplateID", + "ExcludeMatchers" + ], "properties": { "matchers": { "items": { @@ -1027,6 +1085,12 @@ "title": "condition between the matchers", "description": "Conditions between the matchers" }, + "TemplateID": { + "type": "string" + }, + "ExcludeMatchers": { + "$ref": "#/definitions/excludematchers.ExcludeMatchers" + }, "address": { "type": "string", "title": "address for the ssl request", @@ -1083,6 +1147,10 @@ "type": "object" }, "websocket.Request": { + "required": [ + "TemplateID", + "ExcludeMatchers" + ], "properties": { "matchers": { "items": { @@ -1109,6 +1177,12 @@ "title": "condition between the matchers", "description": "Conditions between the matchers" }, + "TemplateID": { + "type": "string" + }, + "ExcludeMatchers": { + "$ref": "#/definitions/excludematchers.ExcludeMatchers" + }, "address": { "type": "string", "title": "address for the websocket request", @@ -1153,6 +1227,10 @@ "type": "object" }, "whois.Request": { + "required": [ + "TemplateID", + "ExcludeMatchers" + ], "properties": { "matchers": { "items": { @@ -1179,6 +1257,12 @@ "title": "condition between the matchers", "description": "Conditions between the matchers" }, + "TemplateID": { + "type": "string" + }, + "ExcludeMatchers": { + "$ref": "#/definitions/excludematchers.ExcludeMatchers" + }, "query": { "type": "string", "title": "query for the WHOIS request",