Add OSP Sensor type to GSA

CHANGELOG.md

@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 
 ### Added
+- Added OSP Sensor type to GSA [#1646](https://github.com/greenbone/gsa/pull/1646)
 - Added TLS certificate filter type [#1630](https://github.com/greenbone/gsa/pull/1630)
 - Added change method to Field and TextArea component, removed withChangeHandler [#1625](https://github.com/greenbone/gsa/pull/1625)
 - Added custom page title to all pages [#1623](https://github.com/greenbone/gsa/pull/1623/files)

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

@@ -30,6 +30,7 @@ import Scanner, {
   OPENVAS_SCANNER_TYPE,
   OSP_SCANNER_TYPE,
   GMP_SCANNER_TYPE,
+  OSP_SENSOR_SCANNER_TYPE,
 } from 'gmp/models/scanner';
 import {testModel} from 'gmp/models/testing';
 
@@ -187,33 +188,39 @@ describe('Scanner model tests', () => {
     const elem2 = {type: OPENVAS_SCANNER_TYPE};
     const elem3 = {type: GMP_SCANNER_TYPE};
     const elem4 = {type: OSP_SCANNER_TYPE};
+    const elem5 = {type: OSP_SENSOR_SCANNER_TYPE};
 
     const scanner1 = new Scanner(elem1);
     const scanner2 = new Scanner(elem2);
     const scanner3 = new Scanner(elem3);
     const scanner4 = new Scanner(elem4);
+    const scanner5 = new Scanner(elem5);
 
     expect(scanner1.isClonable()).toEqual(false);
     expect(scanner2.isClonable()).toEqual(false);
     expect(scanner3.isClonable()).toEqual(true);
     expect(scanner4.isClonable()).toEqual(true);
+    expect(scanner5.isClonable()).toEqual(true);
   });
 
   test('isWritable() should return correct true/false', () => {
     const elem1 = {type: CVE_SCANNER_TYPE};
     const elem2 = {type: OPENVAS_SCANNER_TYPE};
     const elem3 = {type: GMP_SCANNER_TYPE};
     const elem4 = {type: OSP_SCANNER_TYPE};
+    const elem5 = {type: OSP_SENSOR_SCANNER_TYPE};
 
     const scanner1 = new Scanner(elem1);
     const scanner2 = new Scanner(elem2);
     const scanner3 = new Scanner(elem3);
     const scanner4 = new Scanner(elem4);
+    const scanner5 = new Scanner(elem5);
 
     expect(scanner1.isClonable()).toEqual(false);
     expect(scanner2.isClonable()).toEqual(false);
     expect(scanner3.isClonable()).toEqual(true);
     expect(scanner4.isClonable()).toEqual(true);
+    expect(scanner5.isClonable()).toEqual(true);
   });
 
   test('hasUnixSocket() should return correct true/false', () => {
@@ -233,13 +240,15 @@ describe('Scanner model function tests', () => {
     const type2 = scannerTypeName(OPENVAS_SCANNER_TYPE);
     const type3 = scannerTypeName(CVE_SCANNER_TYPE);
     const type4 = scannerTypeName(GMP_SCANNER_TYPE);
-    const type5 = scannerTypeName(42);
+    const type5 = scannerTypeName(OSP_SENSOR_SCANNER_TYPE);
+    const type6 = scannerTypeName(42);
 
     expect(type1).toEqual('OSP Scanner');
     expect(type2).toEqual('OpenVAS Scanner');
     expect(type3).toEqual('CVE Scanner');
     expect(type4).toEqual('GMP Scanner');
-    expect(type5).toEqual('Unknown type (42)');
+    expect(type5).toEqual('OSP Sensor');
+    expect(type6).toEqual('Unknown type (42)');
   });
 
   test('openVasScannersFilter should return filter with correct true/false', () => {

gsa/src/gmp/models/scanner.js

@@ -32,6 +32,7 @@ export const OSP_SCANNER_TYPE = 1;
 export const OPENVAS_SCANNER_TYPE = 2;
 export const CVE_SCANNER_TYPE = 3;
 export const GMP_SCANNER_TYPE = 4;
+export const OSP_SENSOR_SCANNER_TYPE = 5;
 
 export const OPENVAS_DEFAULT_SCANNER_ID =
   '08b69003-5fc2-4037-a479-93b440211c73';
@@ -55,6 +56,8 @@ export function scannerTypeName(scannerType) {
     return _('CVE Scanner');
   } else if (scannerType === GMP_SCANNER_TYPE) {
     return _('GMP Scanner');
+  } else if (scannerType === OSP_SENSOR_SCANNER_TYPE) {
+    return _('OSP Sensor');
   }
   return _('Unknown type ({{type}})', {type: scannerType});
 }

gsa/src/web/pages/performance/performancepage.js

@@ -29,7 +29,7 @@ import {isDefined} from 'gmp/utils/identity';
 
 import date from 'gmp/models/date';
 import Filter from 'gmp/models/filter';
-import {GMP_SCANNER_TYPE} from 'gmp/models/scanner';
+import {GMP_SCANNER_TYPE, OSP_SENSOR_SCANNER_TYPE} from 'gmp/models/scanner';
 
 import FormGroup from 'web/components/form/formgroup';
 import Select from 'web/components/form/select';
@@ -162,7 +162,9 @@ const Selector = withClickHandler()(styled.span`
   }}
 `);
 
-const SLAVE_SCANNER_FILTER = Filter.fromString('type=' + GMP_SCANNER_TYPE);
+const SLAVE_SCANNER_FILTER = Filter.fromString(
+  'type=' + GMP_SCANNER_TYPE + ' type=' + OSP_SENSOR_SCANNER_TYPE,
+);
 
 class PerformancePage extends React.Component {
   constructor(...args) {
@@ -328,7 +330,7 @@ class PerformancePage extends React.Component {
               </Divider>
             </FormGroup>
 
-            <FormGroup title={_('Report for GMP Scanner')}>
+            <FormGroup title={_('Report for GMP Scanner or OSP Sensor')}>
               <Select
                 name="scannerId"
                 value={sensorId}

gsa/src/web/pages/scanners/dialog.js

@@ -54,6 +54,7 @@ import {getTimezone} from 'web/store/usersettings/selectors';
 import {
   OSP_SCANNER_TYPE,
   GMP_SCANNER_TYPE,
+  OSP_SENSOR_SCANNER_TYPE,
   scannerTypeName,
 } from 'gmp/models/scanner';
 
@@ -62,7 +63,11 @@ import {
   USERNAME_PASSWORD_CREDENTIAL_TYPE,
 } from 'gmp/models/credential';
 
-const SCANNER_TYPES = [GMP_SCANNER_TYPE, OSP_SCANNER_TYPE];
+const SCANNER_TYPES = [
+  GMP_SCANNER_TYPE,
+  OSP_SCANNER_TYPE,
+  OSP_SENSOR_SCANNER_TYPE,
+];
 
 const client_cert_credentials_filter = credential => {
   return credential.credential_type === CLIENT_CERTIFICATE_CREDENTIAL_TYPE;
@@ -143,10 +148,9 @@ class ScannerDialog extends React.Component {
 
   render() {
     const {
-      ca_pub,
       comment = '',
       scanner,
-      credential_id,
+      ca_pub,
       credentials,
       host = 'localhost',
       id,
@@ -161,6 +165,8 @@ class ScannerDialog extends React.Component {
       onSave,
     } = this.props;
 
+    let {credential_id} = this.props;
+
     const data = {
       ca_pub,
       comment,
@@ -182,8 +188,14 @@ class ScannerDialog extends React.Component {
     const show_cred_info =
       isDefined(scanner) &&
       isDefined(scanner.credential) &&
-      scanner.credential.type === CLIENT_CERTIFICATE_CREDENTIAL_TYPE;
-    const isGmpScannerType = type === GMP_SCANNER_TYPE;
+      scanner.credential.credential_type === CLIENT_CERTIFICATE_CREDENTIAL_TYPE;
+
+    const isOspSensorType = type === OSP_SENSOR_SCANNER_TYPE;
+    const isOspScannerType = type === OSP_SCANNER_TYPE;
+
+    if (isOspSensorType) {
+      credential_id = '';
+    }
 
     return (
       <SaveDialog
@@ -239,7 +251,7 @@ class ScannerDialog extends React.Component {
                 />
               </FormGroup>
 
-              {!isGmpScannerType && (
+              {isOspScannerType && (
                 <React.Fragment>
                   <FormGroup title={_('Port')}>
                     <TextField
@@ -295,26 +307,28 @@ class ScannerDialog extends React.Component {
                 </React.Fragment>
               )}
 
-              <FormGroup title={_('Credential')} flex="column">
-                <Divider>
-                  <Select
-                    name="credential_id"
-                    items={renderSelectItems(scanner_credentials)}
-                    value={credential_id}
-                    onChange={onCredentialChange}
-                  />
-                  <Layout>
-                    <NewIcon
-                      value={type}
-                      title={_('Create a new Credential')}
-                      onClick={onNewCredentialClick}
+              {!isOspSensorType && (
+                <FormGroup title={_('Credential')} flex="column">
+                  <Divider>
+                    <Select
+                      name="credential_id"
+                      items={renderSelectItems(scanner_credentials)}
+                      value={credential_id}
+                      onChange={onCredentialChange}
                     />
-                  </Layout>
-                </Divider>
-                {show_cred_info && (
-                  <CertStatus info={scanner.credential.certificate_info} />
-                )}
-              </FormGroup>
+                    <Layout>
+                      <NewIcon
+                        value={type}
+                        title={_('Create a new Credential')}
+                        onClick={onNewCredentialClick}
+                      />
+                    </Layout>
+                  </Divider>
+                  {show_cred_info && (
+                    <CertStatus info={scanner.credential.certificate_info} />
+                  )}
+                </FormGroup>
+              )}
             </Layout>
           );
         }}

gsa/src/web/pages/tasks/dialog.js

@@ -43,6 +43,7 @@ import {
   OSP_SCANNER_TYPE,
   GMP_SCANNER_TYPE,
   OPENVAS_DEFAULT_SCANNER_ID,
+  OSP_SENSOR_SCANNER_TYPE,
 } from 'gmp/models/scanner';
 
 import {
@@ -305,7 +306,9 @@ const TaskDialog = ({
 
         const use_openvas_scan_config =
           state.scanner_type === OPENVAS_SCANNER_TYPE ||
-          state.scanner_type === GMP_SCANNER_TYPE;
+          state.scanner_type === GMP_SCANNER_TYPE ||
+          state.scanner_type === OSP_SENSOR_SCANNER_TYPE;
+
         return (
           <Layout flex="column">
             <FormGroup title={_('Name')}>

gsad/src/gsad_gmp.c

@@ -10084,7 +10084,6 @@ create_scanner_gmp (gvm_connection_t *connection, credentials_t *credentials,
   CHECK_VARIABLE_INVALID (type, "Create Scanner");
   if (params_given (params, "ca_pub"))
     CHECK_VARIABLE_INVALID (ca_pub, "Create Scanner");
-  CHECK_VARIABLE_INVALID (credential_id, "Create Scanner");
 
   if (ca_pub)
     ret = gmpf (connection, credentials, &response, &entity, response_data,
@@ -10102,7 +10101,7 @@ create_scanner_gmp (gvm_connection_t *connection, credentials_t *credentials,
                 "<host>%s</host><port>%s</port><type>%s</type>"
                 "<credential id=\"%s\"/>"
                 "</create_scanner>",
-                name, comment, host, port, type, credential_id);
+                name, comment, host, port, type, credential_id ? credential_id : "");
   switch (ret)
     {
     case 0: