Merge pull request #2388 from greenbone/refactor-nvt-loading

Change: Refactor nvt loading to separate ospd and openvasd logic

Author: ozgen

src/CMakeLists.txt

@@ -136,7 +136,10 @@ add_executable (manage-utils-test
                 gmp_port_lists.c
                 gmp_report_configs.c
                 gmp_report_formats.c gmp_tickets.c
-                gmp_tls_certificates.c)
+                gmp_tls_certificates.c
+                manage_sql_nvts_osp.c
+                manage_sql_nvts_openvasd.c
+                manage_sql_nvts_common.c)
 
 add_test (manage-utils-test manage-utils-test)
 
@@ -168,7 +171,10 @@ add_executable (manage-test
                 gmp_port_lists.c
                 gmp_report_configs.c
                 gmp_report_formats.c gmp_tickets.c
-                gmp_tls_certificates.c)
+                gmp_tls_certificates.c
+                manage_sql_nvts_osp.c
+                manage_sql_nvts_openvasd.c
+                manage_sql_nvts_common.c)
 
 add_test (manage-test manage-test)
 
@@ -200,7 +206,10 @@ add_executable (manage-sql-test
                 gmp_port_lists.c
                 gmp_report_configs.c
                 gmp_report_formats.c gmp_tickets.c
-                gmp_tls_certificates.c)
+                gmp_tls_certificates.c
+                manage_sql_nvts_osp.c
+                manage_sql_nvts_openvasd.c
+                manage_sql_nvts_common.c)
 
 add_test (manage-sql-test manage-sql-test)
 
@@ -232,7 +241,10 @@ add_executable (gmp-tickets-test
                 gmp_port_lists.c
                 gmp_report_configs.c
                 gmp_report_formats.c
-                gmp_tls_certificates.c)
+                gmp_tls_certificates.c
+                manage_sql_nvts_osp.c
+                manage_sql_nvts_openvasd.c
+                manage_sql_nvts_common.c)
 
 add_test (gmp-tickets-test gmp-tickets-test)
 
@@ -264,7 +276,10 @@ add_executable (utils-test
                 gmp_port_lists.c
                 gmp_report_configs.c
                 gmp_report_formats.c gmp_tickets.c
-                gmp_tls_certificates.c)
+                gmp_tls_certificates.c
+                manage_sql_nvts_osp.c
+                manage_sql_nvts_openvasd.c
+                manage_sql_nvts_common.c)
 
 add_test (utils-test utils-test)
 
@@ -313,7 +328,10 @@ add_executable (gvmd
                 gmp_port_lists.c
                 gmp_report_configs.c
                 gmp_report_formats.c gmp_tickets.c
-                gmp_tls_certificates.c)
+                gmp_tls_certificates.c
+                manage_sql_nvts_osp.c
+                manage_sql_nvts_openvasd.c
+                manage_sql_nvts_common.c)
 
 target_link_libraries (gvmd m
                        ${GNUTLS_LDFLAGS} ${GPGME_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT} ${LINKER_HARDENING_FLAGS} ${LINKER_DEBUG_FLAGS}

src/gvmd.c

@@ -1104,14 +1104,14 @@ handle_sigabrt_simple (int signal)
  * @return 0 success, -1 error, 1 VT integrity check failed.
  */
 static int
-update_nvt_cache_osp (const gchar *update_socket)
+update_nvt_cache (const gchar *update_socket)
 {
 #ifdef OPENVASD
   setproctitle ("openvasd: Updating NVT cache");
 #else
   setproctitle ("OSP: Updating NVT cache");
 #endif
-  return manage_update_nvts_osp (update_socket);
+  return manage_update_nvts (update_socket);
 }
 
 
@@ -1157,7 +1157,7 @@ update_nvt_cache_retry ()
             {
               int ret;
 
-              ret = update_nvt_cache_osp (osp_update_socket);
+              ret = update_nvt_cache (osp_update_socket);
               if (ret == 1)
                 {
                   g_message ("Rebuilding all NVTs because of a hash value mismatch");

src/manage.c

@@ -7549,52 +7549,6 @@ nvts_feed_info_internal (const gchar *update_socket,
 }
 #endif
 
-#if OPENVASD
-/**
- * @brief Get VTs feed information from a scanner.
- *
- * @param[in]  scanner_uuid  The uuid of the scanner to be used.
- * @param[out] vts_version   Output of scanner feed version.
- *
- * @return 0 success, 1 connection to scanner failed, 2 scanner still starting,
- *         -1 other error.
- */
-static int
-nvts_feed_info_internal_from_openvasd (const gchar *scanner_uuid,
-                                       gchar **vts_version)
-{
-  scanner_t scan;
-  openvasd_connector_t connector = NULL;
-  openvasd_resp_t resp = NULL;
-  int ret;
-  if (find_resource_no_acl ("scanner", scanner_uuid, &scan))
-    return -1;
-
-  connector = openvasd_scanner_connect (scan, NULL);
-  if (!connector)
-    return 1;
-
-  resp = openvasd_get_health_ready (connector);
-  if (resp->code == -1)
-    {
-      g_warning ("%s: failed to connect to %s:%d", __func__,
-                 scanner_host (scan), scanner_port (scan));
-      ret = 1;
-    }
-  else if (resp->code  == 503)
-    ret = 2;
-  else
-    {
-      *vts_version = g_strdup (resp->header);
-      ret = 0;
-    }
-
-  openvasd_response_cleanup (resp);
-  openvasd_connector_free (connector);
-  return ret;
-}
-#endif
-
 /**
  * @brief Get VTs feed information from the scanner using VT update socket.
  *
@@ -7753,9 +7707,9 @@ gvm_migrate_secinfo (int feed_type)
  * @return 0 success, -1 error, 1 VT integrity check failed.
  */
 int
-manage_update_nvts_osp (const gchar *update_socket)
+manage_update_nvts (const gchar *update_socket)
 {
-  return manage_update_nvt_cache_osp (update_socket);
+  return manage_update_nvt_cache (update_socket);
 }
 
 

src/manage.h

@@ -4066,7 +4066,7 @@ int
 nvts_check_feed (int *, int *, gchar **);
 
 int
-manage_update_nvts_osp (const gchar *);
+manage_update_nvts (const gchar *);
 
 int
 manage_rebuild (GSList *, const db_conn_info_t *);

src/manage_sql_configs.h

@@ -102,4 +102,7 @@ check_db_configs (int);
 void
 check_whole_only_in_configs ();
 
+int
+check_config_families ();
+
 #endif /* not _GVMD_MANAGE_SQL_CONFIGS_H */