Merge branch 'main' into bugfix/e2e

Author: elenaNaboko

package.json

@@ -142,6 +142,7 @@
     "@types/express": "^4.17.3",
     "@types/html-entities": "^1.3.4",
     "@types/ioredis": "^4.26.0",
+    "@types/is-glob": "^4.0.2",
     "@types/jest": "^26.0.15",
     "@types/lodash": "^4.14.171",
     "@types/node": "14.14.10",

redisinsight/api/migration/1650278664000-sni.ts

@@ -0,0 +1,20 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class sni1650278664000 implements MigrationInterface {
+    name = 'sni1650278664000'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`CREATE TABLE "temporary_database_instance" ("id" varchar PRIMARY KEY NOT NULL, "host" varchar NOT NULL, "port" integer NOT NULL, "name" varchar NOT NULL, "username" varchar, "password" varchar, "tls" boolean NOT NULL, "verifyServerCert" boolean NOT NULL, "lastConnection" datetime, "caCertId" varchar, "clientCertId" varchar, "connectionType" varchar NOT NULL DEFAULT ('STANDALONE'), "nodes" varchar, "nameFromProvider" varchar, "sentinelMasterName" varchar, "sentinelMasterUsername" varchar, "sentinelMasterPassword" varchar, "provider" varchar DEFAULT ('UNKNOWN'), "modules" varchar NOT NULL DEFAULT ('[]'), "db" integer, "encryption" varchar, "tlsServername" varchar, CONSTRAINT "FK_3b9b625266c00feb2d66a9f36e4" FOREIGN KEY ("clientCertId") REFERENCES "client_certificate" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_d1bc747b5938e22b4b708d8e9a5" FOREIGN KEY ("caCertId") REFERENCES "ca_certificate" ("id") ON DELETE SET NULL ON UPDATE NO ACTION)`);
+        await queryRunner.query(`INSERT INTO "temporary_database_instance"("id", "host", "port", "name", "username", "password", "tls", "verifyServerCert", "lastConnection", "caCertId", "clientCertId", "connectionType", "nodes", "nameFromProvider", "sentinelMasterName", "sentinelMasterUsername", "sentinelMasterPassword", "provider", "modules", "db", "encryption") SELECT "id", "host", "port", "name", "username", "password", "tls", "verifyServerCert", "lastConnection", "caCertId", "clientCertId", "connectionType", "nodes", "nameFromProvider", "sentinelMasterName", "sentinelMasterUsername", "sentinelMasterPassword", "provider", "modules", "db", "encryption" FROM "database_instance"`);
+        await queryRunner.query(`DROP TABLE "database_instance"`);
+        await queryRunner.query(`ALTER TABLE "temporary_database_instance" RENAME TO "database_instance"`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "database_instance" RENAME TO "temporary_database_instance"`);
+        await queryRunner.query(`CREATE TABLE "database_instance" ("id" varchar PRIMARY KEY NOT NULL, "host" varchar NOT NULL, "port" integer NOT NULL, "name" varchar NOT NULL, "username" varchar, "password" varchar, "tls" boolean NOT NULL, "verifyServerCert" boolean NOT NULL, "lastConnection" datetime, "caCertId" varchar, "clientCertId" varchar, "connectionType" varchar NOT NULL DEFAULT ('STANDALONE'), "nodes" varchar, "nameFromProvider" varchar, "sentinelMasterName" varchar, "sentinelMasterUsername" varchar, "sentinelMasterPassword" varchar, "provider" varchar DEFAULT ('UNKNOWN'), "modules" varchar NOT NULL DEFAULT ('[]'), "db" integer, "encryption" varchar, CONSTRAINT "FK_3b9b625266c00feb2d66a9f36e4" FOREIGN KEY ("clientCertId") REFERENCES "client_certificate" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_d1bc747b5938e22b4b708d8e9a5" FOREIGN KEY ("caCertId") REFERENCES "ca_certificate" ("id") ON DELETE SET NULL ON UPDATE NO ACTION)`);
+        await queryRunner.query(`INSERT INTO "database_instance"("id", "host", "port", "name", "username", "password", "tls", "verifyServerCert", "lastConnection", "caCertId", "clientCertId", "connectionType", "nodes", "nameFromProvider", "sentinelMasterName", "sentinelMasterUsername", "sentinelMasterPassword", "provider", "modules", "db", "encryption") SELECT "id", "host", "port", "name", "username", "password", "tls", "verifyServerCert", "lastConnection", "caCertId", "clientCertId", "connectionType", "nodes", "nameFromProvider", "sentinelMasterName", "sentinelMasterUsername", "sentinelMasterPassword", "provider", "modules", "db", "encryption" FROM "temporary_database_instance"`);
+        await queryRunner.query(`DROP TABLE "temporary_database_instance"`);
+    }
+
+}

