Merge branch 'main' into GEA-978

Author: ozgen

public/locales/gsa-de.json

@@ -618,7 +618,6 @@
   "Do you really want to remove the Dashboard {{name}} and its configuration?": "Möchten Sie das Dashboard {{name}} und seine Einstellungen wirklich löschen?",
   "Documentation": "Dokumentation",
   "Done": "Abgeschlossen",
-  "Download CA Certificate": "CA-Zertifikat herunterladen",
   "Download Certificate": "Zertifikat herunterladen",
   "Download CSV": "CSV-Daten herunterladen",
   "Download Debian (.deb) Package": "Debian-Paket (.deb) herunterladen",
@@ -1356,7 +1355,8 @@
   "Partial": "Partiell",
   "Partition": "Partition",
   "Passive": "Passiv",
-  "Passphrase": "Passphrase",
+  "Passphrase for Private Client Certificate": "Passphrase für privates Client-Zertifikat",
+  "Passphrase for Private SSH Key": "Passphrase für privaten SSH-Schlüssel",
   "Password": "Passwort",
   "Password only": "Nur Passwort",
   "Password: Use existing Password": "Passwort: Verwende bestehendes Passwort",
@@ -1383,6 +1383,7 @@
   "Permissions ({{count}})": "Berechtigungen ({{count}})",
   "Permissions Filter": "Berechtigungen-Filter",
   "Permissions to create a ticket are insufficient. You need the create_permission and get_users permissions.": "Die Berechtigungen ein Ticket zu erstellen sind unzureichend. Sie benötigen die create_permission- und get_users-Berechtigungen.",
+  "Permissions to verify Scanner denied": "Keine Berechtigung, um den Scanner zu verifizieren",
   "PGP Encryption Key": "PGP-Verschlüsselungsschlüssel",
   "Physical": "Physisch",
   "PKCS12 Credential": "PKCS12-Anmeldedaten",
@@ -1427,14 +1428,16 @@
   "Previous completed report of the same task": "Vorheriger abgeschlossener Bericht der selben Aufgabe",
   "Privacy Algorithm": "Privacy-Algorithmus",
   "Privacy Password": "Privacy-Passwort",
-  "Private Key": "Privater Schlüssel",
+  "Private Client Certificate": "Privates Client-Zertifikat",
+  "Private SSH Key": "Privater SSH-Schlüssel",
   "Privileges Required": "Benötigte Berechtigungen",
   "Processing": "Verarbeiten",
   "Product": "Produkt",
   "Product Detection Result": "Ergebnis zur Produkterkennung",
   "Protocol": "Protokoll",
   "Provider Urgency": "Dringlichkeit des Anbieters",
-  "Public Key": "Öffentlicher Schlüssel",
+  "Public Client Certificate": "Öffentliches Client-Zertifikat",
+  "Public PGP Key": "Öffentlicher PGP-Schlüssel",
   "Published": "Veröffentlicht",
   "Published:": "Veröffentlicht:",
   "QoD": "QdE",

public/locales/gsa-en.json

@@ -618,7 +618,6 @@
   "Do you really want to remove the Dashboard {{name}} and its configuration?": "Do you really want to remove the Dashboard {{name}} and its configuration?",
   "Documentation": "Documentation",
   "Done": "Done",
-  "Download CA Certificate": "Download CA Certificate",
   "Download Certificate": "Download Certificate",
   "Download CSV": "Download CSV",
   "Download Debian (.deb) Package": "Download Debian (.deb) Package",
@@ -1356,7 +1355,8 @@
   "Partial": "Partial",
   "Partition": "Partition",
   "Passive": "Passive",
-  "Passphrase": "Passphrase",
+  "Passphrase for Private Client Certificate": "Passphrase for Private Client Certificate",
+  "Passphrase for Private SSH Key": "Passphrase for Private SSH Key",
   "Password": "Password",
   "Password only": "Password only",
   "Password: Use existing Password": "Password: Use existing Password",
@@ -1383,6 +1383,7 @@
   "Permissions ({{count}})": "Permissions ({{count}})",
   "Permissions Filter": "Permissions Filter",
   "Permissions to create a ticket are insufficient. You need the create_permission and get_users permissions.": "Permissions to create a ticket are insufficient. You need the create_permission and get_users permissions.",
+  "Permissions to verify Scanner denied": "Permissions to verify Scanner denied",
   "PGP Encryption Key": "PGP Encryption Key",
   "Physical": "Physical",
   "PKCS12 Credential": "PKCS12 Credential",
@@ -1427,14 +1428,16 @@
   "Previous completed report of the same task": "Previous completed report of the same task",
   "Privacy Algorithm": "Privacy Algorithm",
   "Privacy Password": "Privacy Password",
