fix structure main

Author: tacxou

package.json

@@ -63,6 +63,8 @@
     "bullmq": "^4.14.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.0",
+    "cookie-parser": "^1.4.6",
+    "helmet": "^7.1.0",
     "ioredis": "^5.3.2",
     "loglevel": "^1.8.1",
     "mongoose": "^8.0.2",
@@ -91,6 +93,7 @@
     "@nestjs/testing": "^10.1.3",
     "@swc/cli": "^0.1.63",
     "@swc/core": "^1.3.99",
+    "@types/cookie-parser": "^1.4.6",
     "@types/express": "^4.17.17",
     "@types/jest": "^29.5.2",
     "@types/node": "^18.0.0",
@@ -112,6 +115,7 @@
     "prettier": "^3.0.0",
     "source-map-support": "^0.5.21",
     "supertest": "^6.3.3",
+    "swagger-themes": "^1.4.2",
     "ts-jest": "^29.1.0",
     "ts-loader": "^9.4.3",
     "ts-node": "^10.9.1",

src/config.ts

@@ -1,5 +1,6 @@
 import { MongooseModuleOptions } from '@nestjs/mongoose';
 import { RedisOptions } from 'ioredis';
+import { HelmetOptions } from 'helmet';
 import { SwaggerCustomOptions } from '@nestjs/swagger';
 import { IAuthModuleOptions } from '@nestjs/passport';
 import { JwtModuleOptions } from '@nestjs/jwt';
