Merge pull request #2202 from RedisInsight/be/feature/RI-4454_Restrict_loopback

#RI-4454 - Restrict loopback

Author: egor-zalenski

configs/webpack.config.renderer.prod.ts

@@ -23,8 +23,6 @@ const devtoolsConfig =
 const configuration: webpack.Configuration = {
   ...devtoolsConfig,
 
-  devtool: 'source-map',
-
   mode: 'production',
 
   target: ['web', 'electron-renderer'],

configs/webpack.config.renderer.stage.ts

@@ -10,6 +10,8 @@ DeleteSourceMaps();
 export default merge(baseConfig, {
   ...rendererProdConfig,
 
+  devtool: 'source-map',
+
   plugins: [
     ...rendererProdConfig.plugins,
 

redisinsight/api/package.json

@@ -21,7 +21,7 @@
     "format": "prettier --write \"src/**/*.ts\"",
     "lint": "eslint --ext .ts .",
     "start": "nest start",
-    "start:dev": "cross-env NODE_ENV=development SERVER_STATIC_CONTENT=1 nest start --watch",
+    "start:dev": "cross-env NODE_ENV=development BUILD_TYPE=DOCKER_ON_PREMISE SERVER_STATIC_CONTENT=1 nest start --watch",
     "start:debug": "nest start --debug --watch",
     "start:stage": "cross-env NODE_ENV=staging SERVER_STATIC_CONTENT=true node dist/src/main",
     "start:prod": "cross-env NODE_ENV=production node dist/src/main",
@@ -32,8 +32,8 @@
     "test:e2e": "jest --config ./test/jest-e2e.json -w 1",
     "typeorm": "ts-node -r tsconfig-paths/register ./node_modules/typeorm/cli.js -d ./config/ormconfig.ts",
     "test:api": "cross-env NODE_ENV=test ts-mocha --paths -p test/api/api.tsconfig.json --config ./test/api/.mocharc.yml",
-    "test:api:cov": "nyc --reporter=html --reporter=text --reporter=text-summary yarn run test:api",
-    "test:api:ci:cov": "nyc -r text -r text-summary -r html yarn run test:api --reporter mocha-multi-reporters --reporter-options configFile=test/api/reporters.json && nyc merge .nyc_output ./coverage/test-run-coverage.json",
+    "test:api:cov": "cross-env BUILD_TYPE=DOCKER_ON_PREMISE nyc --reporter=html --reporter=text --reporter=text-summary yarn run test:api",
+    "test:api:ci:cov": "cross-env BUILD_TYPE=DOCKER_ON_PREMISE nyc -r text -r text-summary -r html yarn run test:api --reporter mocha-multi-reporters --reporter-options configFile=test/api/reporters.json && nyc merge .nyc_output ./coverage/test-run-coverage.json",
     "typeorm:migrate": "cross-env NODE_ENV=staging yarn typeorm migration:generate ./migration/migration",
     "typeorm:run": "yarn typeorm migration:run"
   },

redisinsight/api/src/common/constants/api.ts

@@ -1,3 +1,4 @@
 export const API_PARAM_DATABASE_ID = 'dbInstance';
 export const API_HEADER_DATABASE_INDEX = 'ri-db-index';
+export const API_HEADER_WINDOW_ID = 'x-window-id';
 export const API_PARAM_CLI_CLIENT_ID = 'uuid';

redisinsight/api/src/constants/custom-error-codes.ts

@@ -0,0 +1,3 @@
+export enum CustomErrorCodes {
+  WindowUnauthorized = 10_001,
+}

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

@@ -64,4 +64,6 @@ export default {
   APP_SETTINGS_NOT_FOUND: () => 'Could not find application settings.',
   SERVER_INFO_NOT_FOUND: () => 'Could not find server info.',
   INCREASE_MINIMUM_LIMIT: (count: string) => `Set MAXSEARCHRESULTS to at least ${count}.`,
+  INVALID_WINDOW_ID: 'Invalid window id.',
+  UNDEFINED_WINDOW_ID: 'Undefined window id.',
 };

redisinsight/api/src/constants/index.ts

@@ -10,3 +10,4 @@ export * from './telemetry-events';
 export * from './app-events';
 export * from './redis-connection';
 export * from './recommendations';
+export * from './custom-error-codes';

redisinsight/api/src/core.module.ts

@@ -10,6 +10,7 @@ import { AnalyticsModule } from 'src/modules/analytics/analytics.module';
 import { SshModule } from 'src/modules/ssh/ssh.module';
 import { NestjsFormDataModule } from 'nestjs-form-data';
 import { FeatureModule } from 'src/modules/feature/feature.module';
+import { AuthModule } from 'src/modules/auth/auth.module';
 
 @Global()
 @Module({
@@ -25,6 +26,7 @@ import { FeatureModule } from 'src/modules/feature/feature.module';
     SshModule,
     NestjsFormDataModule,
     FeatureModule.register(),
+    AuthModule.register(),
   ],
   exports: [
     EncryptionModule,

redisinsight/api/src/main.ts

@@ -1,7 +1,7 @@
 import 'dotenv/config';
 import { NestFactory } from '@nestjs/core';
 import { SwaggerModule } from '@nestjs/swagger';
-import { NestApplicationOptions } from '@nestjs/common';
+import { INestApplication, NestApplicationOptions } from '@nestjs/common';
 import * as bodyParser from 'body-parser';
 import { WinstonModule } from 'nest-winston';
 import { GlobalExceptionFilter } from 'src/exceptions/global-exception.filter';
@@ -14,7 +14,12 @@ import LOGGER_CONFIG from '../config/logger';
 
 const serverConfig = get('server');
 
-export default async function bootstrap(): Promise<Function> {
+interface IApp {
+  app: INestApplication
+  gracefulShutdown: Function
+}
+
+export default async function bootstrap(): Promise<IApp> {
   await migrateHomeFolder();
 
   const port = process.env.API_PORT || serverConfig.port;
@@ -67,7 +72,7 @@ export default async function bootstrap(): Promise<Function> {
   process.on('SIGTERM', gracefulShutdown);
   process.on('SIGINT', gracefulShutdown);
 
-  return gracefulShutdown;
+  return { app, gracefulShutdown };
 }
 
 if (process.env.APP_ENV !== 'electron') {

redisinsight/api/src/modules/auth/auth.module.ts

@@ -0,0 +1,22 @@
+import { Module } from '@nestjs/common';
+import config from 'src/utils/config';
+import { WindowAuthModule } from './window-auth/window-auth.module';
+import { BuildType } from '../server/models/server';
+
+const SERVER_CONFIG = config.get('server');
+
+@Module({})
+export class AuthModule {
+  static register() {
+    const imports = [];
+
+    if (SERVER_CONFIG.buildType === BuildType.Electron) {
+      imports.push(WindowAuthModule);
+    }
+
+    return {
+      module: AuthModule,
+      imports,
+    };
+  }
+}