-  "Private Key": "Private Key",
+  "Private Client Certificate": "Private Client Certificate",
+  "Private SSH Key": "Private SSH Key",
   "Privileges Required": "Privileges Required",
   "Processing": "Processing",
   "Product": "Product",
   "Product Detection Result": "Product Detection Result",
   "Protocol": "Protocol",
   "Provider Urgency": "Provider Urgency",
-  "Public Key": "Public Key",
+  "Public Client Certificate": "Public Client Certificate",
+  "Public PGP Key": "Public PGP Key",
   "Published": "Published",
   "Published:": "Published:",
   "QoD": "QoD",

public/locales/gsa-zh_CN.json

@@ -618,7 +618,6 @@
   "Do you really want to remove the Dashboard {{name}} and its configuration?": "是否要删除仪表盘 {{name}} 及其配置?",
   "Documentation": "",
   "Done": "完成",
-  "Download CA Certificate": "下载CA证书",
   "Download Certificate": "下载证书",
   "Download CSV": "下载CSV",
   "Download Debian (.deb) Package": "下载Debian包(.deb)",
@@ -1356,7 +1355,8 @@
   "Partial": "部分",
   "Partition": "分区",
   "Passive": "",
-  "Passphrase": "口令",
+  "Passphrase for Private Client Certificate": "",
+  "Passphrase for Private SSH Key": "",
   "Password": "密码",
   "Password only": "仅密码",
   "Password: Use existing Password": "密码: 使用现有密码",
@@ -1383,6 +1383,7 @@
   "Permissions ({{count}})": "",
   "Permissions Filter": "权限筛选",
   "Permissions to create a ticket are insufficient. You need the create_permission and get_users permissions.": "创建工单的权限不足.您需要create_permission和get_users权限.",
+  "Permissions to verify Scanner denied": "",
   "PGP Encryption Key": "PGP加密密钥",
   "Physical": "物理",
   "PKCS12 Credential": "PKCS12 证书",
@@ -1427,14 +1428,16 @@
   "Previous completed report of the same task": "同一任务的上一次报告",
   "Privacy Algorithm": "数据加密协议",
   "Privacy Password": "数据加密密码",
-  "Private Key": "私钥",
+  "Private Client Certificate": "",
+  "Private SSH Key": "",
   "Privileges Required": "需要权限",
   "Processing": "",
   "Product": "产品",
   "Product Detection Result": "产品检测结果",
   "Protocol": "协议",
   "Provider Urgency": "",
-  "Public Key": "",
+  "Public Client Certificate": "",
+  "Public PGP Key": "",
   "Published": "发布",
   "Published:": "公布:",
   "QoD": "QoD",

public/locales/gsa-zh_TW.json

@@ -618,7 +618,6 @@
   "Do you really want to remove the Dashboard {{name}} and its configuration?": "",
   "Documentation": "",
   "Done": "",
-  "Download CA Certificate": "下載 CA 憑證",
   "Download Certificate": "下載憑證",
   "Download CSV": "下載 CSV",
   "Download Debian (.deb) Package": "",
@@ -1356,7 +1355,8 @@
   "Partial": "",
   "Partition": "",
   "Passive": "",
-  "Passphrase": "",
+  "Passphrase for Private Client Certificate": "",
+  "Passphrase for Private SSH Key": "",
   "Password": "密碼",
   "Password only": "",
   "Password: Use existing Password": "",
@@ -1383,6 +1383,7 @@
   "Permissions ({{count}})": "",
   "Permissions Filter": "",
   "Permissions to create a ticket are insufficient. You need the create_permission and get_users permissions.": "",
+  "Permissions to verify Scanner denied": "",
   "PGP Encryption Key": "",
   "Physical": "",
   "PKCS12 Credential": "PKCS12 憑證",
@@ -1427,14 +1428,16 @@
   "Previous completed report of the same task": "",
   "Privacy Algorithm": "",
   "Privacy Password": "",
-  "Private Key": "私鑰",
+  "Private Client Certificate": "",
+  "Private SSH Key": "",
   "Privileges Required": "",
   "Processing": "",
   "Product": "產品",
   "Product Detection Result": "",
   "Protocol": "通訊協定",
   "Provider Urgency": "",
-  "Public Key": "",
+  "Public Client Certificate": "",
+  "Public PGP Key": "",
   "Published": "發佈日期",
   "Published:": "發佈日期：",
   "QoD": "",

src/gmp/commands/scanner.ts

