From 7a1bba4112fc80037fca9464439c4615a1565bad Mon Sep 17 00:00:00 2001 From: jinxm Date: Tue, 19 Jul 2022 11:25:13 +0800 Subject: [PATCH] feat: server.enable('trust proxy'); --- packages/nocodb/docker/index.js | 1 + packages/nocodb/src/__tests__/graphql.test.ts | 2 ++ packages/nocodb/src/__tests__/rest.test.ts | 1 + packages/nocodb/src/__tests__/restv2.test.ts | 1 + packages/nocodb/src/lib/v1-legacy/nc.try.ts | 1 + packages/nocodb/src/run/docker.ts | 2 ++ packages/nocodb/src/run/dockerRunMysql.ts | 2 ++ packages/nocodb/src/run/dockerRunPG.ts | 2 ++ packages/nocodb/src/run/dockerRunPG_CyQuick.ts | 2 ++ packages/nocodb/src/run/try.ts | 2 ++ 10 files changed, 16 insertions(+) diff --git a/packages/nocodb/docker/index.js b/packages/nocodb/docker/index.js index 3701329641..00818be6c8 100644 --- a/packages/nocodb/docker/index.js +++ b/packages/nocodb/docker/index.js @@ -2,6 +2,7 @@ const Noco = require("../build/main/lib/Noco").default; const express = require('express'); const cors = require('cors'); const server = express(); +server.enable('trust proxy'); server.use(cors()); diff --git a/packages/nocodb/src/__tests__/graphql.test.ts b/packages/nocodb/src/__tests__/graphql.test.ts index 7eb8ae6f2b..343ad1bc46 100644 --- a/packages/nocodb/src/__tests__/graphql.test.ts +++ b/packages/nocodb/src/__tests__/graphql.test.ts @@ -63,6 +63,8 @@ describe('{Auth, CRUD, HasMany, Belongs} Tests', () => { this.timeout(10000); (async () => { const server = express(); + server.enable('trust proxy'); + server.use(await Noco.init({})); app = server; diff --git a/packages/nocodb/src/__tests__/rest.test.ts b/packages/nocodb/src/__tests__/rest.test.ts index bdc2354398..22c4637da6 100644 --- a/packages/nocodb/src/__tests__/rest.test.ts +++ b/packages/nocodb/src/__tests__/rest.test.ts @@ -81,6 +81,7 @@ describe('{Auth, CRUD, HasMany, Belongs} Tests', () => { (async () => { const server = express(); + server.enable('trust proxy'); server.use(await Noco.init()); app = server; diff --git a/packages/nocodb/src/__tests__/restv2.test.ts b/packages/nocodb/src/__tests__/restv2.test.ts index 293ecc5228..b93445e3a1 100644 --- a/packages/nocodb/src/__tests__/restv2.test.ts +++ b/packages/nocodb/src/__tests__/restv2.test.ts @@ -95,6 +95,7 @@ describe('Noco v2 Tests', () => { } catch {} const server = express(); + server.enable('trust proxy'); server.use(await Noco.init()); app = server; diff --git a/packages/nocodb/src/lib/v1-legacy/nc.try.ts b/packages/nocodb/src/lib/v1-legacy/nc.try.ts index 3ac8ef6860..90f6effe4b 100644 --- a/packages/nocodb/src/lib/v1-legacy/nc.try.ts +++ b/packages/nocodb/src/lib/v1-legacy/nc.try.ts @@ -8,6 +8,7 @@ import Noco from '../Noco'; export default async function (dbUrl): Promise { const server = express(); server.use(cors()); + server.enable('trust proxy'); server.set('view engine', 'ejs'); diff --git a/packages/nocodb/src/run/docker.ts b/packages/nocodb/src/run/docker.ts index e8fbb51d1e..b506b91a63 100644 --- a/packages/nocodb/src/run/docker.ts +++ b/packages/nocodb/src/run/docker.ts @@ -5,6 +5,8 @@ import Noco from '../lib/Noco'; process.env.NC_VERSION = '0009044'; const server = express(); +server.enable('trust proxy'); + server.use( cors({ exposedHeaders: 'xc-db-response', diff --git a/packages/nocodb/src/run/dockerRunMysql.ts b/packages/nocodb/src/run/dockerRunMysql.ts index 564aadf870..5eaecdd51d 100644 --- a/packages/nocodb/src/run/dockerRunMysql.ts +++ b/packages/nocodb/src/run/dockerRunMysql.ts @@ -5,6 +5,8 @@ import Noco from '../lib/Noco'; process.env.NC_VERSION = '0009044'; const server = express(); +server.enable('trust proxy'); + server.use( cors({ exposedHeaders: 'xc-db-response', diff --git a/packages/nocodb/src/run/dockerRunPG.ts b/packages/nocodb/src/run/dockerRunPG.ts index f042642c82..8c2d40b3c7 100644 --- a/packages/nocodb/src/run/dockerRunPG.ts +++ b/packages/nocodb/src/run/dockerRunPG.ts @@ -5,6 +5,8 @@ import Noco from '../lib/Noco'; process.env.NC_VERSION = '0009044'; const server = express(); +server.enable('trust proxy'); + server.use( cors({ exposedHeaders: 'xc-db-response', diff --git a/packages/nocodb/src/run/dockerRunPG_CyQuick.ts b/packages/nocodb/src/run/dockerRunPG_CyQuick.ts index 27cc629713..7d3ebf3e42 100644 --- a/packages/nocodb/src/run/dockerRunPG_CyQuick.ts +++ b/packages/nocodb/src/run/dockerRunPG_CyQuick.ts @@ -5,6 +5,8 @@ import Noco from '../lib/Noco'; process.env.NC_VERSION = '0009044'; const server = express(); +server.enable('trust proxy'); + server.use( cors({ exposedHeaders: 'xc-db-response', diff --git a/packages/nocodb/src/run/try.ts b/packages/nocodb/src/run/try.ts index ec9d09c787..996fffd0ba 100644 --- a/packages/nocodb/src/run/try.ts +++ b/packages/nocodb/src/run/try.ts @@ -11,6 +11,8 @@ process.env.NC_DB = url; (async () => { const server = express(); + server.enable('trust proxy'); + server.use(cors()); server.set('view engine', 'ejs'); const app = new Noco();