]> git.ipfire.org Git - thirdparty/suricata-verify.git/commitdiff
dns tests: enable eve v1 tests for Rust builds. 4/head
authorJason Ish <ish@unx.ca>
Mon, 3 Dec 2018 16:38:01 +0000 (10:38 -0600)
committerJason Ish <ish@unx.ca>
Thu, 6 Dec 2018 17:10:09 +0000 (11:10 -0600)
Suricata branch ish/rust-dns-v1/v1 brings DNS v1 logging
support for Rust.

41 files changed:
tests/dns-eve/suricata.yaml
tests/dns-eve/test.yaml
tests/dns-json-log/suricata.yaml
tests/dns-json-log/test.yaml
tests/dns-lua-rules/test.yaml
tests/dns-single-request/suricata.yaml
tests/dns-single-request/test.yaml
tests/dns-tcp-multirequest-buffer-1/suricata.yaml
tests/dns-tcp-multirequest-buffer-1/test.yaml
tests/dns-tcp-ts-gap/check.sh [deleted file]
tests/dns-tcp-ts-gap/suricata.yaml [new file with mode: 0644]
tests/dns-tcp-ts-gap/test.yaml
tests/dns-tcp-www-google-com/check.sh [deleted file]
tests/dns-tcp-www-google-com/suricata.yaml
tests/dns-tcp-www-google-com/test.yaml
tests/dns-udp-dig-a-www-suricata-ids-org/suricata.yaml [new file with mode: 0644]
tests/dns-udp-dig-a-www-suricata-ids-org/test.yaml
tests/dns-udp-double-request-response/check.sh [deleted file]
tests/dns-udp-double-request-response/suricata.yaml
tests/dns-udp-double-request-response/test.yaml
tests/dns-udp-eve-log-aaaa-only/suricata.yaml
tests/dns-udp-eve-log-aaaa-only/test.yaml
tests/dns-udp-eve-log-answer-only/suricata.yaml
tests/dns-udp-eve-log-answer-only/test.yaml
tests/dns-udp-eve-log-mx-only/suricata.yaml
tests/dns-udp-eve-log-mx-only/test.yaml
tests/dns-udp-eve-log-query-only/suricata.yaml
tests/dns-udp-eve-log-query-only/test.yaml
tests/dns-udp-eve-log-txt/suricata.yaml [new file with mode: 0644]
tests/dns-udp-eve-log-txt/test.yaml
tests/dns-udp-nxdomain-soa/check.sh [deleted file]
tests/dns-udp-nxdomain-soa/suricata.yaml
tests/dns-udp-nxdomain-soa/test.yaml
tests/dns-udp-unsolicited-response/check.sh [deleted file]
tests/dns-udp-unsolicited-response/dns-events.rules [deleted file]
tests/dns-udp-unsolicited-response/suricata.yaml
tests/dns-udp-unsolicited-response/test.yaml
tests/eve-alert-metadata-defaults/test.yaml
tests/eve-alert-metadata-enable-rule/test.yaml
tests/eve-alert-metadata-off/test.yaml
tests/eve-metadata/test.yaml

index 62cad45ef8142bc832f6ede007f5bb7fbf386c2a..cda656a479c7d9b544636de1c6cb4f0e40970f05 100644 (file)
@@ -11,26 +11,8 @@ stats:
 outputs:
   - eve-log:
       enabled: yes
-      filetype: regular #regular|syslog|unix_dgram|unix_stream|redis
+      filetype: regular
       filename: eve.json
-      #prefix: "@cee: " # prefix to prepend to each log entry
-      # the following are valid when type: syslog above
-      #identity: "suricata"
-      #facility: local5
-      #level: Info ## possible levels: Emergency, Alert, Critical,
-                   ## Error, Warning, Notice, Info, Debug
-      #redis:
-      #  server: 127.0.0.1
-      #  port: 6379
-      #  mode: list ## possible values: list (default), channel
-      #  key: suricata ## key or channel to use (default to suricata)
-      # Redis pipelining set up. This will enable to only do a query every
-      # 'batch-size' events. This should lower the latency induced by network
-      # connection at the cost of some memory. There is no flushing implemented
-      # so this setting as to be reserved to high traffic suricata.
-      #  pipelining:
-      #    enabled: yes ## set enable to yes to enable query pipelining
-      #    batch-size: 10 ## number of entry to keep in buffer
       types:
         - alert:
             # payload: yes             # enable dumping payload in Base64
