From 5030ea5f75eeb9eb780c4067a547b544be0f0f7e Mon Sep 17 00:00:00 2001 From: Steffen Waterkamp Date: Fri, 11 Dec 2020 17:30:01 +0100 Subject: [PATCH 1/5] Fix severity level change condition at alert row --- gsa/src/web/pages/alerts/condition.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gsa/src/web/pages/alerts/condition.js b/gsa/src/web/pages/alerts/condition.js index bd85692b46..5f7e055ab8 100644 --- a/gsa/src/web/pages/alerts/condition.js +++ b/gsa/src/web/pages/alerts/condition.js @@ -28,6 +28,7 @@ import { CONDITION_TYPE_FILTER_COUNT_CHANGED, CONDITION_TYPE_SEVERITY_AT_LEAST, CONDITION_DIRECTION_DECREASED, + CONDITION_DIRECTION_INCREASED, } from 'gmp/models/alert'; const Condition = ({condition = {}, event}) => { @@ -85,10 +86,11 @@ const Condition = ({condition = {}, event}) => { } if (condition.type === 'Severity changed') { - if (isDefined(condition.data.direction)) { - if (condition.data.direction.value === CONDITION_DIRECTION_DECREASED) { - return _('Severity level decreased'); - } + if (condition?.data?.direction?.value === CONDITION_DIRECTION_DECREASED) { + return _('Severity level decreased'); + } else if ( + condition?.data?.direction?.value === CONDITION_DIRECTION_INCREASED + ) { return _('Severity level increased'); } return _('Severity level changed'); From 66a1f7b2d03ed6a13aa190c8b24081afa287a9fd Mon Sep 17 00:00:00 2001 From: Steffen Waterkamp Date: Fri, 11 Dec 2020 17:31:29 +0100 Subject: [PATCH 2/5] Update Changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef364f83a1..663a701d0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Use to disable feed object editing and filter creation on feed status page [#2398](https://github.com/greenbone/gsa/pull/2398) ### Fixed +- Fixed display of alert condition "Severity changed" [#2623](https://github.com/greenbone/gsa/pull/2623) - Fixed sanity check for port ranges [#2566](https://github.com/greenbone/gsa/pull/2566) - Allow to delete processes without having had edges in BPM [#2507](https://github.com/greenbone/gsa/pull/2507) - Fixed TLS certificate download for users with permissions [#2496](https://github.com/greenbone/gsa/pull/2496) From 7e70d58cd4218f0f6f68d775360949a9c8388740 Mon Sep 17 00:00:00 2001 From: Steffen Waterkamp Date: Fri, 11 Dec 2020 17:42:44 +0100 Subject: [PATCH 3/5] Add icon and link to tls certificates for hosts to detailspage --- gsa/src/web/pages/hosts/detailspage.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gsa/src/web/pages/hosts/detailspage.js b/gsa/src/web/pages/hosts/detailspage.js index 3567cd10da..f43e0051cf 100644 --- a/gsa/src/web/pages/hosts/detailspage.js +++ b/gsa/src/web/pages/hosts/detailspage.js @@ -34,6 +34,7 @@ import ListIcon from 'web/components/icon/listicon'; import ManualIcon from 'web/components/icon/manualicon'; import OsIcon from 'web/components/icon/osicon'; import ResultIcon from 'web/components/icon/resulticon'; +import TlsCertificateIcon from 'web/components/icon/tlscertificateicon'; import Divider from 'web/components/layout/divider'; import IconDivider from 'web/components/layout/icondivider'; @@ -126,6 +127,13 @@ const ToolBarIcons = ({ > + + + ); From 2bbf7e82d77ad56f50a19d8ae1f326a7131c81c0 Mon Sep 17 00:00:00 2001 From: Steffen Waterkamp Date: Fri, 11 Dec 2020 17:44:14 +0100 Subject: [PATCH 4/5] Update Changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef364f83a1..b9182a2cfb 100644 --- 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/). ## [20.8.1] - unreleased ### Added +- Added icon to host detailspage to link to TLS certificates [#2624](https://github.com/greenbone/gsa/pull/2624) - Added form validation for user setting "rows per page" [#2478](https://github.com/greenbone/gsa/pull/2478), [#2505](https://github.com/greenbone/gsa/pull/2505) - Added option for "Start Task" event upon "New SecInfo arrived" condition in alerts dialog [#2418](https://github.com/greenbone/gsa/pull/2418) From d2bcb4e9b47d8cb28fd61695ab1b5b752eb8b99d Mon Sep 17 00:00:00 2001 From: Steffen Waterkamp Date: Fri, 11 Dec 2020 17:48:52 +0100 Subject: [PATCH 5/5] Add German translation for "TLS certificates for this Host" --- gsa/public/locales/gsa-de.json | 1 + 1 file changed, 1 insertion(+) diff --git a/gsa/public/locales/gsa-de.json b/gsa/public/locales/gsa-de.json index 3e5356e420..5135761c44 100644 --- a/gsa/public/locales/gsa-de.json +++ b/gsa/public/locales/gsa-de.json @@ -1530,6 +1530,7 @@ "TLS Certificates are always included for now": "TLS-Zertifikate werden bis auf Weiteres immer hinzugefügt", "TLS Certificates by Modification Time (Total: {{count}})": "TLS-Zertifikate nach Änderungszeit (Gesamt: {{count}})", "TLS Certificates by Status (Total: {{count}})": "TLS-Zertifikate nach Status (Gesamt: {{count}})", + "TLS Certificates for this Host": "TLS-Zertifikate für diesen Host", "Table: CERT-Bund Advisories by CVSS": "Tabelle: CERT-Bund-Advisories nach CVSS", "Table: CERT-Bund Advisories by Creation Time": "Tabelle: CERT-Bund-Advisories nach Erstellungszeit", "Table: CERT-Bund Advisories by Severity Class": "Tabelle: CERT-Bund-Advisories nach Schweregradklasse",