Merge remote-tracking branch 'origin/main' into ri-explain-plugin

Author: GnaneshKunal

configs/webpack.config.renderer.dev.babel.js

@@ -223,7 +223,7 @@ export default merge(baseConfig, {
 
     new ReactRefreshWebpackPlugin(),
 
-    new MonacoWebpackPlugin({ languages: [], features: ['!rename'] }),
+    new MonacoWebpackPlugin({ languages: ['json'], features: ['!rename'] }),
   ],
 
   node: {

configs/webpack.config.renderer.prod.babel.js

@@ -187,7 +187,7 @@ export default merge(baseConfig, {
   },
 
   plugins: [
-    new MonacoWebpackPlugin({ languages: [], features: ['!rename'] }),
+    new MonacoWebpackPlugin({ languages: ['json'], features: ['!rename'] }),
 
     new webpack.EnvironmentPlugin({
       NODE_ENV: 'production',

configs/webpack.config.web.common.babel.js

@@ -71,7 +71,7 @@ export default {
   plugins: [
     new HtmlWebpackPlugin({ template: 'index.html.ejs' }),
 
-    new MonacoWebpackPlugin({ languages: [], features: ['!rename'] }),
+    new MonacoWebpackPlugin({ languages: ['json'], features: ['!rename'] }),
 
     new webpack.IgnorePlugin({
       checkResource(resource) {

package.json

@@ -126,7 +126,6 @@
     "@types/node": "14.14.10",
     "@types/react": "^18.0.20",
     "@types/react-dom": "^18.0.5",
-    "@types/react-monaco-editor": "^0.16.0",
     "@types/react-redux": "^7.1.12",
     "@types/react-router-dom": "^5.1.6",
     "@types/react-virtualized": "^9.21.10",
@@ -243,7 +242,7 @@
     "react-hotkeys-hook": "^3.3.1",
     "react-json-pretty": "^2.2.0",
     "react-jsx-parser": "^1.28.4",
-    "react-monaco-editor": "^0.44.0",
+    "react-monaco-editor": "^0.45.0",
     "react-redux": "^7.2.2",
     "react-rnd": "^10.3.5",
     "react-router-dom": "^5.2.0",

redisinsight/__mocks__/monacoMock.js

@@ -15,7 +15,8 @@ export default function MonacoEditor(props) {
         createContextKey: jest.fn(),
         focus: jest.fn(),
         onDidChangeCursorPosition: jest.fn(),
-        executeEdits: jest.fn()
+        executeEdits: jest.fn(),
+        updateOptions: jest.fn()
       },
       // monaco
       {
@@ -31,12 +32,21 @@ export default function MonacoEditor(props) {
           }),
           setLanguageConfiguration: jest.fn(),
           setMonarchTokensProvider: jest.fn(),
+          json: {
+            jsonDefaults:{
+              setDiagnosticsOptions: jest.fn()
+            }
+          }
         },
         KeyMod: {},
         KeyCode: {}
       })
   }, [])
-  return <input {...props} data-testid="monaco"/>;
+  return <textarea
+    {...props}
+    onChange={(e) => props.onChange && props.onChange(e.target.value)}
+    data-testid={props['data-testid'] ? props['data-testid'] : 'monaco'}
+  />;
 }
 
 export const languages = {

redisinsight/api/migration/1673934231410-workbench_and_analysis_db.ts

@@ -0,0 +1,40 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class workbenchAndAnalysisDbIndex1673934231410 implements MigrationInterface {
+    name = 'workbenchAndAnalysisDbIndex1673934231410'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`DROP INDEX "IDX_5cd90dd6def1fd7c521e53fb2c"`);
+        await queryRunner.query(`CREATE TABLE "temporary_command_execution" ("id" varchar PRIMARY KEY NOT NULL, "databaseId" varchar NOT NULL, "command" text NOT NULL, "result" text NOT NULL, "role" varchar, "nodeOptions" varchar, "encryption" varchar, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "mode" varchar, "resultsMode" varchar, "summary" varchar, "executionTime" integer, "db" integer, CONSTRAINT "FK_ea8adfe9aceceb79212142206b8" FOREIGN KEY ("databaseId") REFERENCES "database_instance" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
+        await queryRunner.query(`INSERT INTO "temporary_command_execution"("id", "databaseId", "command", "result", "role", "nodeOptions", "encryption", "createdAt", "mode", "resultsMode", "summary", "executionTime") SELECT "id", "databaseId", "command", "result", "role", "nodeOptions", "encryption", "createdAt", "mode", "resultsMode", "summary", "executionTime" FROM "command_execution"`);
+        await queryRunner.query(`DROP TABLE "command_execution"`);
+        await queryRunner.query(`ALTER TABLE "temporary_command_execution" RENAME TO "command_execution"`);
+        await queryRunner.query(`CREATE INDEX "IDX_5cd90dd6def1fd7c521e53fb2c" ON "command_execution" ("createdAt") `);
+        await queryRunner.query(`DROP INDEX "IDX_d174a8edc2201d6c5781f0126a"`);
+        await queryRunner.query(`DROP INDEX "IDX_fdd0daeb4d8f226cf1ff79bebb"`);
+        await queryRunner.query(`CREATE TABLE "temporary_database_analysis" ("id" varchar PRIMARY KEY NOT NULL, "databaseId" varchar NOT NULL, "filter" blob, "delimiter" varchar NOT NULL, "progress" blob, "totalKeys" blob, "totalMemory" blob, "topKeysNsp" blob, "topMemoryNsp" blob, "topKeysLength" blob, "topKeysMemory" blob, "encryption" varchar, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "expirationGroups" blob, "db" integer, CONSTRAINT "FK_d174a8edc2201d6c5781f0126ae" FOREIGN KEY ("databaseId") REFERENCES "database_instance" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
+        await queryRunner.query(`INSERT INTO "temporary_database_analysis"("id", "databaseId", "filter", "delimiter", "progress", "totalKeys", "totalMemory", "topKeysNsp", "topMemoryNsp", "topKeysLength", "topKeysMemory", "encryption", "createdAt", "expirationGroups") SELECT "id", "databaseId", "filter", "delimiter", "progress", "totalKeys", "totalMemory", "topKeysNsp", "topMemoryNsp", "topKeysLength", "topKeysMemory", "encryption", "createdAt", "expirationGroups" FROM "database_analysis"`);
+        await queryRunner.query(`DROP TABLE "database_analysis"`);
+        await queryRunner.query(`ALTER TABLE "temporary_database_analysis" RENAME TO "database_analysis"`);
+        await queryRunner.query(`CREATE INDEX "IDX_d174a8edc2201d6c5781f0126a" ON "database_analysis" ("databaseId") `);
+        await queryRunner.query(`CREATE INDEX "IDX_fdd0daeb4d8f226cf1ff79bebb" ON "database_analysis" ("createdAt") `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`DROP INDEX "IDX_fdd0daeb4d8f226cf1ff79bebb"`);
+        await queryRunner.query(`DROP INDEX "IDX_d174a8edc2201d6c5781f0126a"`);
+        await queryRunner.query(`ALTER TABLE "database_analysis" RENAME TO "temporary_database_analysis"`);
+        await queryRunner.query(`CREATE TABLE "database_analysis" ("id" varchar PRIMARY KEY NOT NULL, "databaseId" varchar NOT NULL, "filter" blob, "delimiter" varchar NOT NULL, "progress" blob, "totalKeys" blob, "totalMemory" blob, "topKeysNsp" blob, "topMemoryNsp" blob, "topKeysLength" blob, "topKeysMemory" blob, "encryption" varchar, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "expirationGroups" blob, CONSTRAINT "FK_d174a8edc2201d6c5781f0126ae" FOREIGN KEY ("databaseId") REFERENCES "database_instance" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
+        await queryRunner.query(`INSERT INTO "database_analysis"("id", "databaseId", "filter", "delimiter", "progress", "totalKeys", "totalMemory", "topKeysNsp", "topMemoryNsp", "topKeysLength", "topKeysMemory", "encryption", "createdAt", "expirationGroups") SELECT "id", "databaseId", "filter", "delimiter", "progress", "totalKeys", "totalMemory", "topKeysNsp", "topMemoryNsp", "topKeysLength", "topKeysMemory", "encryption", "createdAt", "expirationGroups" FROM "temporary_database_analysis"`);
+        await queryRunner.query(`DROP TABLE "temporary_database_analysis"`);
+        await queryRunner.query(`CREATE INDEX "IDX_fdd0daeb4d8f226cf1ff79bebb" ON "database_analysis" ("createdAt") `);
+        await queryRunner.query(`CREATE INDEX "IDX_d174a8edc2201d6c5781f0126a" ON "database_analysis" ("databaseId") `);
+        await queryRunner.query(`DROP INDEX "IDX_5cd90dd6def1fd7c521e53fb2c"`);
+        await queryRunner.query(`ALTER TABLE "command_execution" RENAME TO "temporary_command_execution"`);
+        await queryRunner.query(`CREATE TABLE "command_execution" ("id" varchar PRIMARY KEY NOT NULL, "databaseId" varchar NOT NULL, "command" text NOT NULL, "result" text NOT NULL, "role" varchar, "nodeOptions" varchar, "encryption" varchar, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "mode" varchar, "resultsMode" varchar, "summary" varchar, "executionTime" integer, CONSTRAINT "FK_ea8adfe9aceceb79212142206b8" FOREIGN KEY ("databaseId") REFERENCES "database_instance" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
+        await queryRunner.query(`INSERT INTO "command_execution"("id", "databaseId", "command", "result", "role", "nodeOptions", "encryption", "createdAt", "mode", "resultsMode", "summary", "executionTime") SELECT "id", "databaseId", "command", "result", "role", "nodeOptions", "encryption", "createdAt", "mode", "resultsMode", "summary", "executionTime" FROM "temporary_command_execution"`);
+        await queryRunner.query(`DROP TABLE "temporary_command_execution"`);
+        await queryRunner.query(`CREATE INDEX "IDX_5cd90dd6def1fd7c521e53fb2c" ON "command_execution" ("createdAt") `);
+    }
+
+}

redisinsight/api/migration/index.ts

@@ -23,6 +23,7 @@ import { workbenchExecutionTime1667368983699 } from './1667368983699-workbench-e
 import { database1667477693934 } from './1667477693934-database';
 import { databaseNew1670252337342 } from './1670252337342-database-new';
 import { sshOptions1673035852335 } from './1673035852335-ssh-options';
+import { workbenchAndAnalysisDbIndex1673934231410 } from './1673934231410-workbench_and_analysis_db';
 
 export default [
   initialMigration1614164490968,
@@ -50,4 +51,5 @@ export default [
   database1667477693934,
   databaseNew1670252337342,
   sshOptions1673035852335,
+  workbenchAndAnalysisDbIndex1673934231410,
 ];

redisinsight/api/src/__mocks__/database-import.ts

@@ -6,6 +6,7 @@ import { mockCaCertificate, mockClientCertificate } from 'src/__mocks__/certific
 import {
   InvalidCaCertificateBodyException, InvalidCertificateNameException,
 } from 'src/modules/database-import/exceptions';
+import { mockSshOptionsPrivateKey } from 'src/__mocks__/ssh';
 
 export const mockDatabasesToImportArray = new Array(10).fill(mockSentinelDatabaseWithTlsAuth);
 
@@ -87,3 +88,10 @@ export const mockCertificateImportService = jest.fn(() => ({
   processCaCertificate: jest.fn().mockResolvedValue(mockCaCertificate),
   processClientCertificate: jest.fn().mockResolvedValue(mockClientCertificate),
 }));
+
+export const mockSshImportService = jest.fn(() => ({
+  processSshOptions: jest.fn().mockResolvedValue({
+    ...mockSshOptionsPrivateKey,
+    id: undefined,
+  }),
+}));

redisinsight/api/src/common/utils/certificate-import.util.ts

@@ -3,5 +3,6 @@ import { readFileSync } from 'fs';
 
 export const isValidPemCertificate = (cert: string): boolean => cert.startsWith('-----BEGIN CERTIFICATE-----');
 export const isValidPemPrivateKey = (cert: string): boolean => cert.startsWith('-----BEGIN PRIVATE KEY-----');
+export const isValidSshPrivateKey = (cert: string): boolean => cert.startsWith('-----BEGIN OPENSSH PRIVATE KEY-----');
 export const getPemBodyFromFileSync = (path: string): string => readFileSync(path).toString('utf8');
 export const getCertNameFromFilename = (path: string): string => parse(path).name;

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

@@ -18,6 +18,9 @@ export default {
 
   CA_CERT_EXIST: 'This ca certificate name is already in use.',
   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',