@@ -64,7 +46,8 @@ outputs:
             # custom allows additional http fields to be included in eve-log
             # the example below adds three additional fields when uncommented
             #custom: [Accept-Encoding, Accept-Language, Authorization]
-        - dns
+        - dns:
+            version: 1
         - tls:
             extended: yes     # enable this for extended logging information
         - files:
index 9051dd8146d73307bfeff1aa201efb069654e8de..56ea9b0d57173b93569d9c72c9b1372ce9234d13 100644 (file)
@@ -1,7 +1,3 @@
 requires:
   features:
     - HAVE_LIBJANSSON
-
-skip:
-  - feature: RUST
-    msg: eve dns v1 not supported by rust
index 19bd407a446829b164e50bd9b8aefe7c7322a5b3..4daa2b75fbf47ffebace4681b8e8c622ab93b965 100644 (file)
@@ -3,5 +3,6 @@
 
 outputs:
   - dns-json-log:
+      version: 1
       enabled: yes
       filename: dns.json
index 9051dd8146d73307bfeff1aa201efb069654e8de..56ea9b0d57173b93569d9c72c9b1372ce9234d13 100644 (file)
@@ -1,7 +1,3 @@
 requires:
   features:
     - HAVE_LIBJANSSON
-
-skip:
-  - feature: RUST
-    msg: eve dns v1 not supported by rust
index e3fc984da4094ec3121dc75f9cfc751ad0c1f894..656f5eeaac1e58572b0721ae2076bdff75f10001 100644 (file)
@@ -2,9 +2,9 @@ requires:
   features:
     - HAVE_LUA
 
-skip:
-  - feature: RUST
-    msg: Known issue with feature RUST
+skip:
+  - feature: RUST
+    msg: Known issue with feature RUST
 
 checks:
   - filter:
index 356034273a42e1f070b4a5baa892f216070a4af4..5f7eded22dbe6f08572e51f398c349ce1949c786 100644 (file)
@@ -1,11 +1,10 @@
 %YAML 1.1
 ---
 
-include: ../../etc/suricata-3.1.2.yaml
-
 outputs:
   - eve-log:
       enabled: yes
       filename: eve.json
       types:
-        - dns
+        - dns:
+            version: 1
index 1fae0c7db831c44513d9f9af45615ee90050102e..56ea9b0d57173b93569d9c72c9b1372ce9234d13 100644 (file)
@@ -1,6 +1,3 @@
 requires:
   features:
     - HAVE_LIBJANSSON
-skip:
-  - feature: RUST
-    msg: eve dns v1 not supported by rust
index 502e7076da51541527c9bdc885a2e32c2de921d6..60e848851012b6586a79350a5c8c2c836fd4710f 100644 (file)
@@ -1,4 +1,10 @@
 %YAML 1.1
 ---
 
-include: ../../etc/suricata-3.1.2.yaml
+outputs:
+  - eve-log:
+      enabled: yes
+      types:
+        - dns:
+            version: 1
+          
index d1d27987583eba191b226b2f514f1c58820f2fc7..695f2f882f4ca65660e79aff15f931fe504120c4 100644 (file)
@@ -1,8 +1,4 @@
 requires:
   features:
     - HAVE_LIBJANSSON
-
-skip:
-  - feature: RUST
-    msg: eve dns v1 not supported by rust
     
diff --git a/tests/dns-tcp-ts-gap/check.sh b/tests/dns-tcp-ts-gap/check.sh
deleted file mode 100755 (executable)
index d154476..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh
-
-. ${TOPDIR}/util/functions.sh
-
-# As a request was missing, we should have 2 requests, but 26
-# responses, as each request resulted in 12 responses.
-log=./eve.json
-
-n=$(cat ${log} | \
-       jq -c 'select(.event_type == "dns") | select(.dns.type == "query")' | \
-       wc -l | xargs)
-assert_eq 2 $n
-
-n=$(cat ${log} | \
-       jq -c 'select(.event_type == "dns") | select(.dns.type == "answer")' | \
-       wc -l | xargs)
-assert_eq 36 $n
-
-exit 0
diff --git a/tests/dns-tcp-ts-gap/suricata.yaml b/tests/dns-tcp-ts-gap/suricata.yaml
new file mode 100644 (file)
index 0000000..5f7eded
--- /dev/null
@@ -0,0 +1,10 @@
+%YAML 1.1
+---
+
+outputs:
+  - eve-log:
+      enabled: yes
+      filename: eve.json
+      types:
+        - dns:
+            version: 1
index bcf978036d0d8fb869c019541f46f414de662fed..5b643dfacc9238108f03f95c40ebc4e510731f48 100644 (file)
@@ -4,7 +4,14 @@ requires:
   features:
     - HAVE_LIBJANSSON
 
-skip:
-  - config:
-      # Skip if using eve.dns version 2.
-      outputs.\d.eve-log.types.\d.dns.version: 2
+checks:
+  - filter:
+      count: 2
+      match:
+        event_type: dns
+        dns.type: query
+  - filter:
+      count: 36
+      match:
+        event_type: dns
+        dns.type: answer
diff --git a/tests/dns-tcp-www-google-com/check.sh b/tests/dns-tcp-www-google-com/check.sh
deleted file mode 100755 (executable)
index e3e3b7f..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/sh
-
-. ${TOPDIR}/util/functions.sh
-
-# One DNS request.
-n=$(jq_count eve.json 'select(.event_type == "dns") | select(.dns.type == "query")')
-assert_eq 1 $n "dns requests"
-
-# 12 DNS responses.
-n=$(jq_count eve.json 'select(.event_type == "dns") | select(.dns.type == "answer")')
-assert_eq 12 $n "dns responses"
index 3117255641906570d1f6d58cfeb081a957197ce0..6e0f4008d5a12107ca98b6f17bb26a86399eeb78 100644 (file)
@@ -1,8 +1,13 @@
 %YAML 1.1
 ---
 
-include: ../../etc/suricata-3.1.2.yaml
-
 # Remove stats logging.
 stats:
   enabled: no
+
+outputs:
+  - eve-log:
+      enabled: yes
+      types:
+        - dns:
+            version: 1
index d1d27987583eba191b226b2f514f1c58820f2fc7..6abaebc5b2129b3467f1646eae289108bb2d6224 100644 (file)
@@ -2,7 +2,14 @@ requires:
   features:
     - HAVE_LIBJANSSON
 
-skip:
-  - feature: RUST
-    msg: eve dns v1 not supported by rust
-    
+checks:
+  - filter:
+      count: 1
+      match:
+        event_type: dns
+        dns.type: query
+  - filter:
+      count: 12
+      match:
+        event_type: dns
+        dns.type: answer
diff --git a/tests/dns-udp-dig-a-www-suricata-ids-org/suricata.yaml b/tests/dns-udp-dig-a-www-suricata-ids-org/suricata.yaml
new file mode 100644 (file)
index 0000000..04fea5f
--- /dev/null
@@ -0,0 +1,11 @@
+%YAML 1.1
+---
+
+outputs:
+  - eve-log:
+      enabled: yes
+      filetype: regular
+      filename: eve.json
+      types:
+        - dns:
+            version: 1
index a3efcb3f65f2511932538a56cde6d39b8c6f4ba6..23a2d9671cedfdf80adfebd3aa377f31e5da433b 100644 (file)
@@ -2,11 +2,6 @@ requires:
   features:
     - HAVE_LIBJANSSON
 
-skip:
-  - config:
-      # Skip if using eve.dns version 2.
-      outputs.\d.eve-log.types.\d.dns.version: 2
-
 checks:
 
   - filter:
