Merge remote-tracking branch 'origin/topic/timw/all-the-fuzzing'

* origin/topic/timw/all-the-fuzzing:
  Add error and abort if fuzzer requested is not found
  Add a bunch of new fuzzers and corpus data

CHANGES

@@ -1,3 +1,9 @@
+5.2.0-dev.453 | 2023-01-05 09:53:47 -0700
+
+  * Add error and abort if fuzzer requested is not found (Tim Wojtulewicz, Corelight)
+
+  * Add a bunch of new fuzzers and corpus data (Tim Wojtulewicz, Corelight)
+
 5.2.0-dev.450 | 2023-01-05 12:12:13 +0100
 
   * EventRegistry/Func: Disable events when all bodies are disabled (Arne Welzel, Corelight)

VERSION

@@ -1 +1 @@
-5.2.0-dev.450
+5.2.0-dev.453

src/fuzzers/CMakeLists.txt

@@ -96,3 +96,40 @@ add_generic_analyzer_fuzz_target(http)
 add_generic_analyzer_fuzz_target(imap)
 add_generic_analyzer_fuzz_target(pop3)
 add_generic_analyzer_fuzz_target(smtp)
+
+add_generic_analyzer_fuzz_target(dce_rpc)
+add_generic_analyzer_fuzz_target(dhcp)
+add_generic_analyzer_fuzz_target(dnp3_tcp)
+add_generic_analyzer_fuzz_target(irc)
+add_generic_analyzer_fuzz_target(modbus)
+add_generic_analyzer_fuzz_target(mqtt)
+add_generic_analyzer_fuzz_target(mysql)
+add_generic_analyzer_fuzz_target(ncp)
+add_generic_analyzer_fuzz_target(ntp)
+add_generic_analyzer_fuzz_target(radius)
+add_generic_analyzer_fuzz_target(rdp)
+add_generic_analyzer_fuzz_target(rdpeudp)
+add_generic_analyzer_fuzz_target(rfb)
+add_generic_analyzer_fuzz_target(mount)      #rpc
+add_generic_analyzer_fuzz_target(nfs)        #rpc
+add_generic_analyzer_fuzz_target(portmapper) #rpc
+add_generic_analyzer_fuzz_target(sip)
+add_generic_analyzer_fuzz_target(smb)
+add_generic_analyzer_fuzz_target(snmp)
+add_generic_analyzer_fuzz_target(ssh)
+add_generic_analyzer_fuzz_target(syslog)
+
+#add_generic_analyzer_fuzz_target(finger)  # no pcap files
+#add_generic_analyzer_fuzz_target(gssapi)  # only samples are embedded in smb
+#add_generic_analyzer_fuzz_target(ident)   # no pcap files
+#add_generic_analyzer_fuzz_target(krb)     # should these just be handled by smb?
+#add_generic_analyzer_fuzz_target(krb_tcp) # should these just be handled by smb?
+#add_generic_analyzer_fuzz_target(rsh)     # login - no pcap files
+#add_generic_analyzer_fuzz_target(rlogin)  # login - no pcap files
+#add_generic_analyzer_fuzz_target(telnet)  # login - no pcap files
+#add_generic_analyzer_fuzz_target(netbios) # no pcap files
+#add_generic_analyzer_fuzz_target(ntlm)    # only samples are embedded in dce-rpc or smb
+#add_generic_analyzer_fuzz_target(xdr)     # rpc - no pcap files
+#add_generic_analyzer_fuzz_target(sip_tcp) # unnecessary?
+#add_generic_analyzer_fuzz_target(socks)   # can this one be tested by adding SOCKS pkts to the HTTP corpus?
+#add_generic_analyzer_fuzz_target(xmpp)    # no pcap files

src/fuzzers/generic-analyzer-fuzzer.cc

@@ -40,6 +40,12 @@ static zeek::analyzer::Analyzer* add_analyzer(zeek::Connection* conn)
 	auto* tcp = new zeek::packet_analysis::TCP::TCPSessionAdapter(conn);
 	auto* pia = new zeek::analyzer::pia::PIA_TCP(conn);
 	auto a = zeek::analyzer_mgr->InstantiateAnalyzer(TOSTRING(ZEEK_FUZZ_ANALYZER), conn);
+	if ( ! a )
+		{
+		fprintf(stderr, "Unknown or unsupported analyzer %s found\n", TOSTRING(ZEEK_FUZZ_ANALYZER));
+		abort();
+		}
+
 	tcp->AddChildAnalyzer(a);
 	tcp->AddChildAnalyzer(pia->AsAnalyzer());
 	conn->SetSessionAdapter(tcp, pia);