feat: add config value for proxy chain length

MovieReviewComment · Mar 18, 2024 · 6da2468 · 6da2468
1 parent ac5b4a1
commit 6da2468
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 2 deletions.
diff --git a/api/config/default.yaml b/api/config/default.yaml
@@ -4,6 +4,7 @@ timeout:
 http:
   host: '127.0.0.1'
   port: 8080
+  numTrustedProxies: 0
 logger:
   level: 'http' # Log only if less than or equal to this level
   format: 'text'

diff --git a/api/config/test.yaml b/api/config/test.yaml
@@ -4,6 +4,7 @@ timeout:
 http:
   host: '127.0.0.1'
   port: 0 # PORT 0 randomly assigns a usable port. Set up for parallel testing.
+  numTrustedProxies: 0
 logger:
   level: 'silly' # Log only if less than or equal to this level
   format: 'text'

diff --git a/api/src/config/loader.ts b/api/src/config/loader.ts
@@ -52,6 +52,7 @@ export function buildHttpConfig(config: Config): HttpConfig {
     env: config.env,
     host: config.http.host,
     port: config.http.port,
+    numTrustedProxies: config.http.numTrustedProxies,
     cookieExpirationHours: config.jwt.expirationHour
   };
 }

diff --git a/api/src/config/types.ts b/api/src/config/types.ts
@@ -20,8 +20,10 @@ export interface ConfigTimeout {
 export interface ConfigHttp {
   host: string;
   port: number;
+  numTrustedProxies: number
 }
 
+
 export interface ConfigLogger {
   level: LogLevel;
   format: LogFormat;

diff --git a/api/src/controller/http/server.ts b/api/src/controller/http/server.ts
@@ -47,7 +47,7 @@ export class HttpServer {
   public start = async (): Promise<void> => {
     this.app = express();
     this.app.disable('x-powered-by');
-    this.app.set('trust proxy', 0);
+    this.app.set('trust proxy', this.config.numTrustedProxies);
     this.app.use(express.json());
     await this.buildApiDocument();
     this.app.use('/api', cookieParser());

diff --git a/api/src/controller/http/types.ts b/api/src/controller/http/types.ts
@@ -4,5 +4,6 @@ export interface HttpConfig {
   env: string;
   host: string;
   port: number;
+  numTrustedProxies: number;
   cookieExpirationHours: number;
 }
diff --git a/api/test/config/loader.test.ts b/api/test/config/loader.test.ts
@@ -16,7 +16,7 @@ describe('Test config loader', () => {
     expect(loadConfig()).toStrictEqual({
       env: 'test',
       timeout: { shutdownSeconds: 30 },
-      http: { host: '127.0.0.1', port: 0 },
+      http: { host: '127.0.0.1', port: 0, numTrustedProxies: 0 },
       logger: { level: 'silly', format: 'text' },
       database: {
         host: '127.0.0.1',
@@ -91,6 +91,7 @@ describe('Test build http config', () => {
       env: 'test',
       host: '127.0.0.1',
       port: 0,
+      numTrustedProxies: 0,
       cookieExpirationHours: 1
     });
   });