Merge pull request #50 from ceelsoin/master

hotfix: change protected fields to allow scoped fields
globocom · May 23, 2023 · 9297c26 · 9297c26
2 parents 984d7fd + 675935d
commit 9297c26
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/lib/http/SchemaResponse.js b/lib/http/SchemaResponse.js
@@ -5,17 +5,21 @@ class SchemaResponse {
     this.functionsRequest = functionsRequest;
     this.res = res;
     this.schemaName = schemaName;
-    this.protectedFields = config.responseProtectedFields;
+    this.allowedFields = config.responseAllowedFields;
   }
 
-  removeProtectedFields(data) {
-    for (const field of this.protectedFields) {
-      delete data[field];
-    };
-  };
+  removeNotAllowedFields(data) {
+    const { env } = data;
+    if(env && env.length){
+      const fieldsToRemove = Object.keys(env.filter(field => !this.allowedFields.includes(field)));
+      for (const field of fieldsToRemove) {
+        delete data.env[field];
+      }
+    }
+  }
 
   json(data) {
-    this.removeProtectedFields(data);
+    this.removeNotAllowedFields(data);
     const schemeAndAuthority = this.functionsRequest.schemeAndAuthority();
     this.res.set('Content-Type', `application/json; charset=utf-8; profile=${schemeAndAuthority}/_schemas/${this.schemaName}`);
     this.res.end(JSON.stringify(data));

diff --git a/lib/support/config.js b/lib/support/config.js
@@ -22,7 +22,7 @@ module.exports = {
   defaultGlobalModules: ConfigDiscovery.getList('DEFAULT_GLOBAL_MODULES', DEFAULT_GLOBAL_MODULES),
   bodyParserLimit: process.env.BODY_PARSER_LIMIT || '1mb',
   redisConnectionTimeout: ConfigDiscovery.getInt('REDIS_CONNECTION_TIMEOUT', 2000),
-  responseProtectedFields: ConfigDiscovery.getList('RESPONSE_PROTECTED_FIELDS', ['env']),
+  responseAllowedFields: ConfigDiscovery.getList('RESPONSE_ALLOWED_FIELDS', ['BACKSTAGE_CLIENT_ID']),
   metric: {
     client: process.env.METRIC_CLIENT,
     udpHost: process.env.METRIC_UDP_HOST,

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@globocom/backstage-functions",
-  "version": "0.4.1",
+  "version": "0.6.0-rc.4",
   "description": "Remote serverless code executor",
   "main": "index.js",
   "scripts": {
@@ -26,7 +26,7 @@
   "author": "Backstage Team <[email protected]>",
   "license": "MIT",
   "dependencies": {
-    "@globocom/backstage-functions-sandbox": "^0.5.4-next.0",
+    "@globocom/backstage-functions-sandbox": "^0.5.3",
     "@opentelemetry/api": "^0.18.1",
     "@opentelemetry/core": "^0.19.0",
     "@opentelemetry/exporter-collector-grpc": "^0.19.0",