Combine sync scripts and add GVMd data sync

CHANGELOG.md

@@ -185,6 +185,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - The details attribute of GET_REPORTS now defaults to 0 [#747](https://github.com/greenbone/gvmd/pull/747)
 - Incoming VT timestamps via OSP are now assumed to be seconds since epoch [#754](https://github.com/greenbone/gvmd/pull/754)
 - Accelerate NVT feed update [#757](https://github.com/greenbone/gvmd/pull/757)
+- Combine sync scripts and add GVMd data sync [#1155](https://github.com/greenbone/gvmd/pull/1155)
 
 ### Fixed
 - A PostgreSQL statement order issue [#611](https://github.com/greenbone/gvmd/issues/611) has been addressed [#642](https://github.com/greenbone/gvmd/pull/642)

CMakeLists.txt

@@ -211,8 +211,12 @@ if (NOT GVM_NVT_DIR)
 	set (GVM_NVT_DIR "${LOCALSTATEDIR}/lib/openvas/plugins/")
 endif (NOT GVM_NVT_DIR)
 
+if (NOT DATA_OBJECTS_FEED_DIR)
+  set (DATA_OBJECTS_FEED_DIR "${LOCALSTATEDIR}/lib/gvm/data-objects")
+endif (NOT DATA_OBJECTS_FEED_DIR)
+
 if (NOT GVMD_FEED_DIR)
-  set (GVMD_FEED_DIR "${LOCALSTATEDIR}/lib/gvm/gvmd/${GMP_VERSION}")
+  set (GVMD_FEED_DIR "${DATA_OBJECTS_FEED_DIR}/gvmd")
 endif (NOT GVMD_FEED_DIR)
 
 if (NOT GVM_ACCESS_KEY_DIR)
@@ -246,6 +250,7 @@ configure_file (doc/example-gvm-manage-certs.conf.in doc/example-gvm-manage-cert
 configure_file (VERSION.in VERSION)
 configure_file (src/gvmd_log_conf.cmake_in src/gvmd_log.conf)
 configure_file (src/schema_formats/XML/GMP.xml.in src/schema_formats/XML/GMP.xml @ONLY)
+configure_file (tools/greenbone-gvmd-feed-sync.in tools/greenbone-gvmd-feed-sync @ONLY)
 configure_file (tools/greenbone-scapdata-sync.in tools/greenbone-scapdata-sync @ONLY)
 configure_file (tools/greenbone-certdata-sync.in tools/greenbone-certdata-sync @ONLY)
 configure_file (tools/gvm-manage-certs.in tools/gvm-manage-certs @ONLY)
@@ -392,6 +397,11 @@ install (FILES tools/cert_bund_getbyname.xsl tools/dfn_cert_getbyname.xsl
          DESTINATION ${GVM_CERT_RES_DIR}
          PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
 
+install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-gvmd-feed-sync
+         DESTINATION ${SBINDIR}
+         PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
+                     GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+
 install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-scapdata-sync
          DESTINATION ${SBINDIR}
          PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE

src/gmp.c

@@ -12332,6 +12332,8 @@ feed_type_name (int feed_type)
         return "CERT";
       case SCAP_FEED:
         return "SCAP";
+      case GVMD_DATA_FEED:
+        return "GVMD_DATA";
       default:
         return "Error";
     }
@@ -12462,15 +12464,31 @@ get_feed_info (int feed_type, gchar **feed_name, gchar **feed_version,
                gchar **feed_description)
 {
   GError *error;
+  const char *feed_data_dir;
   gchar *config_path, *xml, *name, *version, *description;
   gsize xml_len;
   entity_t entity;
 
-  assert (feed_type == SCAP_FEED || feed_type == CERT_FEED);
+  assert (feed_type == SCAP_FEED
+          || feed_type == CERT_FEED
+          || feed_type == GVMD_DATA_FEED);
 
-  config_path = g_build_filename (feed_type == SCAP_FEED
-                                   ? GVM_SCAP_DATA_DIR
-                                   : GVM_CERT_DATA_DIR,
+  switch (feed_type)
+    {
+      case SCAP_FEED:
+        feed_data_dir = GVM_SCAP_DATA_DIR;
+        break;
+      case CERT_FEED:
+        feed_data_dir = GVM_CERT_DATA_DIR;
+        break;
+      case GVMD_DATA_FEED:
+        feed_data_dir = GVMD_FEED_DIR;
+        break;
+      default :
+        return -1;
+    }
+
+  config_path = g_build_filename (feed_data_dir,
                                   "feed.xml",
                                   NULL);
   g_debug ("%s: config_path: %s", __func__, config_path);
@@ -12660,6 +12678,10 @@ handle_get_feeds (gmp_parser_t *gmp_parser, GError **error)
       || (strcasecmp (get_feeds_data->type, "cert") == 0))
     get_feed (gmp_parser, error, CERT_FEED);
 
+  if ((get_feeds_data->type == NULL)
+      || (strcasecmp (get_feeds_data->type, "gvmd_data") == 0))
+    get_feed (gmp_parser, error, GVMD_DATA_FEED);
+
   SEND_TO_CLIENT_OR_FAIL ("</get_feeds_response>");
 
   get_feeds_data_reset (get_feeds_data);

src/manage.h

@@ -3639,6 +3639,7 @@ aggregate_iterator_subgroup_value (iterator_t*);
 #define NVT_FEED 1
 #define SCAP_FEED 2
 #define CERT_FEED 3
+#define GVMD_DATA_FEED 4
 
 const gchar *
 get_feed_lock_path ();

src/manage_configs.c

@@ -54,7 +54,10 @@ feed_dir_configs ()
 {
   static gchar *path = NULL;
   if (path == NULL)
-    path = g_build_filename (GVMD_FEED_DIR, "configs", NULL);
+    path = g_build_filename (GVMD_FEED_DIR,
+                             GMP_VERSION,
+                             "configs",
+                             NULL);
   return path;
 }
 

src/manage_port_lists.c

@@ -50,7 +50,10 @@ feed_dir_port_lists ()
 {
   static gchar *path = NULL;
   if (path == NULL)
-    path = g_build_filename (GVMD_FEED_DIR, "port_lists", NULL);
+    path = g_build_filename (GVMD_FEED_DIR,
+                             GMP_VERSION,
+                             "port_lists",
+                             NULL);
   return path;
 }
 

src/manage_report_formats.c

@@ -382,7 +382,10 @@ feed_dir_report_formats ()
 {
   static gchar *path = NULL;
   if (path == NULL)
-    path = g_build_filename (GVMD_FEED_DIR, "report_formats", NULL);
+    path = g_build_filename (GVMD_FEED_DIR,
+                             GMP_VERSION,
+                             "report_formats",
+                             NULL);
   return path;
 }