Merge branch 'dev' into test/prevent-server-block-on-rate-limit

src/app.module.ts

@@ -37,6 +37,7 @@ import { VisitorPasswordModule } from './vistor-password/visitor-password.module
 
 import { ThrottlerGuard } from '@nestjs/throttler';
 import { ThrottlerModule } from '@nestjs/throttler/dist/throttler.module';
+import { isArray } from 'class-validator';
 import { winstonLoggerOptions } from '../libs/common/src/logger/services/winston.logger';
 import { AqiModule } from './aqi/aqi.module';
 import { OccupancyModule } from './occupancy/occupancy.module';
@@ -50,7 +51,12 @@ import { WeatherModule } from './weather/weather.module';
       throttlers: [{ ttl: 60000, limit: 30 }],
       generateKey: (context) => {
         const req = context.switchToHttp().getRequest();
-        return req.headers['x-forwarded-for'] || req.ip;
+        console.log('Real IP:', req.headers['x-forwarded-for']);
+        return req.headers['x-forwarded-for']
+          ? isArray(req.headers['x-forwarded-for'])
+            ? req.headers['x-forwarded-for'][0].split(':')[0]
+            : req.headers['x-forwarded-for'].split(':')[0]
+          : req.ip;
       },
     }),
     WinstonModule.forRoot(winstonLoggerOptions),

src/main.ts

@@ -21,18 +21,6 @@ async function bootstrap() {
 
   app.use(new RequestContextMiddleware().use);
 
-  app.use((req, res, next) => {
-    console.log(
-      'Real IP:',
-      req.ip,
-      req.headers['x-forwarded-for'],
-      req.connection.remoteAddress,
-    );
-    next();
-  });
-
-  // app.getHttpAdapter().getInstance().set('trust proxy', 1);
-
   app.use(
     helmet({
       contentSecurityPolicy: false,