diff --git a/tests/dns-udp-double-request-response/check.sh b/tests/dns-udp-double-request-response/check.sh
deleted file mode 100755 (executable)
index d8f04ec..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /bin/sh
-
-# Check queries.
-c=$(cat eve.json | jq -c 'select(.dns.type == "query")' | wc -l | xargs)
-if [ "${c}" -ne 2 ]; then
-    echo "error: expected 2 DNS queries, got ${c}"
-    exit 1
-fi
-
-# Check answer count.
-c=$(cat eve.json | jq -c 'select(.dns.type == "answer")' | wc -l | xargs)
-if [ "${c}" -ne 9 ]; then
-    echo "error: expected 9 DNS answers, got ${c}"
-    exit 1
-fi
index 502e7076da51541527c9bdc885a2e32c2de921d6..5f7eded22dbe6f08572e51f398c349ce1949c786 100644 (file)
@@ -1,4 +1,10 @@
 %YAML 1.1
 ---
 
-include: ../../etc/suricata-3.1.2.yaml
+outputs:
+  - eve-log:
+      enabled: yes
+      filename: eve.json
+      types:
+        - dns:
+            version: 1
index 9051dd8146d73307bfeff1aa201efb069654e8de..7804b105beeb67cb6a822b6745e7e439395f8abd 100644 (file)
@@ -2,6 +2,14 @@ requires:
   features:
     - HAVE_LIBJANSSON
 
-skip:
-  - feature: RUST
-    msg: eve dns v1 not supported by rust
+checks:
+  - filter:
+      count: 2
+      match:
+        event_type: dns
+        dns.type: query
+  - filter:
+      count: 9
+      match:
+        event_type: dns
+        dns.type: answer
index 8b56c205d3f4386ba24b3e35988689511014fcd1..2c9df4c08c994941416668166be99d11e4cb6e6f 100644 (file)
@@ -8,4 +8,5 @@ outputs:
       filename: eve.json
       types:
         - dns:
+            version: 1
             custom: [aaaa]
index 9051dd8146d73307bfeff1aa201efb069654e8de..56ea9b0d57173b93569d9c72c9b1372ce9234d13 100644 (file)
@@ -1,7 +1,3 @@
 requires:
   features:
     - HAVE_LIBJANSSON
-
-skip:
-  - feature: RUST
-    msg: eve dns v1 not supported by rust
index 1bf5f71d8b688bd951bb7d6133413ac76e1cfc6c..e4ac0832edfcfc613fe6da6b9a10590a2215373e 100644 (file)
@@ -8,6 +8,7 @@ outputs:
       filename: eve.json
       types:
         - dns:
+            version: 1
             query: no
             answer: yes
         
index 9051dd8146d73307bfeff1aa201efb069654e8de..56ea9b0d57173b93569d9c72c9b1372ce9234d13 100644 (file)
@@ -1,7 +1,3 @@
 requires:
   features:
     - HAVE_LIBJANSSON
-
-skip:
-  - feature: RUST
-    msg: eve dns v1 not supported by rust
index af5d3f6fe9a66defdbe225b8b8cd2d1cc386b561..a27aeb3e19f8208e746610def63215dba876b1ae 100644 (file)
@@ -8,4 +8,5 @@ outputs:
       filename: eve.json
       types:
         - dns:
+            version: 1
             custom: [mx]
index 9051dd8146d73307bfeff1aa201efb069654e8de..56ea9b0d57173b93569d9c72c9b1372ce9234d13 100644 (file)
@@ -1,7 +1,3 @@
 requires:
   features:
     - HAVE_LIBJANSSON
-
-skip:
-  - feature: RUST
-    msg: eve dns v1 not supported by rust
index 298b4f80208a32d0ab52a10a8ca3f4eba33283f7..dfa6e4cb4d076d9d2852f6fc5293018f650b39c6 100644 (file)
@@ -8,6 +8,7 @@ outputs:
       filename: eve.json
       types:
         - dns:
+            version: 1
             query: yes
             answer: no
         