@@ -10,6 +11,12 @@ export interface MongoosePlugin {
   options?: Record<string, any>; // eslint-disable-line @typescript-eslint/no-explicit-any
 }
 export interface ConfigInstance {
+  application: {
+    bodyParser: {
+      limit: string
+    }
+  }
+  helmet: HelmetOptions
   mongoose: {
     uri: string;
     options: MongooseModuleOptions;
@@ -36,12 +43,24 @@ export interface ConfigInstance {
 }
 
 export default (): ConfigInstance => ({
-  // redis: {
-  //   host: process.env.REDIS_HOST || 'localhost',
-  //   port: parseInt(process.env.REDIS_PORT) || 6379,
-  //   user: process.env.REDIS_USER || '',
-  //   password: process.env.REDIS_PASSWORD || '',
-  // },
+  application: {
+    bodyParser: {
+      limit: '500mb',
+    },
+  },
+  helmet: {
+    contentSecurityPolicy: {
+      directives: {
+        defaultSrc: ["'self'"],
+        objectSrc: ["'self'"],
+        frameSrc: ["'self'"],
+        styleSrc: ["'self'"],
+        fontSrc: ["'self'"],
+        imgSrc: ["'self'"],
+        scriptSrc: ["'self'"],
+      },
+    },
+  },
   ioredis: {
     uri: process.env['REDIS_URI'] || 'redis://localhost:6379/0',
     options: {
@@ -54,16 +73,7 @@ export default (): ConfigInstance => ({
     options: {
       directConnection: true,
     },
-    plugins: [
-      // {
-      //   package: 'mongoose-delete',
-      //   enabled: true,
-      //   options: {
-      //     overrideMethods: true,
-      //     deletedAt: true,
-      //   },
-      // },
-    ],
+    plugins: [],
   },
   passport: {
     options: {

src/core/backends/backends.controller.spec.ts.old

@@ -1,20 +1,18 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsMongoId, IsNotEmpty, IsString } from 'class-validator';
+import { IsDateString, IsIP, IsMongoId, IsNotEmpty, IsString } from 'class-validator';
 import { CustomFieldsDto } from '~/_common/abstracts/dto/custom-fields.dto';
-import { Prop } from '@nestjs/mongoose';
 
 export class KeyringsCreateDto extends CustomFieldsDto {
   @IsString()
   @IsNotEmpty()
   @ApiProperty()
-  public secretKey: string;
+  public token: string;
 
-  @Prop({
-    type: [String],
-  })
+  @IsString({ each: true })
+  @IsIP(4, { each: true })
   public allowedNetworks?: string[];
 
-  @Prop({ type: Date })
+  @IsDateString()
   public suspendedAt?: Date;
 }
 

src/core/backends/backends.service.spec.ts.old

@@ -7,9 +7,10 @@ export type KeyringsDocument = Keyrings & Document;
 @Schema({ versionKey: false })
 export class Keyrings extends AbstractSchema {
   @Prop({
-    type: Boolean,
+    type: String,
+    unique: true,
   })
-  public secretKey: string;
+  public token: string;
 
   @Prop({
     type: [String],

src/core/keyrings/_dto/keyrings.dto.ts

@@ -4,15 +4,20 @@ import configInstance from './config';
 import { Logger } from '@nestjs/common';
 import { NestExpressApplication } from '@nestjs/platform-express';
 import { utilities as nestWinstonModuleUtilities, WinstonModule } from 'nest-winston';
+import cookieParser from 'cookie-parser';
 import { createLogger } from 'winston';
 import * as winston from 'winston';
 import 'winston-mongodb';
 import { AllExceptionFilter } from './_common/filters/all-exception.filter';
 import { IdentitiesValidationFilter } from './_common/filters/identities-validation.filter';
 import { MongooseValidationFilter } from './_common/filters/mongoose-validation.filter';
+import { Response } from 'express';
+import passport from 'passport';
+import { rawBodyBuffer } from '~/_common/middlewares/raw-body-buffer.middleware';
 
 declare const module: any;
 (async (): Promise<void> => {
+  const cfg = configInstance();
   const winstonFormat = {
     pretty: winston.format.combine(
       winston.format.colorize(),
@@ -36,7 +41,7 @@ declare const module: any;
       format: winstonFormat.pretty,
     }),
     mongodb: new winston.transports.MongoDB({
-      db: configInstance().mongoose.uri,
+      db: cfg.mongoose.uri,
       collection: 'logs',
       level: 'debug',
       options: {
@@ -55,16 +60,18 @@ declare const module: any;
     logger: WinstonModule.createLogger({
       instance: winstonInstance,
     }),
-    // rawBody: true,
+    bodyParser: false,
+    rawBody: true,
     cors: true,
   });
   // eslint-disable-next-line
-  // app.use((_: any, res: Response, next: () => void) => {
-  //   res.removeHeader('x-powered-by')
-  //   next()
-  // })
-  // app.use(passport.initialize())
-  // app.use(rawBodyBuffer(cfg?.application?.bodyParser));
+  app.use((_: any, res: Response, next: () => void) => {
+    res.removeHeader('x-powered-by')
+    next()
+  })
+  app.use(passport.initialize())
+  app.use(rawBodyBuffer(cfg?.application?.bodyParser));
+  app.use(cookieParser())
   if (process.env.production !== 'production') {
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     (await import('./swagger')).default(app);

src/core/keyrings/_schemas/keyrings.schema.ts

@@ -1,7 +1,8 @@
 import { DocumentBuilder, SwaggerCustomOptions, SwaggerModule } from '@nestjs/swagger';
 import { ConfigService } from '@nestjs/config';
 import { NestExpressApplication } from '@nestjs/platform-express';
-import { Request, Response } from 'express';
+import { Response } from 'express';
+import { SwaggerTheme, SwaggerThemeName } from 'swagger-themes';
 import { readFileSync } from 'fs';
 
 export default function swagger(app: NestExpressApplication) {
@@ -14,13 +15,13 @@ export default function swagger(app: NestExpressApplication) {
     .addBearerAuth({ type: 'http', scheme: 'bearer', bearerFormat: 'JWT' }, 'access-token')
     .build();
   const document = SwaggerModule.createDocument(app, build);
+  const theme = new SwaggerTheme('v3')
   SwaggerModule.setup(config.get<string>('swagger.path'), app, document, {
     ...config.get<SwaggerCustomOptions>('swagger.options'),
     explorer: true,
     swaggerOptions: {},
+    customCss: theme.getBuffer(<SwaggerThemeName>'dark'),
   });
 
-  app.getHttpAdapter().get(config.get<string>('swagger.api'), (req: Request, res: Response) => {
-    res.json(document);
-  });
+  app.getHttpAdapter().get(config.get<string>('swagger.api'), (_, res: Response) => res.json(document));
 }

src/main.ts

@@ -2360,6 +2360,13 @@
   dependencies:
     "@types/node" "*"
 
+"@types/cookie-parser@^1.4.6":
+  version "1.4.6"
+  resolved "https://registry.yarnpkg.com/@types/cookie-parser/-/cookie-parser-1.4.6.tgz#002643c514cccf883a65cbe044dbdc38c0b92ade"
+  integrity sha512-KoooCrD56qlLskXPLGUiJxOMnv5l/8m7cQD2OxJ73NPMhuSz9PmvwRD6EpjDyKBVrdJDdQ4bQK7JFNHnNmax0w==
+  dependencies:
+    "@types/express" "*"
+
 "@types/cookiejar@*":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@types/cookiejar/-/cookiejar-2.1.5.tgz#14a3e83fa641beb169a2dd8422d91c3c345a9a78"
@@ -4092,11 +4099,24 @@ convert-source-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
   integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
 
+cookie-parser@^1.4.6:
+  version "1.4.6"
+  resolved "https://registry.yarnpkg.com/cookie-parser/-/cookie-parser-1.4.6.tgz#3ac3a7d35a7a03bbc7e365073a26074824214594"
+  integrity sha512-z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA==
+  dependencies:
+    cookie "0.4.1"
+    cookie-signature "1.0.6"
+
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
   integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
 
+cookie@0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
+  integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
+
 cookie@0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
@@ -5683,6 +5703,11 @@ hasown@^2.0.0:
   dependencies:
     function-bind "^1.1.2"
 
+helmet@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/helmet/-/helmet-7.1.0.tgz#287279e00f8a3763d5dccbaf1e5ee39b8c3784ca"
+  integrity sha512-g+HZqgfbpXdCkme/Cd/mZkV0aV3BZZZSugecH03kl38m/Kmdx8jKjBikpDj2cr+Iynv4KpYEviojNdTJActJAg==
+
 hexoid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/hexoid/-/hexoid-1.0.0.tgz#ad10c6573fb907de23d9ec63a711267d9dc9bc18"
@@ -9372,6 +9397,11 @@ svg-pan-zoom@^3.6.1:
   resolved "https://registry.yarnpkg.com/svg-pan-zoom/-/svg-pan-zoom-3.6.1.tgz#f880a1bb32d18e9c625d7715350bebc269b450cf"
   integrity sha512-JaKkGHHfGvRrcMPdJWkssLBeWqM+Isg/a09H7kgNNajT1cX5AztDTNs+C8UzpCxjCTRrG34WbquwaovZbmSk9g==
 
+swagger-themes@^1.4.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/swagger-themes/-/swagger-themes-1.4.2.tgz#c44ef2345a9f64d99fd0e6abb45d8aac8e603330"
+  integrity sha512-O+T8It8cy1X6lvrqC2QA6taslLoPnQ2oRmvW1Aub6TebKmWLdONqTo/CKDvo0t9W65QKC87/jnuEHjNx91oPzQ==
+
 swagger-ui-dist@5.9.1:
   version "5.9.1"
   resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-5.9.1.tgz#d0bcd614e3752da02df141846348f84468ae815e"