Fixed invalid fields in request (#2788)

SYNTAX-REFERENCE.md

@@ -101,8 +101,6 @@ requests:
           status:
             - 200
     matchers-condition: and
-    templateid: ""
-    excludematchers: null
     path:
         - '{{BaseURL}}/.git/config'
     method: GET
@@ -135,8 +133,6 @@ 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
@@ -170,8 +166,6 @@ 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
@@ -209,8 +203,6 @@ network:
         - type: word
           words:
             - zookeeper.version
-    templateid: ""
-    excludematchers: null
 ```
 
 
@@ -802,8 +794,6 @@ matchers:
       status:
         - 200
 matchers-condition: and
-templateid: ""
-excludematchers: null
 path:
     - '{{BaseURL}}/.git/config'
 method: GET
@@ -2322,8 +2312,6 @@ 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
@@ -2644,8 +2632,6 @@ 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
@@ -2849,8 +2835,6 @@ matchers:
     - type: word
       words:
         - zookeeper.version
-templateid: ""
-excludematchers: null
 ```
 
 Part Definitions: 

nuclei-jsonschema.json

@@ -352,11 +352,6 @@
       "title": "type of the attack",
       "description": "Type of the attack"
     },
-    "excludematchers.ExcludeMatchers": {
-      "properties": {},
-      "additionalProperties": false,
-      "type": "object"
-    },
     "variables.Variable": {
       "properties": {},
       "additionalProperties": false,
@@ -380,10 +375,6 @@
       "description": "Type is the type of DNS request to make"
     },
     "dns.Request": {
-      "required": [
-        "TemplateID",
-        "ExcludeMatchers"
-      ],
       "properties": {
         "matchers": {
           "items": {
@@ -410,12 +401,6 @@
           "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",
@@ -479,8 +464,6 @@
     },
     "file.Request": {
       "required": [
-        "TemplateID",
-        "ExcludeMatchers",
         "Archive",
         "MimeType"
       ],
@@ -510,12 +493,6 @@
           "title": "condition between the matchers",
           "description": "Conditions between the matchers"
         },
-        "TemplateID": {
-          "type": "string"
-        },
-        "ExcludeMatchers": {
-          "$ref": "#/definitions/excludematchers.ExcludeMatchers"
-        },
         "extensions": {
           "items": {
             "type": "string"
@@ -558,10 +535,6 @@
       "type": "object"
     },
     "headless.Request": {
-      "required": [
-        "TemplateID",
-        "ExcludeMatchers"
-      ],
       "properties": {
         "id": {
           "type": "string",
@@ -627,12 +600,6 @@
           "type": "string",
           "title": "condition between the matchers",
           "description": "Conditions between the matchers"
-        },
-        "TemplateID": {
-          "type": "string"
-        },
-        "ExcludeMatchers": {
-          "$ref": "#/definitions/excludematchers.ExcludeMatchers"
         }
       },
       "additionalProperties": false,
@@ -721,10 +688,6 @@
       "description": "Method is the HTTP Request Method"
     },
     "http.Request": {
-      "required": [
-        "TemplateID",
-        "ExcludeMatchers"
-      ],
       "properties": {
         "matchers": {
           "items": {
@@ -753,13 +716,6 @@
           "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"
@@ -972,10 +928,6 @@
       "description": "description=Type of input specified in data field"
     },
     "network.Request": {
-      "required": [
-        "TemplateID",
-        "ExcludeMatchers"
-      ],
       "properties": {
         "id": {
           "type": "string",
@@ -1048,22 +1000,12 @@
           "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": {
@@ -1090,12 +1032,6 @@
           "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",
@@ -1152,10 +1088,6 @@
       "type": "object"
     },
     "websocket.Request": {
-      "required": [
-        "TemplateID",
-        "ExcludeMatchers"
-      ],
       "properties": {
         "matchers": {
           "items": {
@@ -1182,12 +1114,6 @@
           "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",
@@ -1232,10 +1158,6 @@
       "type": "object"
     },
     "whois.Request": {
-      "required": [
-        "TemplateID",
-        "ExcludeMatchers"
-      ],
       "properties": {
         "matchers": {
           "items": {
@@ -1262,12 +1184,6 @@
           "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",

v2/pkg/operators/operators.go

@@ -37,9 +37,9 @@ type Operators struct {
 	matchersCondition matchers.ConditionType
 
 	// TemplateID is the ID of the template for matcher
-	TemplateID string
+	TemplateID string `json:"-" yaml:"-" jsonschema:"-"`
 	// ExcludeMatchers is a list of excludeMatchers items
-	ExcludeMatchers *excludematchers.ExcludeMatchers
+	ExcludeMatchers *excludematchers.ExcludeMatchers `json:"-" yaml:"-" jsonschema:"-"`
 }
 
 // Compile compiles the operators as well as their corresponding matchers and extractors