index 9051dd8146d73307bfeff1aa201efb069654e8de..56ea9b0d57173b93569d9c72c9b1372ce9234d13 100644 (file)
@@ -1,7 +1,3 @@
 requires:
   features:
     - HAVE_LIBJANSSON
-
-skip:
-  - feature: RUST
-    msg: eve dns v1 not supported by rust
diff --git a/tests/dns-udp-eve-log-txt/suricata.yaml b/tests/dns-udp-eve-log-txt/suricata.yaml
new file mode 100644 (file)
index 0000000..5f7eded
--- /dev/null
@@ -0,0 +1,10 @@
+%YAML 1.1
+---
+
+outputs:
+  - eve-log:
+      enabled: yes
+      filename: eve.json
+      types:
+        - dns:
+            version: 1
index 6f5121f57ac42ccf23f065b16c8daecb5b7e36ac..56ea9b0d57173b93569d9c72c9b1372ce9234d13 100644 (file)
@@ -1,8 +1,3 @@
 requires:
   features:
     - HAVE_LIBJANSSON
-
-skip:
-  - config:
-      # Skip if using eve.dns version 2.
-      outputs.\d.eve-log.types.\d.dns.version: 2
diff --git a/tests/dns-udp-nxdomain-soa/check.sh b/tests/dns-udp-nxdomain-soa/check.sh
deleted file mode 100755 (executable)
index 05a8555..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-. ${TOPDIR}/util/functions.sh
-
-# Look for 2 responses with rcode == "NXDOMAIN".
-n=$(jq_count eve.json 'select(.dns.rcode == "NXDOMAIN")')
-assert_eq 2 "$n" "nxdomain responses"
-
-exit 0
index 502e7076da51541527c9bdc885a2e32c2de921d6..ea4c8d626ba2018f2c7b5ace67bf4db8f2bd17c6 100644 (file)
@@ -1,4 +1,11 @@
 %YAML 1.1
 ---
 
-include: ../../etc/suricata-3.1.2.yaml
+outputs:
+  - eve-log:
+      enabled: yes
+      filename: eve.json
+      types:
+        - dns:
+            version: 1
+            
index 9051dd8146d73307bfeff1aa201efb069654e8de..fd8ea68f035083ee57fc2f123de919d36b3fb44d 100644 (file)
@@ -2,6 +2,10 @@ requires:
   features:
     - HAVE_LIBJANSSON
 
-skip:
-  - feature: RUST
-    msg: eve dns v1 not supported by rust
+checks:
+  - filter:
+      count: 2
+      match:
+        event_type: dns
+        dns.rcode: NXDOMAIN
+    
diff --git a/tests/dns-udp-unsolicited-response/check.sh b/tests/dns-udp-unsolicited-response/check.sh
deleted file mode 100755 (executable)
index f876b16..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh
-
-# Check for 1 DNS request.
-n=$(cat eve.json | jq -c 'select(.dns.type == "query")' | wc -l | xargs)
-if [ ${n} -ne 1 ]; then
-    exit 1
-fi
-
-# Check for 1 DNS response.
-n=$(cat eve.json | jq -c 'select(.dns.type == "answer")' | wc -l | xargs)
-if [ ${n} -ne 2 ]; then
-    exit 1
-fi
-
-# Check for one alert.
-n=$(cat eve.json | jq -c 'select(.event_type == "alert")' | wc -l | xargs)
-if [ ${n} -ne 1 ]; then
-    exit 1
-fi
-
-exit 0
diff --git a/tests/dns-udp-unsolicited-response/dns-events.rules b/tests/dns-udp-unsolicited-response/dns-events.rules
deleted file mode 100644 (file)
index 82ee633..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-# Response (answer) we didn't see a Request for. Could be packet loss.
-alert dns any any -> any any (msg:"SURICATA DNS Unsolicited response"; flow:to_client; app-layer-event:dns.unsollicited_response; sid:2240001; rev:1;)
-# Malformed data in request. Malformed means length fields are wrong, etc.
-alert dns any any -> any any (msg:"SURICATA DNS malformed request data"; flow:to_server; app-layer-event:dns.malformed_data; sid:2240002; rev:1;)
-alert dns any any -> any any (msg:"SURICATA DNS malformed response data"; flow:to_client; app-layer-event:dns.malformed_data; sid:2240003; rev:1;)
-# Response flag set on to_server packet
-alert dns any any -> any any (msg:"SURICATA DNS Not a request"; flow:to_server; app-layer-event:dns.not_a_request; sid:2240004; rev:1;)
-# Response flag not set on to_client packet
-alert dns any any -> any any (msg:"SURICATA DNS Not a response"; flow:to_client; app-layer-event:dns.not_a_response; sid:2240005; rev:1;)
-# Z flag (reserved) not 0
-alert dns any any -> any any (msg:"SURICATA DNS Z flag set"; app-layer-event:dns.z_flag_set; sid:2240006; rev:1;)
-# Request Flood Detected
-alert dns any any -> any any (msg:"SURICATA DNS request flood detected"; flow:to_server; app-layer-event:dns.flooded; sid:2240007; rev:1;)
-# Per-flow (state) memcap reached. Relates to the app-layer.protocols.dns.state-memcap setting.
-alert dns any any -> any any (msg:"SURICATA DNS flow memcap reached"; flow:to_server; app-layer-event:dns.state_memcap_reached; sid:2240008; rev:2;)
index 502e7076da51541527c9bdc885a2e32c2de921d6..f4b03a5c5fbed1949699dfca539b201d485f5dd0 100644 (file)
@@ -1,4 +1,11 @@
 %YAML 1.1
 ---
 
