Fuzzing: Add dynsec file load fuzz target.

.gitignore

@@ -1,3 +1,4 @@
+*.a
 *.db
 *.gcda
 *.gcno
@@ -63,6 +64,7 @@ fuzzing/corpora/db_dump_seed_corpus.zip
 fuzzing/lib/lib_fuzz_pub_topic_check2
 fuzzing/lib/lib_fuzz_sub_topic_check2
 fuzzing/lib/lib_fuzz_utf8
+fuzzing/plugins/dynamic-security/dynsec_fuzz_load
 
 lib/cpp/libmosquittopp.so*
 lib/cpp/libmosquittopp.a

fuzzing/plugins/Makefile

@@ -0,0 +1,7 @@
+.PHONY: all clean
+
+all:
+	$(MAKE) -C dynamic-security $@
+
+clean:
+	$(MAKE) -C dynamic-security $@

fuzzing/plugins/dynamic-security/Makefile

@@ -0,0 +1,23 @@
+R=../../..
+.PHONY: all clean
+
+FUZZERS:= \
+	dynsec_fuzz_load
+
+LOCAL_CPPFLAGS:=$(CPPFLAGS) -I${R} -I${R}/common -I${R}/include -I${R}/lib -I${R}/src \
+	-DWITH_BRIDGE -DWITH_BROKER -DWITH_CONTROL -DWITH_EC -DWITH_EPOLL \
+	-DWITH_MEMORY_TRACKING -DWITH_PERSISTENCE -DWITH_SOCKS -DWITH_SYSTEMD \
+	-DWITH_SYS_TREE -DWITH_TLS -DWITH_TLS_PSK -DWITH_UNIX_SOCKETS -DWITH_WEBSOCKETS=WS_IS_BUILTIN
+LOCAL_CXXFLAGS:=$(CXXFLAGS) -g -Wall -Werror -pthread
+LOCAL_LDFLAGS:=$(LDFLAGS)
+LOCAL_LIBADD:=$(LIBADD) $(LIB_FUZZING_ENGINE) ${R}/plugins/dynamic-security/mosquitto_dynamic_security.a ${R}/src/mosquitto_broker.a -lssl -lcrypto -lcjson
+
+all: $(FUZZERS)
+
+dynsec_fuzz_load : dynsec_fuzz_load.cpp
+	$(CXX) $(LOCAL_CXXFLAGS) $(LOCAL_CPPFLAGS) $(LOCAL_LDFLAGS) -o $@ $^ $(LOCAL_LIBADD)
+	install $@ ${OUT}/$@
+	cp ${R}/fuzzing/corpora/dynsec_config_seed_corpus.zip ${OUT}/$@_seed_corpus.zip
+
+clean:
+	rm -f *.o $(FUZZERS) *.gcno *.gcda

fuzzing/plugins/dynamic-security/dynsec_fuzz_load.cpp

@@ -0,0 +1,81 @@
+/*
+Copyright (c) 2023 Cedalo GmbH
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License 2.0
+and Eclipse Distribution License v1.0 which accompany this distribution.
+
+The Eclipse Public License is available at
+   https://www.eclipse.org/legal/epl-2.0/
+and the Eclipse Distribution License is available at
+  http://www.eclipse.org/org/documents/edl-v10.php.
+
+SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+
+Contributors:
+   Roger Light - initial implementation and documentation.
+*/
+
+#include <cstdio>
+#include <cstdint>
+#include <cstdlib>
+#include <cstring>
+#include <unistd.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <mosquitto_plugin.h>
+#include <mosquitto_broker_internal.h>
+
+#ifdef __cplusplus
+}
+#endif
+
+/*
+ * Test loading a file
+ */
+
+extern struct mosquitto_db db;
+
+void run_dynsec(char *filename)
+{
+	struct mosquitto_plugin_id_t identifier;
+	struct mosquitto_opt options[1];
+
+	db.config = (struct mosquitto__config *)calloc(1, sizeof(struct mosquitto__config));
+	log__init(db.config);
+
+	memset(&identifier, 0, sizeof(identifier));
+
+	options[0].key = strdup("config_file");
+	options[0].value = filename;
+
+	mosquitto_plugin_init(&identifier, NULL, options, 1);
+	mosquitto_plugin_cleanup(NULL, options, 1);
+
+	free(options[0].key);
+	free(db.config);
+	free(identifier.plugin_name);
+	free(identifier.plugin_version);
+	db.config = NULL;
+}
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
+{
+	char filename[100];
+	FILE *fptr;
+
+	snprintf(filename, sizeof(filename), "/tmp/dynsec%d.conf", getpid());
+	fptr = fopen(filename, "wb");
+	if(!fptr) return 1;
+	fwrite(data, 1, size, fptr);
+	fclose(fptr);
+
+	run_dynsec(filename);
+
+	unlink(filename);
+
+	return 0;
+}

plugins/dynamic-security/Makefile

@@ -40,9 +40,18 @@ endif
 all : ${ALL_DEPS}
 binary : ${PLUGIN_NAME}.so
 
+ifeq ($(WITH_FUZZING),yes)
+binary : ${PLUGIN_NAME}.a
+else
+binary : ${PLUGIN_NAME}.so
+endif
+
 ${PLUGIN_NAME}.so : ${OBJS}
 	${CROSS_COMPILE}${CC} $(PLUGIN_LDFLAGS) -fPIC -shared $^ -o $@ -lcjson
 
+${PLUGIN_NAME}.a : ${OBJS}
+	${CROSS_COMPILE}$(AR) cr $@ $^
+
 acl.o : acl.c dynamic_security.h
 	${CROSS_COMPILE}${CC} $(LOCAL_CPPFLAGS) $(PLUGIN_CPPFLAGS) $(PLUGIN_CFLAGS) -c $< -o $@
 

plugins/dynamic-security/plugin.c

@@ -139,5 +139,10 @@ int mosquitto_plugin_cleanup(void *user_data, struct mosquitto_opt *options, int
 	mosquitto_free(dynsec_data.password_init_file);
 	dynsec_data.password_init_file = NULL;
 
+	mosquitto_callback_unregister(plg_id, MOSQ_EVT_CONTROL, dynsec_control_callback, "$CONTROL/dynamic-security/v1");
+	mosquitto_callback_unregister(plg_id, MOSQ_EVT_BASIC_AUTH, dynsec_auth__basic_auth_callback, NULL);
+	mosquitto_callback_unregister(plg_id, MOSQ_EVT_ACL_CHECK, dynsec__acl_check_callback, NULL);
+	mosquitto_callback_unregister(plg_id, MOSQ_EVT_TICK, dynsec__tick_callback, NULL);
+
 	return MOSQ_ERR_SUCCESS;
 }