Merge middleware into main

.docker/build/Dockerfile

@@ -1,7 +1,7 @@
 # Dockerfile for gvm-libs-$VERSION-$COMPILER-build
 
 # Define ARG we use through the build
-ARG VERSION=master
+ARG VERSION=main
 ARG BUILD_TYPE=Debug
 ARG COMPILER=gcc
 

.github/workflows/ci-c.yml

@@ -2,9 +2,9 @@ name: Build and test C
 
 on:
   push:
-    branches: [ main, oldstable, stable, middleware ]
+    branches: [ main, oldstable, stable ]
   pull_request:
-    branches: [ main, oldstable, stable, middleware ]
+    branches: [ main, oldstable, stable ]
 
 
 jobs:

.github/workflows/docker-ci.yml

@@ -2,7 +2,7 @@ name: Build and upload docker images
 
 on:
   push:
-    branches: [ main, oldstable, stable, middleware ]
+    branches: [ main, oldstable, stable ]
 
 jobs:
   upload-testing:

.gitignore

@@ -1,2 +1,9 @@
 build/
 .ccls
+# clangd
+# generated by
+# cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=1
+compile_commands.json
+.cache/
+# cmake
+CMakeFiles/

CHANGELOG.md

@@ -12,6 +12,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Possibility to use lcrypt with `$6$` (sha512) for authentication [484](https://github.com/greenbone/gvm-libs/pull/484)
 - Add function to perform an alive test and get the amount of alive hosts. [495](https://github.com/greenbone/gvm-libs/pull/495)
 - Add functions for sentry integration. [#502](https://github.com/greenbone/gvm-libs/pull/502) [#506](https://github.com/greenbone/gvm-libs/pull/506)
+- Add basic support for mqtt.
+  Original
+  [#505](https://github.com/greenbone/gvm-libs/pull/505)
+  [#511](https://github.com/greenbone/gvm-libs/pull/511).
+  Reintroduction after Rebase
+  [#538](https://github.com/greenbone/gvm-libs/pull/538)
+- Refactor MQTT handling [#562](https://github.com/greenbone/gvm-libs/pull/562). Add function for mqtt init status [#567](https://github.com/greenbone/gvm-libs/pull/567). Fix prototypes in mqtt.h. [#584](https://github.com/greenbone/gvm-libs/pull/584)
+- Add function to get the severity_vector, otherwise the cvss_base_vector. [#568](https://github.com/greenbone/gvm-libs/pull/568)
+- Add function to duplicate host and vhost objects [#590](https://github.com/greenbone/gvm-libs/pull/590)
 
 ### Changed
 - Handle script timeout as script preference with ID 0 [#581](https://github.com/greenbone/gvm-libs/pull/581)

INSTALL.md

@@ -71,6 +71,8 @@ Install prerequisites for optional features on Debian GNU/Linux 'Buster' 10:
     libldap2-dev \
     libradcli-dev
 
+Prerequisites for MQTT support:
+* libpaho-mqtt-dev >= 1.3.8. This package is currently not available in debian buster stable. Could be installed from source, backports or unstable branch.
 
 Compiling gvm-libs
 ------------------

base/nvti.c

@@ -935,6 +935,36 @@ nvti_severity_score (const nvti_t *n)
   return score;
 }
 
+/**
+ * @brief Get the severity score
+ *
+ * Extended severity was introduced but still not all
+ * vts are using it. Therefore it must be checked if
+ * we can calculate the score from the severity_vector tag
+ * or if we have to calculate it from the deprecated
+ * cvss_base_vector tag.
+ *
+ * @param n The NVT Info structure.
+ *
+ * @return The severity_vector if present or cvss_base_vector otherwise.
+ * NULL indicates an error. Must be free()'d by the caller.
+ */
+gchar *
+nvti_severity_vector_from_tag (const nvti_t *n)
+{
+  gchar *vector;
+
+  /* Currently, only one severity_vector can be stored as tag.
+   * Therfore we just check this one. */
+  vector = nvti_get_tag (n, "severity_vector");
+  if (vector)
+    return vector;
+
+  vector = nvti_get_tag (n, "cvss_base_vector");
+
+  return vector;
+}
+
 /**
  * @brief Get the solution.
  *

base/nvti.h

@@ -107,6 +107,8 @@ vtseverity_t *
 nvti_vtseverity (const nvti_t *, guint);
 double
 nvti_severity_score (const nvti_t *);
+gchar *
+nvti_severity_vector_from_tag (const nvti_t *);
 
 nvti_t *
 nvti_new (void);

base/nvti_tests.c

@@ -141,6 +141,48 @@ Ensure (nvti, nvtis_add_does_not_use_oid_as_key)
   assert_that (nvtis_lookup (nvtis, "2"), is_null);
 }
 
+/* nvti severity vector */
+
+Ensure (nvti, nvti_get_severity_vector_both)
+{
+  nvti_t *nvti;
+
+  nvti = nvti_new ();
+  nvti_set_tag (nvti, "cvss_base_vector=DEF");
+  nvti_set_tag (nvti, "severity_vector=ABC");
+
+  assert_that (nvti_severity_vector_from_tag (nvti),
+               is_equal_to_string ("ABC"));
+
+  nvti_free (nvti);
+}
+
+Ensure (nvti, nvti_get_severity_vector_no_cvss_base)
+{
+  nvti_t *nvti;
+
+  nvti = nvti_new ();
+  nvti_set_tag (nvti, "severity_vector=ABC");
+
+  assert_that (nvti_severity_vector_from_tag (nvti),
+               is_equal_to_string ("ABC"));
+
+  nvti_free (nvti);
+}
+
+Ensure (nvti, nvti_get_severity_vector_no_severity_vector)
+{
+  nvti_t *nvti;
+
+  nvti = nvti_new ();
+  nvti_set_tag (nvti, "cvss_base_vector=DEF");
+
+  assert_that (nvti_severity_vector_from_tag (nvti),
+               is_equal_to_string ("DEF"));
+
+  nvti_free (nvti);
+}
+
 /* Test suite. */
 
 int
@@ -163,6 +205,11 @@ main (int argc, char **argv)
 
   add_test_with_context (suite, nvti, nvtis_add_does_not_use_oid_as_key);
 
+  add_test_with_context (suite, nvti, nvti_get_severity_vector_both);
+  add_test_with_context (suite, nvti,
+                         nvti_get_severity_vector_no_severity_vector);
+  add_test_with_context (suite, nvti, nvti_get_severity_vector_no_cvss_base);
+
   if (argc > 1)
     return run_single_test (suite, argv[1], create_text_reporter ());
 

util/CMakeLists.txt

@@ -50,6 +50,17 @@ pkg_check_modules (REDIS REQUIRED hiredis>=0.10.1)
 # for fast XML we need libxml2
 pkg_check_modules (LIBXML2 REQUIRED libxml-2.0>=2.0)
 
+# for mqtt
+# Optional for now because lib is currently not in debian buster stable.
+find_library(LIBPAHO paho-mqtt3c)
+message (STATUS "Looking for paho-mqtt3c ... ${LIBPAHO}")
+if (NOT LIBPAHO)
+  message (STATUS "libpaho-mqtt3c is required for MQTTv5 support.")
+else (LIBPAHO)
+  set (LIBPAHO_LDFLAGS "paho-mqtt3c")
+  add_definitions (-DHAVE_MQTT=1)
+endif (NOT LIBPAHO)
+
 #for gpgmeutils we need libgpgme
 set (GPGME_MIN_VERSION "1.7.0")
 message (STATUS "Looking for gpgme...")
@@ -156,11 +167,11 @@ include_directories (${GLIB_INCLUDE_DIRS} ${GPGME_INCLUDE_DIRS} ${GCRYPT_INCLUDE
                      ${LIBXML2_INCLUDE_DIRS})
 
 set (FILES passwordbasedauthentication.c compressutils.c fileutils.c gpgmeutils.c kb.c ldaputils.c
-           nvticache.c radiusutils.c serverutils.c sshutils.c uuidutils.c
+           nvticache.c mqtt.c radiusutils.c serverutils.c sshutils.c uuidutils.c
            xmlutils.c)
 
 set (HEADERS passwordbasedauthentication.h authutils.h compressutils.h fileutils.h gpgmeutils.h kb.h
-             ldaputils.h nvticache.h radiusutils.h serverutils.h sshutils.h
+             ldaputils.h nvticache.h mqtt.h radiusutils.h serverutils.h sshutils.h
              uuidutils.h xmlutils.h)
 
 if (BUILD_STATIC)
@@ -178,7 +189,7 @@ if (BUILD_SHARED)
   set_target_properties (gvm_util_shared PROPERTIES VERSION "${CPACK_PACKAGE_VERSION}")
   set_target_properties (gvm_util_shared PROPERTIES PUBLIC_HEADER "${HEADERS}")
 
-  target_link_libraries (gvm_util_shared LINK_PRIVATE ${GLIB_LDFLAGS}
+  target_link_libraries (gvm_util_shared LINK_PRIVATE ${LIBPAHO_LDFLAGS} ${GLIB_LDFLAGS}
                          ${GIO_LDFLAGS} ${GPGME_LDFLAGS} ${ZLIB_LDFLAGS}
                          ${RADIUS_LDFLAGS} ${LIBSSH_LDFLAGS} ${GNUTLS_LDFLAGS}
                          ${GCRYPT_LDFLAGS} ${LDAP_LDFLAGS} ${REDIS_LDFLAGS}