redisinsight/api/migration/index.ts

@@ -12,6 +12,7 @@ import { databaseDbIndex1634219846022 } from './1634219846022-database-db-index'
 import { encryption1634557312500 } from './1634557312500-encryption';
 import { commandExecution1641795882696 } from './1641795882696-command-execution';
 import { pluginState1641805606399 } from './1641805606399-plugin-state';
+import { sni1650278664000 } from "./1650278664000-sni";
 
 export default [
   initialMigration1614164490968,
@@ -28,4 +29,5 @@ export default [
   encryption1634557312500,
   commandExecution1641795882696,
   pluginState1641805606399,
+  sni1650278664000,
 ];

redisinsight/api/src/modules/core/models/database-instance.entity.ts

@@ -103,6 +103,13 @@ export class DatabaseInstanceEntity {
   @Column({ nullable: false })
   tls: boolean;
 
+  @ApiPropertyOptional({
+    description: 'SNI servername',
+    type: String,
+  })
+  @Column({ nullable: true })
+  tlsServername?: string;
+
   @ApiProperty({
     description: 'The certificate returned by the server needs to be verified.',
     type: Boolean,

redisinsight/api/src/modules/core/services/redis/redis.service.ts

@@ -295,6 +295,7 @@ export class RedisService {
     config = {
       rejectUnauthorized: tls.verifyServerCert,
       checkServerIdentity: () => undefined,
+      servername: tls.servername || undefined,
     };
     if (tls.caCertId || tls.newCaCert) {
       const caCertConfig = await this.getCaCertConfig(tls);

redisinsight/api/src/modules/instances/dto/database-instance.dto.ts

@@ -139,6 +139,15 @@ export class BasicTlsDto {
   @IsString({ always: true })
   @IsOptional()
   clientCertPairId?: string;
+
+  @ApiPropertyOptional({
+    description: 'SNI servername',
+    type: String,
+  })
+  @Type(() => String)
+  @IsString()
+  @IsOptional()
+  servername?: string;
 }
 
 export class TlsDto extends BasicTlsDto {

redisinsight/api/src/modules/shared/services/instances-business/instances-business.service.ts

@@ -575,6 +575,9 @@ export class InstancesBusinessService {
       ...rest,
     });
     database.tls = !!tls;
+    if (tls?.servername) {
+      database.tlsServername = tls.servername;
+    }
     if (storeCert && database.tls) {
       database.verifyServerCert = tls.verifyServerCert;
       if (tls.newCaCert) {

redisinsight/api/src/modules/shared/utils/database-entity-converter.ts

@@ -5,6 +5,7 @@ export const convertEntityToDto = (database: DatabaseInstanceEntity): DatabaseIn
   if (database) {
     const {
       tls,
+      tlsServername,
       verifyServerCert,
       caCert,
       clientCert,
@@ -31,7 +32,7 @@ export const convertEntityToDto = (database: DatabaseInstanceEntity): DatabaseIn
       };
     }
     if (tls) {
-      result.tls = { verifyServerCert: verifyServerCert || false };
+      result.tls = { verifyServerCert: verifyServerCert || false, servername: tlsServername };
       if (caCert) {
         result.tls.caCertId = caCert.id;
       }

redisinsight/api/test/api/instance/GET-instance.test.ts

@@ -18,6 +18,7 @@ const responseSchema = Joi.array().items(Joi.object().keys({
   lastConnection: Joi.date().allow(null).required(),
   provider: Joi.string().required(),
   tls: Joi.object().keys({
+    servername: Joi.string().allow(null),
     verifyServerCert: Joi.boolean().required(),
     caCertId: Joi.string(),
     clientCertPairId: Joi.string(),

redisinsight/api/test/api/instance/POST-instance.test.ts

@@ -16,6 +16,7 @@ const responseSchema = Joi.object().keys({
   lastConnection: Joi.date().allow(null).required(),
   provider: Joi.string().valid('LOCALHOST', 'UNKNOWN', 'RE_CLOUD', 'RE_CLUSTER').required(),
   tls: Joi.object().keys({
+    servername: Joi.string().allow(null),
     verifyServerCert: Joi.boolean().required(),
     caCertId: Joi.string(),
     clientCertPairId: Joi.string(),