mqtt: Move from policy/ into base/

Register dpd signatures and the analyzer when running in default mode.

Closes #2583

NEWS

@@ -146,6 +146,9 @@ Changed Functionality
   stopped. This fixes a few cases where we already had the logic to
   continue in place, but we still ended up considering them partial.
 
+- The MQTT scripts registering the analyzer and DPD signatures have
+  been moved from the policy folder to base and are loaded by default.
+
 Deprecated Functionality
 ------------------------
 

scripts/base/protocols/mqtt/README

@@ -1 +1 @@
-Definitions of constants used by the MQTT protocol
+Support for MQTT protocol analysis.

scripts/base/protocols/mqtt/__load__.zeek

@@ -1 +1,4 @@
 @load ./consts
+@load ./main
+
+@load-sigs ./dpd.sig

scripts/policy/protocols/mqtt/README

@@ -1 +0,0 @@
-Support for MQTT protocol analysis.

scripts/policy/protocols/mqtt/__load__.zeek

@@ -1,2 +1,4 @@
-@load ./main
+@deprecated "Remove in v6.1. The MQTT scripts have been moved out of policy/ into base and are loaded by default"
-@load-sigs ./dpd.sig
+
+# For those running bare-mode and loading protocols/mqtt from policy.
+@load base/protocols/mqtt

scripts/test-all-policy.zeek

@@ -110,8 +110,7 @@
 @load protocols/krb/ticket-logging.zeek
 @load protocols/modbus/known-masters-slaves.zeek
 @load protocols/modbus/track-memmap.zeek
-@load protocols/mqtt/__load__.zeek
+#@load protocols/mqtt/__load__.zeek
-@load protocols/mqtt/main.zeek
 @load protocols/mysql/software.zeek
 @load protocols/rdp/indicate_ssl.zeek
 @load protocols/smb/log-cmds.zeek

scripts/zeekygen/__load__.zeek

@@ -1,6 +1,7 @@
 @load test-all-policy.zeek
 
 # Scripts which are commented out in test-all-policy.zeek.
+@load protocols/mqtt/__load__.zeek
 @load protocols/ssl/decryption.zeek
 @load frameworks/control/controllee.zeek
 @load frameworks/control/controller.zeek

testing/btest/Baseline/core.print-bpf-filters/output2

@@ -9,6 +9,7 @@
 1 161
 1 162
 1 1812
+1 1883
 2 20000
 1 21
 1 2123
@@ -58,8 +59,8 @@
 1 992
 1 993
 1 995
-65 and
+66 and
-64 or
+65 or
-65 port
+66 port
-42 tcp
+43 tcp
 23 udp

testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log

@@ -397,6 +397,7 @@ scripts/base/init-default.zeek
     scripts/base/protocols/modbus/main.zeek
   scripts/base/protocols/mqtt/__load__.zeek
     scripts/base/protocols/mqtt/consts.zeek
+    scripts/base/protocols/mqtt/main.zeek
   scripts/base/protocols/mysql/__load__.zeek
     scripts/base/protocols/mysql/main.zeek
       scripts/base/protocols/mysql/consts.zeek

testing/btest/coverage/bare-mode-errors.test

@@ -6,4 +6,4 @@
 #
 # @TEST-EXEC: test -d $DIST/scripts
 # @TEST-EXEC: for script in `find $DIST/scripts/ -name \*\.zeek`; do zeek -b --parse-only $script >>errors 2>&1; done
-# @TEST-EXEC: TEST_DIFF_CANONIFIER="grep -v 'Use the external.*bro-simple-scan package' | $SCRIPTS/diff-remove-abspath | $SCRIPTS/diff-sort" btest-diff errors
+# @TEST-EXEC: TEST_DIFF_CANONIFIER="grep -v -e 'Use the external.*bro-simple-scan package' -e 'The MQTT scripts have been moved out of policy/' | $SCRIPTS/diff-remove-abspath | $SCRIPTS/diff-sort" btest-diff errors