Handle addition of ID to NVT preferences. #413

kroosec · 2019-03-04T08:17:30Z

No description provided.

cfi-gb

Keep in mind that the following two files are using preferences of ping_host.nasl as well:

https://github.com/greenbone/gvmd/blob/b6d078e6d2da0b3eb95a415ad34ca392b394f043/src/manage_config_host_discovery.c

https://github.com/greenbone/gvmd/blob/b6d078e6d2da0b3eb95a415ad34ca392b394f043/src/manage_config_discovery.c

Those ids where not added to the ping_host.nasl file yet.

cfi-gb · 2019-03-04T14:55:39Z

src/manage.c

@@ -2139,7 +2127,7 @@ send_alive_test_preferences (target_t target)
  if (alive_test == ALIVE_TEST_CONSIDER_ALIVE)
    {
      /* Also select a method, otherwise Ping Host logs a warning. */
-      if (sendf_to_server (OID_PING_HOST ":checkbox:Do a TCP ping <|> yes\n"))
+      if (sendf_to_server (OID_PING_HOST ":1:checkbox:Do a TCP ping <|> yes\n"))


The ids where added to ping_host.nasl today.

cfi-gb · 2019-03-04T14:56:09Z

src/manage.c

@@ -5393,7 +5382,7 @@ run_otp_task (task_t task, scanner_t scanner, int from, char **report_id)
                (gpointer) g_strdup (credential_iterator_private_key
                                      (&credentials)));