-include: ../../etc/suricata-3.1.2.yaml
+outputs:
+  - eve-log:
+      enabled: true
+      filename: eve.json
+      types:
+        - alert
+        - dns:
+            version: 1
index 1d9dd5bcbac42b7372469bff180e4303119c9602..e26348f01464d9fc88d387de2fe851fd652dd369 100644 (file)
@@ -2,5 +2,14 @@ requires:
   features:
     - HAVE_LIBJANSSON
 
-skip:
-  - feature: RUST
+checks:
+  - filter:
+      count: 1
+      match:
+        event_type: dns
+        dns.type: query
+  - filter:
+      count: 2
+      match:
+        event_type: dns
+        dns.type: answer
index 982b04d04e88f85f3c3e03ab2d87d37b8592d8bf..be9aebb5bddd0fa88ba85d09d3fb7cef6d6df182 100644 (file)
@@ -3,10 +3,6 @@ requires:
   script:
     - grep METADATA_DEFAULTS src/output-json-alert.c > /dev/null
 
-skip:
-  - feature: RUST
-    msg: eve dns v1 not supported by rust
-
 checks:
 
   - filter:
index 6ed696750028a9bf0c7a3a765b5de0bda050c34d..42bd1a0a316038759afe61ef88e3aa2c4741aea3 100644 (file)
@@ -3,10 +3,6 @@ requires:
   script:
     - grep METADATA_DEFAULTS src/output-json-alert.c > /dev/null
 
-skip:
-  - feature: RUST
-    msg: eve dns v1 not supported by rust
-
 checks:
 
   - filter:
index bfeedf9feea6db918cebbc736e2daca8c05c2cff..c1bdf627340b0b499ab2ac29021b422737b5639f 100644 (file)
@@ -3,10 +3,6 @@ requires:
   script:
     - grep METADATA_DEFAULTS src/output-json-alert.c > /dev/null
 
-skip:
-  - feature: RUST
-    msg: eve dns v1 not supported by rust
-
 checks:
 
   - filter:
index 6efb97ba1e5380e1f1de051ce8af54e2f5e17458..4e8a560d6d100861f6cc12e0f128ae0c184b99c9 100644 (file)
@@ -1,14 +1,3 @@
-requires:
-
-  # Require that we have metadata support, checked by looking for a
-  # function.
-  script:
-    - grep JsonAddMetadata src/output-json.h > /dev/null
-
-skip:
-  - feature: RUST
-    msg: eve dns v1 not supported by rust
-
 checks:
 
   - filter: