Merge pull request #856 from mattmundell/refuse-old-configs-9.0

Refuse to import config with missing NVT preference ID (9.0)

CHANGELOG.md

@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Add option --optimize migrate-relay-sensors [#827](https://github.com/greenbone/gvmd/pull/827)
 - Add host_id filter for tls_certificates [#835](https://github.com/greenbone/gvmd/pull/835)
 - Allow use of public key auth in SCP alert [#845](https://github.com/greenbone/gvmd/pull/845)
+- Refuse to import config with missing NVT preference ID [#856](https://github.com/greenbone/gvmd/pull/856)
 
 ### Changed
 - Extend command line options for managing scanners [#815](https://github.com/greenbone/gvmd/pull/815)

src/manage_sql_configs.c

@@ -2178,6 +2178,10 @@ config_insert_preferences (config_t config,
             if (config_type == NULL || strcmp (config_type, "0") == 0)
               {
                 /* NVT preference */
+
+                if (preference->id == NULL || *preference->id == '\0')
+                  return -4;
+
                 /* OID:PrefID:PrefType:PrefName value */
                 sql ("INSERT INTO config_preferences"
                      " (config, type, name, value)"

src/schema_formats/XML/GMP.xml.in

@@ -27257,6 +27257,17 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
   <!-- Compatibility changes between versions. -->
 
+  <change>
+    <command>CREATE_CONFIG</command>
+    <summary>NVT preferences without IDs are no longer accepted</summary>
+    <description>
+      <p>
+        Importing of old scan configs that do not specify an ID for their
+        NVT preferences is no longer allowed.
+      </p>
+    </description>
+    <version>9.0</version>
+  </change>
   <change>
     <command>GET_REPORTS</command>
     <summary>Default of "details" attribute is now 0</summary>