Merge branch 'master' into create-alerts

CHANGELOG.md

@@ -22,11 +22,25 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 [21.04]: https://github.com/greenbone/gsa/compare/gsa-20.08...master
 
-## [20.08] - unreleased
+## [20.8.1] - unreleased
 
 ### Added
-- Add reload timer to feedstatuspage and displaying when updating is in progress [#2350](https://github.com/greenbone/gsa/pull/2350)
-- Add filtered links to GVMD_DATA row in feed status page [#2339](https://github.com/greenbone/gsa/pull/2339)
+- Added option for "Start Task" event upon "New SecInfo arrived" condition in alerts dialog [#2418](https://github.com/greenbone/gsa/pull/2418)
+
+### Changed
+- Use <predefined> to disable feed object editing and filter creation on feed status page [#2398](https://github.com/greenbone/gsa/pull/2398)
+
+### Fixed
+
+### Removed
+
+[20.8.1]: https://github.com/greenbone/gsa/compare/v20.8.0...gsa-20.08
+
+## [20.8.0] - 2020-08-11
+
+### Added
+- Added reload timer to feedstatuspage and displaying when updating is in progress [#2350](https://github.com/greenbone/gsa/pull/2350)
+- Added filtered links to GVMD_DATA row in feed status page [#2339](https://github.com/greenbone/gsa/pull/2339)
 - Added loading indicator for CVEs on CPE detailspage [#2248](https://github.com/greenbone/gsa/pull/2248)
 - Added new form validation feature, implemented on create and edit ticket dialog [#1782](https://github.com/greenbone/gsa/pull/1782)
 - Added German translation for About page [#1998](https://github.com/greenbone/gsa/pull/1998)
@@ -39,11 +53,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Added handling of queued task status [#2208](https://github.com/greenbone/gsa/pull/2208)
 
 ### Changed
+- Increase age for feed being too old [#2394](https://github.com/greenbone/gsa/pull/2394)
 - Do not use result filter from store on report detailspage by default [#2358](https://github.com/greenbone/gsa/pull/2358)
 - Improve performance of form fields in edit scan config dialog [#2354](https://github.com/greenbone/gsa/pull/2354)
 - Default to sorting nvts by "Created", newest first [#2352](https://github.com/greenbone/gsa/pull/2352)
 - Disable EditIcons for data objects from feed [#2346](https://github.com/greenbone/gsa/pull/2346)
-- EmptyResultsReport uses the same counts as the results tab title in normal reports, when filtering for nonexistent results [#2335](https://github.com/greenbone/gsa/pull/2335)
 - Improve error 503 message at login [#2310](https://github.com/greenbone/gsa/pull/2310)
 - Use unified solution type instead of solution type nvt tag [#2268](https://github.com/greenbone/gsa/pull/2268)
 - Changed queued status color [#2227](https://github.com/greenbone/gsa/pull/2227)
@@ -61,6 +75,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Deleting a single entity now removes its ID from store [#1839](https://github.com/greenbone/gsa/pull/1839)
 
 ### Fixed
+- Fixed empty subsections on oval def details page [#2396](https://github.com/greenbone/gsa/pull/2396)
+- Fixed missing NVT solution [#2388](https://github.com/greenbone/gsa/pull/2388)
+- EmptyResultsReport uses the same counts as the results tab title in normal reports, when filtering for nonexistent results
+  [#2335](https://github.com/greenbone/gsa/pull/2335), [#2365](https://github.com/greenbone/gsa/pull/2365)
+- Show proper error message on report detailspage when no report format is available [#2367](https://github.com/greenbone/gsa/pull/2367)
+- Don't use stored result list page filter at report results tab [#2366](https://github.com/greenbone/gsa/pull/2366)
+- Fixed pagination of report results [#2365](https://github.com/greenbone/gsa/pull/2365)
 - Fixed flickering reports [#2359](https://github.com/greenbone/gsa/pull/2359)
 - Fixed "Hosts scanned" in report details disappearing during page refresh [#2357](https://github.com/greenbone/gsa/pull/2357)
 - Fixed schedule_periods not forwarded if there is no schedule [#2331](https://github.com/greenbone/gsa/pull/2331)
@@ -89,7 +110,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Removed "All SecInfo" section [#1685](https://github.com/greenbone/gsa/pull/1685) [#1695](https://github.com/greenbone/gsa/pull/1695)
 - Removed agents [#1903](https://github.com/greenbone/gsa/pull/1903)
 
-[20.08]: https://github.com/greenbone/gsa/compare/gsa-9.0...gsa-20.08
+[20.8.0]: https://github.com/greenbone/gsa/compare/gsa-9.0...v20.8.0
 
 ## [9.0.1] - 2020-05-13
 

CMakeLists.txt

@@ -22,7 +22,7 @@ message ("-- Configuring Greenbone Security Assistant")
 # VERSION: Set patch version for stable releases, e.g. "9.0.1",
 #          unset patch version for prereleases, e.g. "9.0"
 project (greenbone-security-assistant
-         VERSION 20.08)
+         VERSION 20.8.0)
 
 SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 
@@ -32,7 +32,7 @@ endif (NOT CMAKE_BUILD_TYPE)
 
 # set if this is in prerelease status, starting at 0 before first beta release,
 # unset if this is a stable release series.
-set (PROJECT_BETA_RELEASE 0)
+# set (PROJECT_BETA_RELEASE 0)
 
 ## Retrieve git revision (at configure time)
 include (ProjectVersion)

gsa/CMakeLists.txt

@@ -19,7 +19,7 @@ cmake_minimum_required (VERSION 3.0)
 
 message ("-- Configuring gsa")
 
-project (gsa VERSION 20.08 LANGUAGES)
+project (gsa VERSION 20.8.0 LANGUAGES)
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 

gsa/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gsa",
-  "version": "20.08",
+  "version": "20.08.0",
   "description": "Greenbone Security Assistant",
   "keywords": [
     "openvas",
@@ -14,7 +14,7 @@
     "url": "https://github.com/greenbone/gsa/"
   },
   "author": "Björn Ricks <[email protected]>",
-  "license": "GPL-2.0+",
+  "license": "AGPL-3.0+",
   "main": "src/index.js",
   "engines": {
     "node": ">=10.0"

gsa/public/locales/gsa-de.json

@@ -1659,6 +1659,7 @@
   "The maximum of {{num}} hosts was exceeded. If there are more hosts associated with this process, they will not be taken into account.": "Das Maximum von {{num}} Hosts wurde überschritten. Sollten weitere Hosts mit diesem Prozess verknüpft sein, werden sie nicht mitberücksichtigt.",
   "The name must include at least one alphanumeric character or one of .,-/_# and space.": "Der Name muss mindestens ein alphanumerisches Zeichen oder eines von .,-/_# und Leerzeichen enthalten.",
   "The port range needs numerical values for start and end!": "Der Portbereich benötigt numerische Werte für Start und Ende!",
+  "The report cannot be displayed because no Greenbone Vulnerability Manager report format is available. This could be due to a missing gvmd data feed. Please update the gvmd data feed, check the \"feed import owner\" setting, or contact your system administrator.": "Der Bericht kann nicht angezeigt werden, weil dem Greenbone Vulnerability Manager kein Berichtformat zur Verfügung steht. Dies könnte an einem fehlenden gvmd Data Feed liegen. Bitte aktualisieren Sie den gvmd Data Feed, überprüfen die \"Feed Import Besitzer\"-Einstellungen, oder kontaktieren Ihren Systemadministrator.",
   "The report is empty. The filter does not match any of the {{all}} results.": "Der Bericht ist leer. Der Filter passt zu keinem der {{all}} Ergebnisse.",
   "The scan did not collect any results": "Der Scan hat keine Ergebnisse gesammelt",
   "The scan is still running and no results have arrived yet": "Der Scan läuft noch und es sind noch keine Ergebnisse eingetroffen",
@@ -1758,6 +1759,7 @@
   "Unreliable rem. banner": "Unzuverlässiger Banner",
   "Update": "Aktualisieren",
   "Update Filter": "Filter aktualisieren",
+  "Update in progress...": "Aktualisierung läuft...",
   "Updated": "Aktualisiert",
   "Updated {{secinfo_type}} arrived": "Aktualisierte {{secinfo_type}} eingetroffen",
   "Updated: ": "Aktualisiert: ",

gsa/src/gmp/gmpsettings.js

@@ -21,9 +21,10 @@ export const DEFAULT_GRAPHQL_API_LOCATION = 'selene/graphql/';
 export const DEFAULT_RELOAD_INTERVAL = 15 * 1000; // fifteen seconds
 export const DEFAULT_RELOAD_INTERVAL_ACTIVE = 3 * 1000; // three seconds
 export const DEFAULT_RELOAD_INTERVAL_INACTIVE = 60 * 1000; // one minute
-export const DEFAULT_MANUAL_URL = 'http://docs.greenbone.net/GSM-Manual/gos-6/';
+export const DEFAULT_MANUAL_URL =
+  'http://docs.greenbone.net/GSM-Manual/gos-20.08/';
 export const DEFAULT_PROTOCOLDOC_URL =
-  'https://docs.greenbone.net/API/GMP/gmp-9.0.html';
+  'https://docs.greenbone.net/API/GMP/gmp-20.08.html';
 export const DEFAULT_REPORT_RESULTS_THRESHOLD = 25000;
 export const DEFAULT_LOG_LEVEL = 'warn';
 export const DEFAULT_TIMEOUT = 300000; // 5 minutes

gsa/src/gmp/models/__tests__/policy.js

@@ -246,6 +246,14 @@ describe('Policy model tests', () => {
 
     expect(policy.audits).toEqual([]);
   });
+
+  test('should parse predefined as boolean correctly', () => {
+    const policy = Policy.fromElement({predefined: '0'});
+    const policy2 = Policy.fromElement({predefined: '1'});
+
+    expect(policy.predefined).toEqual(false);
+    expect(policy2.predefined).toEqual(true);
+  });
 });
 
 // vim: set ts=2 sw=2 tw=80:

gsa/src/gmp/models/__tests__/portlist.js

@@ -108,6 +108,14 @@ describe('PortList model tests', () => {
 
     expect(portList.targets).toEqual([]);
   });
+
+  test('should parse predefined as boolean correctly', () => {
+    const portList = PortList.fromElement({predefined: '0'});
+    const portList2 = PortList.fromElement({predefined: '1'});
+
+    expect(portList.predefined).toEqual(false);
+    expect(portList2.predefined).toEqual(true);
+  });
 });
 
 // vim: set ts=2 sw=2 tw=80:

gsa/src/gmp/models/__tests__/reportformat.js

@@ -64,6 +64,14 @@ describe('ReportFormat model tests', () => {
     expect(reportFormat2.active).toEqual(YES_VALUE);
   });
 
+  test('should parse predefined as boolean correctly', () => {
+    const reportFormat = ReportFormat.fromElement({predefined: '0'});
+    const reportFormat2 = ReportFormat.fromElement({predefined: '1'});
+
+    expect(reportFormat.predefined).toEqual(false);
+    expect(reportFormat2.predefined).toEqual(true);
+  });
+
   test('should parse alerts', () => {
     const elem = {
       alerts: {

gsa/src/gmp/models/__tests__/scanconfig.js

@@ -252,6 +252,14 @@ describe('ScanConfig model tests', () => {
 
     expect(scanConfig.tasks).toEqual([]);
   });
+
+  test('should parse predefined as boolean correctly', () => {
+    const scanConfig = ScanConfig.fromElement({predefined: '0'});
+    const scanConfig2 = ScanConfig.fromElement({predefined: '1'});
+
+    expect(scanConfig.predefined).toEqual(false);
+    expect(scanConfig2.predefined).toEqual(true);
+  });
 });
 
 describe('ScanConfigs model function test', () => {

gsa/src/gmp/models/nvt.js

@@ -135,11 +135,11 @@ class Nvt extends Info {
       getFilteredRefs(refs, 'cert-bund'),
     );
 
-    if (isDefined(element.solution)) {
+    if (isDefined(ret.solution)) {
       ret.solution = {
-        type: element.solution._type,
-        description: element.solution.__text,
-        method: element.solution._method,
+        type: ret.solution._type,
+        description: ret.solution.__text,
+        method: ret.solution._method,
       };
     }
 

gsa/src/gmp/models/ovaldef.js

@@ -74,10 +74,10 @@ class Ovaldef extends Info {
   static parseElement(element) {
     const ret = super.parseElement(element, 'ovaldef');
 
-    ret.severity = parseSeverity(element.max_cvss);
+    ret.severity = parseSeverity(ret.max_cvss);
     delete ret.max_cvss;
 
-    const {raw_data} = element;
+    const {raw_data} = ret;
 
     if (isDefined(raw_data) && isDefined(raw_data.definition)) {
       const {definition} = raw_data;

gsa/src/gmp/models/policy.js

@@ -20,7 +20,7 @@ import {isDefined} from '../utils/identity';
 import {forEach, map} from '../utils/array';
 import {isEmpty} from '../utils/string';
 
-import {parseInt} from '../parser';
+import {parseInt, parseBoolean} from '../parser';
 
 import Model, {parseModelFromElement} from '../model';
 
@@ -130,6 +130,8 @@ class Policy extends Model {
       ret.audits = [];
     }
 
+    ret.predefined = parseBoolean(element.predefined);
+
     return ret;
   }
 }

gsa/src/gmp/models/portlist.js

@@ -20,7 +20,7 @@ import {map} from '../utils/array';
 
 import Model, {parseModelFromElement} from '../model';
 
-import {parseInt} from '../parser';
+import {parseInt, parseBoolean} from '../parser';
 
 class PortRange extends Model {
   static entityType = 'portrange';
@@ -71,6 +71,9 @@ class PortList extends Model {
     } else {
       ret.targets = [];
     }
+
+    ret.predefined = parseBoolean(element.predefined);
+
     return ret;
   }
 }

gsa/src/gmp/models/reportformat.js

@@ -19,7 +19,7 @@ import {isDefined, isObject} from '../utils/identity';
 import {map} from '../utils/array';
 import {isEmpty} from '../utils/string';
 
-import {parseDate, parseYesNo, YES_VALUE} from '../parser';
+import {parseDate, parseYesNo, YES_VALUE, parseBoolean} from '../parser';
 
 import Model, {parseModelFromElement} from '../model';
 
@@ -84,6 +84,7 @@ class ReportFormat extends Model {
     }
 
     ret.active = parseYesNo(element.active);
+    ret.predefined = parseBoolean(element.predefined);
 
     return ret;
   }

gsa/src/gmp/models/scanconfig.js

@@ -20,7 +20,7 @@ import {isDefined} from '../utils/identity';
 import {forEach, map} from '../utils/array';
 import {isEmpty} from '../utils/string';
 
-import {parseInt} from '../parser';
+import {parseInt, parseBoolean} from '../parser';
 
 import Model, {parseModelFromElement} from '../model';
 
@@ -167,6 +167,8 @@ class ScanConfig extends Model {
       ret.tasks = [];
     }
 
+    ret.predefined = parseBoolean(element.predefined);
+
     return ret;
   }
 }

gsa/src/web/components/error/errorpanel.js

@@ -45,9 +45,7 @@ const ErrorDetails = styled.div`
   background-color: ${Theme.white};
   padding: 5px;
   max-height: 200px;
-  overflow: auto;
   overflow-x: auto;
-  white-space: pre;
 `;
 
 const ErrorPanel = ({error, message, info}) => {