Merge pull request #1619 from RedisInsight/bugfix/RI-4064-4059-4062-4063_import_database

Bugfix/ri 4064 4059 4062 4063 import database

Author: vlad-dargel

redisinsight/api/src/constants/error-messages.ts

@@ -20,6 +20,7 @@ export default {
   INVALID_CA_BODY: 'Invalid CA body',
   INVALID_SSH_PRIVATE_KEY_BODY: 'Invalid SSH private key body',
   SSH_AGENTS_ARE_NOT_SUPPORTED: 'SSH Agents are not supported',
+  INVALID_SSH_BODY: 'Invalid SSH body',
   INVALID_CERTIFICATE_BODY: 'Invalid certificate body',
   INVALID_PRIVATE_KEY: 'Invalid private key',
   CERTIFICATE_NAME_IS_NOT_DEFINED: 'Certificate name is not defined',

redisinsight/api/src/modules/database-import/exceptions/index.ts

@@ -2,6 +2,7 @@ export * from './invalid-ca-certificate-body.exception';
 export * from './invalid-client-certificate-body.exception';
 export * from './invalid-client-private-key.exception';
 export * from './invalid-certificate-name.exception';
+export * from './invalid-ssh-body.exception';
 export * from './invalid-ssh-private-key-body.exception';
 export * from './size-limit-exceeded-database-import-file.exception';
 export * from './no-database-import-file-provided.exception';

redisinsight/api/src/modules/database-import/exceptions/invalid-ssh-body.exception.ts

@@ -0,0 +1,14 @@
+import { HttpException } from '@nestjs/common';
+import ERROR_MESSAGES from 'src/constants/error-messages';
+
+export class InvalidSshBodyException extends HttpException {
+  constructor(message: string = ERROR_MESSAGES.INVALID_SSH_BODY) {
+    const response = {
+      message,
+      statusCode: 400,
+      error: 'Invalid SSH body',
+    };
+
+    super(response, 400);
+  }
+}

redisinsight/api/src/modules/database-import/ssh-import.service.spec.ts

@@ -7,6 +7,7 @@ import { Test, TestingModule } from '@nestjs/testing';
 import { SshImportService } from 'src/modules/database-import/ssh-import.service';
 import {
   InvalidSshPrivateKeyBodyException,
+  InvalidSshBodyException,
   SshAgentsAreNotSupportedException,
 } from 'src/modules/database-import/exceptions';
 
@@ -105,11 +106,34 @@ describe('SshImportService', () => {
     it('should throw an error when ssh agent provided', async () => {
       try {
         await service.processSshOptions({
+          ...mockSshImportDataPK,
           sshAgentPath: '/agent/path',
         });
       } catch (e) {
         expect(e).toBeInstanceOf(SshAgentsAreNotSupportedException);
       }
     });
   });
+
+  it('should throw an error when no username defined', async () => {
+    try {
+      await service.processSshOptions({
+        ...mockSshImportDataPK,
+        sshUsername: undefined,
+      });
+    } catch (e) {
+      expect(e).toBeInstanceOf(InvalidSshBodyException);
+    }
+  });
+
+  it('should throw an error when no port defined', async () => {
+    try {
+      await service.processSshOptions({
+        ...mockSshImportDataPK,
+        sshPassword: undefined,
+      });
+    } catch (e) {
+      expect(e).toBeInstanceOf(InvalidSshBodyException);
+    }
+  });
 });

redisinsight/api/src/modules/database-import/ssh-import.service.ts

@@ -1,10 +1,11 @@
 import { Injectable } from '@nestjs/common';
+import { isUndefined } from 'lodash';
 import {
   getPemBodyFromFileSync,
   isValidSshPrivateKey,
 } from 'src/common/utils';
 import {
-  InvalidSshPrivateKeyBodyException, SshAgentsAreNotSupportedException
+  InvalidSshPrivateKeyBodyException, InvalidSshBodyException, SshAgentsAreNotSupportedException,
 } from 'src/modules/database-import/exceptions';
 import { SshOptions } from 'src/modules/ssh/models/ssh-options';
 
@@ -17,12 +18,17 @@ export class SshImportService {
   async processSshOptions(data: any): Promise<Partial<SshOptions>> {
     let sshOptions: Partial<SshOptions> = {
       host: data.sshHost,
-      port: parseInt(data.sshPort, 10),
-      username: data.sshUsername,
     };
 
+    if (isUndefined(data.sshPort) || isUndefined(data.sshUsername)) {
+      throw new InvalidSshBodyException();
+    } else {
+      sshOptions.port = parseInt(data.sshPort, 10);
+      sshOptions.username = data.sshUsername;
+    }
+
     if (data.sshPrivateKey) {
-      sshOptions.passphrase = data.sshPassphrase || data.sshPassword;
+      sshOptions.passphrase = data.sshPassphrase || data.sshPassword || null;
 
       if (isValidSshPrivateKey(data.sshPrivateKey)) {
         sshOptions.privateKey = data.sshPrivateKey;
@@ -35,7 +41,7 @@ export class SshImportService {
         }
       }
     } else {
-      sshOptions.password = data.sshPassword;
+      sshOptions.password = data.sshPassword || null;
     }
 
     if (!sshOptions || (sshOptions?.privateKey && !isValidSshPrivateKey(sshOptions.privateKey))) {

redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceFormWrapper.tsx

@@ -66,7 +66,7 @@ const getInitialValues = (editedInstance: Nullable<Instance>) => ({
   tls: !!editedInstance?.tls ?? false,
   ssh: !!editedInstance?.ssh ?? false,
   sshPassType: editedInstance?.sshOptions
-    ? (editedInstance.sshOptions.password ? SshPassType.Password : SshPassType.PrivateKey)
+    ? (editedInstance.sshOptions.privateKey ? SshPassType.PrivateKey : SshPassType.Password)
     : SshPassType.Password
 })