Merge pull request #1359 from timopollmeier/vt-severities-origin-and-…

…date Get origin and date for VT severities from OSP
greenbone · Nov 20, 2020 · a20d893 · a20d893
2 parents f36f1e0 + aa5b0ed
commit a20d893
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [21.4] (unreleased)
 
 ### Added
+- Extend GMP for extended severities [#1326](https://github.com/greenbone/gvmd/pull/1326) [#1329](https://github.com/greenbone/gvmd/pull/1329) [#1359](https://github.com/greenbone/gvmd/pull/1359)
 - Parameter `--db-user` to set a database user [#1327](https://github.com/greenbone/gvmd/pull/1327)
 - Add `allow_simult_ips_same_host` field for targets [#1346](https://github.com/greenbone/gvmd/pull/1346)
 - Speed up GET_VULNS [#1354](https://github.com/greenbone/gvmd/pull/1354) [#1355](https://github.com/greenbone/gvmd/pull/1354)

diff --git a/src/manage_sql_nvts.c b/src/manage_sql_nvts.c
@@ -1374,16 +1374,29 @@ nvti_from_vt (entity_t vt)
             }
           else
             {
+              entity_t origin, severity_date;
               double cvss_base_dbl;
               gchar * cvss_base;
+              time_t parsed_severity_date;
 
               cvss_base_dbl
                 = get_cvss_score_from_base_metrics (entity_text (value));
 
+              origin
+                = entity_child (severity, "origin");
+              severity_date
+                = entity_child (severity, "date");
+
+              if (severity_date)
+                parsed_severity_date = strtol (entity_text (severity_date),
+                                               NULL, 10);
+              else
+                parsed_severity_date = nvti_creation_time (nvti);
+
               nvti_add_vtseverity (nvti,
                 vtseverity_new (severity_type,
-                                NULL /* origin */,
-                                nvti_modification_time (nvti),
+                                origin ? entity_text (origin) : NULL,
+                                parsed_severity_date,
                                 round (cvss_base_dbl * 10.0),
                                 entity_text (value)));