Merge pull request #1521 from greenbone/mergify/bp/master/pr-1517

Fix whole-only config family selection (backport #1517)
greenbone · May 14, 2021 · 15ddafe · 15ddafe
2 parents b936dfc + 40354eb
commit 15ddafe
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Fixed
 - Improve VT version handling for CVE & OVAL results [#1496](https://github.com/greenbone/gvmd/pull/1496)
+- Update subject alternative name in certificate generation [#1503](https://github.com/greenbone/gvmd/pull/1503)
+- Fix whole-only config family selection [#1517](https://github.com/greenbone/gvmd/pull/1517)
 
 [21.4.0]: https://github.com/greenbone/gvmd/compare/v21.4.0...gvmd-21.04
 

diff --git a/src/gmp_configs.c b/src/gmp_configs.c
@@ -904,12 +904,15 @@ modify_config_handle_family_selection (config_t config,
                                        gmp_parser_t *gmp_parser,
                                        GError **error)
 {
+  gchar *rejected_family;
+
   switch (manage_set_config_families
              (config,
               families_growing_all,
               families_static_all,
               families_growing_empty,
-              family_selection_growing))
+              family_selection_growing,
+              &rejected_family))
     {
       case 0:
         return 0;
@@ -919,9 +922,13 @@ modify_config_handle_family_selection (config_t config,
         return -1;
       case 2:
         SENDF_TO_CLIENT_OR_FAIL_WITH_RETURN
-          (-1, XML_ERROR_SYNTAX ("modify_config",
-                            "Whole-only families must include entire"
-                            " family and be growing"));
+          (-1,
+           XML_ERROR_SYNTAX ("modify_config",
+                             "Family &quot;%s&quot; must be growing and"
+                             " include all VTs or it must be static and"
+                             " empty."),
+           rejected_family);
+        g_free (rejected_family);
         return -1;
       case -1:
         SENDF_TO_CLIENT_OR_FAIL_WITH_RETURN

diff --git a/src/manage_configs.h b/src/manage_configs.h
@@ -172,7 +172,8 @@ int
 manage_set_config_nvts (config_t, const char*, GPtrArray*);
 
 int
-manage_set_config_families (config_t, GPtrArray*, GPtrArray*, GPtrArray*, int);
+manage_set_config_families (config_t, GPtrArray*, GPtrArray*, GPtrArray*, int,
+                            gchar **);
 
 void
 init_config_timeout_iterator (iterator_t*, config_t);

diff --git a/src/manage_sql_configs.c b/src/manage_sql_configs.c
@@ -919,6 +919,7 @@ manage_modify_config_commit ()
  * @param[in]  static_all_families   Static families with all selection.
  * @param[in]  growing_families      The rest of the growing families.
  * @param[in]  grow_families         1 if families should grow, else 0.
+ * @param[out] rejected_family       Return of family if one was rejected.
  *
  * @return 0 success, 1 config in use, 2 whole-only families must be growing
  *         and include entire family, -1 error.
@@ -928,7 +929,8 @@ manage_set_config_families (config_t config,
                             GPtrArray* growing_all_families,
                             GPtrArray* static_all_families,
                             GPtrArray* growing_families,
-                            int grow_families)
+                            int grow_families,
+                            gchar **rejected_family)
 {
   static const gchar *wholes[] = FAMILIES_WHOLE_ONLY;
   iterator_t families;
@@ -938,10 +940,26 @@ manage_set_config_families (config_t config,
 
   /* Ensure that whole-only families include all NVTs and are growing. */
 
+  if (rejected_family)
+    *rejected_family = NULL;
+
   for (const gchar **whole = wholes; *whole; whole++)
-    if (member (growing_all_families, *whole)
-        || member (static_all_families, *whole))
-      return 2;
+    {
+      if (member (static_all_families, *whole)
+          || member (growing_families, *whole))
+        {
+          if (member (static_all_families, *whole))
+            g_debug ("%s rejected static/all whole-only family %s",
+                     __func__, *whole);
+          else if (member (growing_families, *whole))
+            g_debug ("%s rejected growing/empty whole-only family %s",
+                     __func__, *whole);
+
+          if (rejected_family)
+            *rejected_family = g_strdup (*whole);
+          return 2;
+        }
+    }
 
   /* Check the args. */