From 17d89dfd8b5165668f5dec8b8fbfd05cd0e764a5 Mon Sep 17 00:00:00 2001
From: Olivier Dion <olivier.dion@savoirfairelinux.com>
Date: Thu, 10 Jun 2021 15:08:33 -0400
Subject: [PATCH] fuzzing/utils: Add utilities taken from UT
Change-Id: I53c9da27babcbb1c1f678ddf7b885a322d3a4d96
---
test/fuzzing/Makefile.am | 3 +
test/fuzzing/lib/utils.cpp | 204 +++++++++++++++++++++++++++++++++++++
test/fuzzing/lib/utils.h | 51 ++++++++++
3 files changed, 258 insertions(+)
create mode 100644 test/fuzzing/lib/utils.cpp
create mode 100644 test/fuzzing/lib/utils.h
diff --git a/test/fuzzing/Makefile.am b/test/fuzzing/Makefile.am
index 54cf236951..a1771e0c52 100644
--- a/test/fuzzing/Makefile.am
+++ b/test/fuzzing/Makefile.am
@@ -4,3 +4,6 @@ AM_CXXFLAGS += -I$(top_srcdir)/src -I. -include common.h
AM_LDFLAGS += $(top_builddir)/src/libring.la
check_PROGRAMS =
+lib_LTLIBRARIES = libfuzz.la
+
+libfuzz_la_SOURCES = lib/utils.cpp
diff --git a/test/fuzzing/lib/utils.cpp b/test/fuzzing/lib/utils.cpp
new file mode 100644
index 0000000000..21bd75045d
--- /dev/null
+++ b/test/fuzzing/lib/utils.cpp
@@ -0,0 +1,204 @@
+/*
+ * Copyright (C) 2021 Savoir-faire Linux Inc.
+ *
+ * Author: Olivier Dion <olivier.dion>@savoirfairelinux.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <yaml-cpp/yaml.h>
+
+#include "lib/utils.h"
+
+/* Jami */
+#include "dring/account_const.h"
+#include "dring/dring.h"
+#include "fileutils.h"
+#include "manager.h"
+
+/* Make GCC quiet about unused functions */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+
+void
+wait_for_announcement_of(const std::vector<std::string> accountIDs,
+ std::chrono::seconds timeout)
+{
+ std::map<std::string, std::shared_ptr<DRing::CallbackWrapperBase>> confHandlers;
+ std::mutex mtx;
+ std::unique_lock<std::mutex> lk {mtx};
+
+ auto cv = std::make_shared<std::condition_variable>();
+ auto accountsReady = std::make_shared<std::vector<std::atomic_bool>>(accountIDs.size());
+
+ size_t to_be_announced = accountIDs.size();
+
+ confHandlers.insert(
+ DRing::exportable_callback<DRing::ConfigurationSignal::VolatileDetailsChanged>(
+ [=,
+ accountIDs = std::move(accountIDs)](const std::string& accountID,
+ const std::map<std::string, std::string>& details) {
+ for (size_t i = 0; i < accountIDs.size(); ++i) {
+ if (accountIDs[i] != accountID) {
+ continue;
+ }
+
+ try {
+ if ("true"
+ != details.at(DRing::Account::VolatileProperties::DEVICE_ANNOUNCED)) {
+ continue;
+ }
+ } catch (const std::out_of_range&) {
+ continue;
+ }
+
+ accountsReady->at(i) = true;
+ cv->notify_one();
+ }
+ }));
+
+ JAMI_DBG("Waiting for %zu account to be announced...", to_be_announced);
+
+ DRing::registerSignalHandlers(confHandlers);
+
+ assert(cv->wait_for(lk, timeout, [&] {
+ for (const auto& rdy : *accountsReady) {
+ if (not rdy) {
+ return false;
+ }
+ }
+
+ return true;
+ }));
+
+ DRing::unregisterSignalHandlers();
+
+ JAMI_DBG("%zu account announced!", to_be_announced);
+}
+
+void
+wait_for_announcement_of(const std::string& accountId,
+ std::chrono::seconds timeout)
+{
+ wait_for_announcement_of(std::vector<std::string> {accountId}, timeout);
+}
+
+void
+wait_for_removal_of(const std::vector<std::string> accounts,
+ std::chrono::seconds timeout)
+{
+ std::map<std::string, std::shared_ptr<DRing::CallbackWrapperBase>> confHandlers;
+ std::mutex mtx;
+ std::unique_lock<std::mutex> lk {mtx};
+
+ auto cv = std::make_shared<std::condition_variable>();
+ auto accountsRemoved = std::make_shared<std::atomic_bool>(false);
+
+ JAMI_INFO("Removing %zu accounts...", accounts.size());
+
+ size_t current = jami::Manager::instance().getAccountList().size();
+
+ /* Prevent overflow */
+ assert(current >= accounts.size());
+
+ size_t target = current - accounts.size();
+
+ confHandlers.insert(DRing::exportable_callback<DRing::ConfigurationSignal::AccountsChanged>(
+ [=, accounts = std::move(accounts)]() {
+ if (jami::Manager::instance().getAccountList().size() <= target) {
+ *accountsRemoved = true;
+ cv->notify_one();
+ }
+ }));
+
+ DRing::unregisterSignalHandlers();
+ DRing::registerSignalHandlers(confHandlers);
+
+ for (const auto& account : accounts) {
+ jami::Manager::instance().removeAccount(account, true);
+ }
+
+ assert(cv->wait_for(lk, timeout, [&] { return accountsRemoved->load(); }));
+
+ DRing::unregisterSignalHandlers();
+}
+
+void
+wait_for_removal_of(const std::string& account,
+ std::chrono::seconds timeout)
+{
+ wait_for_removal_of(std::vector<std::string> {account}, timeout);
+}
+
+std::map<std::string, std::string>
+load_actors(const std::string& from_yaml)
+{
+ std::map<std::string, std::string> actors {};
+ std::map<std::string, std::string> default_details = DRing::getAccountTemplate("RING");
+
+ std::ifstream file = jami::fileutils::ifstream(from_yaml);
+
+ assert(file.is_open());
+
+ YAML::Node node = YAML::Load(file);
+
+ assert(node.IsMap());
+
+ auto default_account = node["default-account"];
+
+ if (default_account.IsMap()) {
+ for (const auto& kv : default_account) {
+ default_details["Account." + kv.first.as<std::string>()] = kv.second.as<std::string>();
+ }
+ }
+
+ auto accounts = node["accounts"];
+
+ assert(accounts.IsMap());
+
+ for (const auto& kv : accounts) {
+ auto account_name = kv.first.as<std::string>();
+ auto account = kv.second.as<YAML::Node>();
+ auto details = std::map<std::string, std::string>(default_details);
+
+ for (const auto& detail : account) {
+ details["Account." + detail.first.as<std::string>()] = detail.second.as<std::string>();
+ }
+
+ actors[account_name] = jami::Manager::instance().addAccount(details);
+ }
+
+ return actors;
+}
+
+std::map<std::string, std::string>
+load_actors_and_wait_for_announcement(const std::string& from_yaml)
+{
+ auto actors = load_actors(from_yaml);
+
+ std::vector<std::string> wait_for;
+
+ wait_for.reserve(actors.size());
+
+ for (auto it = actors.cbegin(); it != actors.cend(); ++it) {
+ wait_for.emplace_back(it->second);
+ }
+
+ wait_for_announcement_of(wait_for);
+
+ return actors;
+}
+
+#pragma GCC diagnostic pop
diff --git a/test/fuzzing/lib/utils.h b/test/fuzzing/lib/utils.h
new file mode 100644
index 0000000000..5d682a7ab7
--- /dev/null
+++ b/test/fuzzing/lib/utils.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2021 Savoir-faire Linux Inc.
+ *
+ * Author: Olivier Dion <olivier.dion>@savoirfairelinux.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#pragma once
+
+#include <chrono>
+#include <cstdint>
+#include <map>
+#include <string>
+
+constexpr size_t WAIT_FOR_ANNOUNCEMENT_TIMEOUT = 30;
+constexpr size_t WAIT_FOR_REMOVAL_TIMEOUT = 30;
+
+extern void
+wait_for_announcement_of(const std::vector<std::string> accountIDs,
+ std::chrono::seconds timeout = std::chrono::seconds(WAIT_FOR_ANNOUNCEMENT_TIMEOUT));
+
+extern void
+wait_for_announcement_of(const std::string& accountId,
+ std::chrono::seconds timeout = std::chrono::seconds(WAIT_FOR_ANNOUNCEMENT_TIMEOUT));
+
+extern void
+wait_for_removal_of(const std::vector<std::string> accounts,
+ std::chrono::seconds timeout = std::chrono::seconds(WAIT_FOR_REMOVAL_TIMEOUT));
+
+extern void
+wait_for_removal_of(const std::string& account,
+ std::chrono::seconds timeout = std::chrono::seconds(WAIT_FOR_REMOVAL_TIMEOUT));
+
+extern std::map<std::string, std::string>
+load_actors(const std::string& from_yaml);
+
+extern std::map<std::string, std::string>
+load_actors_and_wait_for_announcement(const std::string& from_yaml);
--
GitLab