Merge branch 'gsa-20.08' into fix-compiling-gsad-with-libmicrohttp-0.…

…9.71
greenbone · Dec 14, 2020 · 7f70b6a · 7f70b6a
2 parents 3cd3f6f + df6db25
commit 7f70b6a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 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/).
 ## [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)
@@ -24,6 +25,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Fixed
 - Fixed compiling gsad with libmicrohttp 0.9.71 and later [#2625](https://github.com/greenbone/gsa/pull/2625)
+- 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)

diff --git 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",

diff --git 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');

diff --git 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 = ({
         >
           <ResultIcon />
         </Link>
+        <Link
+          to="tlsCertificates"
+          filter={'host_id=' + entity.id}
+          title={_('TLS Certificates for this Host')}
+        >
+          <TlsCertificateIcon />
+        </Link>
       </IconDivider>
     </Divider>
   );