@@ -95,7 +95,7 @@ class ScannerCommand extends EntityCommand<Scanner, ScannerElement> {
   }
 
   verify({id}: ScannerCommandVerifyParams) {
-    return this.httpPost({
+    return this.action({
       cmd: 'verify_scanner',
       id,
     });

src/gmp/models/credential.ts

@@ -10,7 +10,7 @@ import {parseYesNo, NO_VALUE, parseDate, YesNo} from 'gmp/parser';
 import {map} from 'gmp/utils/array';
 import {isDefined} from 'gmp/utils/identity';
 
-type CredentialType =
+export type CredentialType =
   | typeof CERTIFICATE_CREDENTIAL_TYPE
   | typeof KRB5_CREDENTIAL_TYPE
   | typeof PASSWORD_ONLY_CREDENTIAL_TYPE
@@ -20,12 +20,21 @@ type CredentialType =
   | typeof USERNAME_PASSWORD_CREDENTIAL_TYPE
   | typeof USERNAME_SSH_KEY_CREDENTIAL_TYPE;
 
-type TimeStatus =
+export type CertificateStatus =
   | typeof CERTIFICATE_STATUS_EXPIRED
   | typeof CERTIFICATE_STATUS_INACTIVE
   | typeof CERTIFICATE_STATUS_VALID
   | typeof CERTIFICATE_STATUS_UNKNOWN;
 
+export type SNMPAuthAlgorithmType =
+  | typeof SNMP_AUTH_ALGORITHM_MD5
+  | typeof SNMP_AUTH_ALGORITHM_SHA1;
+
+export type SNMPPrivacyAlgorithmType =
+  | typeof SNMP_PRIVACY_ALGORITHM_NONE
+  | typeof SNMP_PRIVACY_ALGORITHM_AES
+  | typeof SNMP_PRIVACY_ALGORITHM_DES;
+
 interface CredentialElement extends ModelElement {
   certificate_info?: {
     activation_time?: string;
@@ -55,7 +64,7 @@ interface CredentialElement extends ModelElement {
 export interface CertificateInfo {
   activationTime?: Date;
   expirationTime?: Date;
-  timeStatus?: TimeStatus;
+  timeStatus?: CertificateStatus;
   issuer?: string;
   subject?: string;
   serial?: string;
@@ -83,62 +92,75 @@ export const PASSWORD_ONLY_CREDENTIAL_TYPE = 'pw';
 export const CERTIFICATE_CREDENTIAL_TYPE = 'cc';
 export const KRB5_CREDENTIAL_TYPE = 'krb5';
 
-export const SSH_CREDENTIAL_TYPES = [
+export const SSH_CREDENTIAL_TYPES: readonly CredentialType[] = [
   USERNAME_PASSWORD_CREDENTIAL_TYPE,
   USERNAME_SSH_KEY_CREDENTIAL_TYPE,
 ];
 
-export const SSH_ELEVATE_CREDENTIAL_TYPES = [USERNAME_PASSWORD_CREDENTIAL_TYPE];
+export const SSH_ELEVATE_CREDENTIAL_TYPES: readonly CredentialType[] = [
+  USERNAME_PASSWORD_CREDENTIAL_TYPE,
+];
 
-export const SMB_CREDENTIAL_TYPES = [USERNAME_PASSWORD_CREDENTIAL_TYPE];
+export const SMB_CREDENTIAL_TYPES: readonly CredentialType[] = [
+  USERNAME_PASSWORD_CREDENTIAL_TYPE,
+];
 
-export const ESXI_CREDENTIAL_TYPES = [USERNAME_PASSWORD_CREDENTIAL_TYPE];
+export const ESXI_CREDENTIAL_TYPES: readonly CredentialType[] = [
+  USERNAME_PASSWORD_CREDENTIAL_TYPE,
+];
 
-export const SNMP_CREDENTIAL_TYPES = [SNMP_CREDENTIAL_TYPE];
+export const SNMP_CREDENTIAL_TYPES: readonly CredentialType[] = [
+  SNMP_CREDENTIAL_TYPE,
+];
 
-export const KRB5_CREDENTIAL_TYPES = [KRB5_CREDENTIAL_TYPE];
+export const KRB5_CREDENTIAL_TYPES: readonly CredentialType[] = [
+  KRB5_CREDENTIAL_TYPE,
+];
 
-export const EMAIL_CREDENTIAL_TYPES = [
+export const EMAIL_CREDENTIAL_TYPES: readonly CredentialType[] = [
   SMIME_CREDENTIAL_TYPE,
   PGP_CREDENTIAL_TYPE,
 ];
 
-export const VFIRE_CREDENTIAL_TYPES = [USERNAME_PASSWORD_CREDENTIAL_TYPE];
+export const VFIRE_CREDENTIAL_TYPES: readonly CredentialType[] = [
+  USERNAME_PASSWORD_CREDENTIAL_TYPE,
+];
 
-export const ALL_CREDENTIAL_TYPES = [
+export const ALL_CREDENTIAL_TYPES: readonly CredentialType[] = [
   USERNAME_PASSWORD_CREDENTIAL_TYPE,
   USERNAME_SSH_KEY_CREDENTIAL_TYPE,
   SNMP_CREDENTIAL_TYPE,
   SMIME_CREDENTIAL_TYPE,
   PGP_CREDENTIAL_TYPE,
   PASSWORD_ONLY_CREDENTIAL_TYPE,
+  CERTIFICATE_CREDENTIAL_TYPE,
   KRB5_CREDENTIAL_TYPE,
-] as const;
+];
 
-export const ssh_credential_filter = credential =>
+export const ssh_credential_filter = (credential: Credential) =>
   credential.credential_type === USERNAME_SSH_KEY_CREDENTIAL_TYPE ||
   credential.credential_type === USERNAME_PASSWORD_CREDENTIAL_TYPE;
 
-export const smb_credential_filter = credential =>
+export const smb_credential_filter = (credential: Credential) =>
   credential.credential_type === USERNAME_PASSWORD_CREDENTIAL_TYPE;
 
-export const esxi_credential_filter = credential =>
+export const esxi_credential_filter = (credential: Credential) =>
   credential.credential_type === USERNAME_PASSWORD_CREDENTIAL_TYPE;
 
-export const snmp_credential_filter = credential =>
+export const snmp_credential_filter = (credential: Credential) =>
   credential.credential_type === SNMP_CREDENTIAL_TYPE;
 
-export const krb5CredentialFilter = credential =>
+export const krb5CredentialFilter = (credential: Credential) =>
   credential.credential_type === KRB5_CREDENTIAL_TYPE;
 
-export const email_credential_filter = credential =>
+export const email_credential_filter = (credential: Credential) =>
   credential.credential_type === SMIME_CREDENTIAL_TYPE ||
   credential.credential_type === PGP_CREDENTIAL_TYPE;
 
-export const password_only_credential_filter = credential =>
+export const password_only_credential_filter = (credential: Credential) =>
   credential.credential_type === PASSWORD_ONLY_CREDENTIAL_TYPE;
 
-export const vFire_credential_filter = credential =>
+export const vFire_credential_filter = (credential: Credential) =>
   credential.credential_type === USERNAME_PASSWORD_CREDENTIAL_TYPE;
 
 export const SNMP_AUTH_ALGORITHM_MD5 = 'md5';
@@ -169,7 +191,7 @@ export const getCredentialTypeName = (type: CredentialType) =>
 
 const parseTimeStatus = (
   status: string | undefined,
-): TimeStatus | undefined => {
+): CertificateStatus | undefined => {
   if (!isDefined(status)) {
     return undefined;
   }

src/web/Routes.tsx

@@ -77,8 +77,8 @@ import RoleDetailsPage from 'web/pages/roles/RoleDetailsPage';
 import RoleListPage from 'web/pages/roles/RoleListPage';
 import ScanConfigDetailsPage from 'web/pages/scanconfigs/DetailsPage';
 import ScanConfigsPage from 'web/pages/scanconfigs/ListPage';
-import ScannerDetailsPage from 'web/pages/scanners/DetailsPage';
-import ScannersPage from 'web/pages/scanners/ListPage';
+import ScannerDetailsPage from 'web/pages/scanners/ScannerDetailsPage';
+import ScannersPage from 'web/pages/scanners/ScannerListPage';
 import ScheduleDetailsPage from 'web/pages/schedules/DetailsPage';
 import SchedulesPage from 'web/pages/schedules/ListPage';
 import StartPage from 'web/pages/start/StartPage';

src/web/entity/hooks/useEntityDelete.ts

@@ -45,9 +45,9 @@ const useEntityDelete = <
     dispatch(createDeleteEntity({entityType: name})(gmp)(entity.id as string));
 
   const handleEntityDelete = async (entity: TEntity) => {
-    return actionFunction<void>(
+    return actionFunction<void, TDeleteError, void>(
       // @ts-expect-error
-      deleteEntity(entity),
+      deleteEntity(entity).then(() => {}),
       {
         onSuccess: onDeleted,
         onError: onDeleteError,

src/web/pages/alerts/AlertComponent.jsx

@@ -42,7 +42,7 @@ import AlertDialog, {
   SECINFO_SUBJECT,
   TASK_SUBJECT,
 } from 'web/pages/alerts/Dialog';
-import CredentialsDialog from 'web/pages/credentials/Dialog';
+import CredentialDialog from 'web/pages/credentials/CredentialDialog';
 import {
   loadReportComposerDefaults,
   saveReportComposerDefaults,
@@ -1174,7 +1174,7 @@ const AlertComponent = ({
             />
           )}
           {credentialDialogVisible && (
-            <CredentialsDialog
+            <CredentialDialog
               error={credentialError}
               title={credentialDialogTitle}
               types={credentialTypes}