From afe7c038bb49e1954ecbd1e6ebcb202e04a0aacd Mon Sep 17 00:00:00 2001 From: Timo Pollmeier Date: Thu, 29 Apr 2021 09:40:53 +0200 Subject: [PATCH 1/2] Sort missing severity as lowest value in GMP get When a filter sorting by severity (or similar fields like cvss_base) is used in GMP get_... commands, missing values will be sorted as lower than any other value like 0.0 (log) or -1.0 (false positive). --- src/manage_sql.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/manage_sql.c b/src/manage_sql.c index 7dd1e9e99..44fe1c54c 100644 --- a/src/manage_sql.c +++ b/src/manage_sql.c @@ -3025,8 +3025,10 @@ filter_clause (const char* type, const char* filter, keyword->string); g_string_append_printf (order, " ORDER BY CASE CAST (%s AS text)" - " WHEN '' THEN NULL" - " ELSE CAST (%s AS REAL) END ASC", + " WHEN '' THEN '-Infinity'::real" + " ELSE coalesce(%s::real," + " '-Infinity'::real)" + " END ASC", column, column); } @@ -3215,8 +3217,10 @@ filter_clause (const char* type, const char* filter, keyword->string); g_string_append_printf (order, " ORDER BY CASE CAST (%s AS text)" - " WHEN '' THEN NULL" - " ELSE CAST (%s AS REAL) END DESC", + " WHEN '' THEN '-Infinity'::real" + " ELSE coalesce(%s::real," + " '-Infinity'::real)" + " END DESC", column, column); } From 89c41423aafa51b7bdef869a5f616ca3b0a4e629 Mon Sep 17 00:00:00 2001 From: Timo Pollmeier Date: Thu, 29 Apr 2021 09:47:05 +0200 Subject: [PATCH 2/2] Add CHANGELOG entry for severity sorting change --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c7d008e8..79359fc9e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Changed - Improve report counts performance [#1438](https://github.com/greenbone/gvmd/pull/1438) - Clean up log config, add gvm-libs log domains [#1502](https://github.com/greenbone/gvmd/pull/1502) +- Sort missing severity as lowest value in GMP get [#1508](https://github.com/greenbone/gvmd/pull/1508) ### Fixed - Also create owner WITH clause for single resources [#1406](https://github.com/greenbone/gvmd/pull/1406)