-              if (sendf_to_server (OID_SSH_AUTH ":file:SSH private key:"
+              if (sendf_to_server (OID_SSH_AUTH ":4:file:SSH private key:"


The ids where added to ssh_authorization_init.nasl today.

cfi-gb · 2019-03-04T14:56:37Z

src/manage.c

                               user ? user : "")
-              || sendf_to_server (OID_SMB_AUTH ":password:SMB password:"
+              || sendf_to_server (OID_SMB_AUTH ":2:password:SMB password:"


The ids where added to smb_authorization.nasl today.

cfi-gb · 2019-03-04T14:56:59Z

src/manage.c

                               " <|> %s\n",
                               user ? user : "")
-              || sendf_to_server (OID_ESXI_AUTH ":password:ESXi login password:"
+              || sendf_to_server (OID_ESXI_AUTH ":2:password:ESXi login password:"


The ids where added to gb_esxi_authorization.nasl today.

cfi-gb · 2019-03-04T14:57:22Z

src/manage.c

                                  "SNMPv3 Privacy Password:"
                                  " <|> %s\n",
                                  privacy_password ? privacy_password : "")
-              || sendf_to_server (OID_SNMP_AUTH ":radio:"
+              || sendf_to_server (OID_SNMP_AUTH ":6:radio:"


The ids where added to gb_snmp_authorization.nasl today.

mattmundell

I'm keen to get this in but would like to see the GMP doc updated with the ID, and also a check of why the OID_PING_HOST preference was removed.

src/gmp.c

src/manage_sql_nvts.c

src/manage.c

src/gmp.c

Also remove duplicate sending of "Do a TCP ping" preference.

Add the missing preference ID if found, so that the config preferences don't get deleted.

kroosec · 2019-03-14T11:19:44Z

I'm keen to get this in but would like to see the GMP doc updated with the ID, and also a check of why the OID_PING_HOST preference was removed.

Fixed all issues. Also added to the PR a routine to update old-style preferences in config_preferences.

cfi-gb · 2019-03-14T14:23:11Z

src/manage.c

                       " <|> %s\n",
                       ((alive_test & ALIVE_TEST_TCP_SYN_SERVICE)
                        && (alive_test & ALIVE_TEST_TCP_ACK_SERVICE))
                        ? "yes"
                        : "no"))
    return -1;

-  if (sendf_to_server (OID_PING_HOST ":checkbox:TCP ping tries only TCP-SYN ping"
+  if (sendf_to_server (OID_PING_HOST ":7:checkbox:TCP ping tries only TCP-SYN ping"


The id:7 for this preference was added to ping_host.nasl today.

cfi-gb · 2019-03-14T14:25:02Z

src/manage_config_host_discovery.c

               uuid)
      == 0)
    {
      sql ("INSERT INTO config_preferences (config, type, name, value)"
           " VALUES ((SELECT id FROM configs WHERE uuid = '%s'),"
           "         'PLUGINS_PREFS',"
-           "         '" OID_GLOBAL_SETTINGS ":checkbox:Strictly unauthenticated',"
+           "         '" OID_GLOBAL_SETTINGS ":1:checkbox:Strictly unauthenticated',"


The id:1 for this preference was added to global_settings.nasl today.

mattmundell

That's great, just one ID case missing in the docs. Can confirm updating old prefs works for me.

src/schema_formats/XML/GMP.xml.in

kroosec added the work in progress This pull request should not be merged yet, more commits are expected label Mar 4, 2019

kroosec requested review from mattmundell, timopollmeier and a team March 4, 2019 08:17

cfi-gb reviewed Mar 4, 2019

View reviewed changes

kroosec force-pushed the nvtpref-id branch from 2f0d782 to 6dd42a0 Compare March 6, 2019 22:07

kroosec removed the work in progress This pull request should not be merged yet, more commits are expected label Mar 10, 2019

kroosec mentioned this pull request Mar 11, 2019

Handle ID addition in NVT preferences. greenbone/gsa#1202

Merged

2 tasks

mattmundell requested changes Mar 12, 2019

View reviewed changes

src/gmp.c Show resolved Hide resolved

src/gmp.c Outdated Show resolved Hide resolved

src/manage_sql_nvts.c Show resolved Hide resolved

src/manage.c Show resolved Hide resolved

src/gmp.c Show resolved Hide resolved

src/gmp.c Show resolved Hide resolved

kroosec added 6 commits March 14, 2019 11:48

Update documentation.

41b8e3d

Adjust to handle NVT preferences new format.

2714a2b

Update hardcoded NVT OID's and prefs.

f8b9800

Also remove duplicate sending of "Do a TCP ping" preference.

Add NVT preference ID's to GMP.

67c2abc

Add routine to update config preferences.

84c9a7b

Add the missing preference ID if found, so that the config preferences don't get deleted.

Fix double-free in create_config_data_reset().

093e7b1

kroosec force-pushed the nvtpref-id branch from 0ade7ca to 093e7b1 Compare March 14, 2019 11:09

cfi-gb reviewed Mar 14, 2019

View reviewed changes

Merge branch 'master' into nvtpref-id

e7fbf64

mattmundell requested changes Mar 19, 2019

View reviewed changes

src/schema_formats/XML/GMP.xml.in Show resolved Hide resolved

mattmundell approved these changes Mar 19, 2019

View reviewed changes

mattmundell merged commit 9dba90b into greenbone:master Mar 19, 2019

mattmundell mentioned this pull request Oct 25, 2019

Ensure all NVT preference names are in the new format #744

Merged

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Handle addition of ID to NVT preferences. #413

Handle addition of ID to NVT preferences. #413

kroosec commented Mar 4, 2019

cfi-gb left a comment

cfi-gb Mar 4, 2019

cfi-gb Mar 4, 2019

cfi-gb Mar 4, 2019

cfi-gb Mar 4, 2019

cfi-gb Mar 4, 2019

mattmundell left a comment

kroosec commented Mar 14, 2019

cfi-gb Mar 14, 2019

cfi-gb Mar 14, 2019

mattmundell left a comment

Handle addition of ID to NVT preferences. #413

Handle addition of ID to NVT preferences. #413

Conversation

kroosec commented Mar 4, 2019

cfi-gb left a comment

Choose a reason for hiding this comment

cfi-gb Mar 4, 2019

Choose a reason for hiding this comment

cfi-gb Mar 4, 2019

Choose a reason for hiding this comment

cfi-gb Mar 4, 2019

Choose a reason for hiding this comment

cfi-gb Mar 4, 2019

Choose a reason for hiding this comment

cfi-gb Mar 4, 2019

Choose a reason for hiding this comment

mattmundell left a comment

Choose a reason for hiding this comment

kroosec commented Mar 14, 2019

cfi-gb Mar 14, 2019

Choose a reason for hiding this comment

cfi-gb Mar 14, 2019

Choose a reason for hiding this comment

mattmundell left a comment

Choose a reason for hiding this comment