Merge pull request #4829 from Countly/ar2rsawseen/master

[hooks] update to new isolated vm
Countly · Jan 11, 2024 · 95f05aa · 95f05aa
2 parents d249de5 + 75a6dcf
commit 95f05aa
Show file tree

Hide file tree

Showing 6 changed files with 1,105 additions and 43 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -199,12 +199,18 @@ jobs:
         shell: bash
         run: "sed -i 's/port: 3001,/port: 3001, workers: 1,/' /opt/countly/api/config.js"
 
+      - name: Install plugins
+        shell: bash
+        run: |
+         cp plugins/plugins.default.json /opt/countly/plugins/plugins.json
+         node /opt/countly/bin/scripts/install_plugins.js --force
+
       - name: Run tests
         shell: bash
         working-directory: /opt/countly
         run: |
-          /sbin/my_init &
           npm install
+          /sbin/my_init &
           node bin/scripts/test.connection.js
           npx grunt mochaTest
   ui-test:

diff --git a/bin/scripts/install_plugins.js b/bin/scripts/install_plugins.js
@@ -3,6 +3,10 @@ var manager = require('../../plugins/pluginManager.js');
 var plugins = manager.getPlugins();
 require('../../api/utils/log').setLevel('db:write', 'mute');
 
+if (process.argv && process.argv.length > 2 && process.argv[2] === '--force') {
+    process.env.FORCE_NPM_INSTALL = true;
+}
+
 if (plugins.length > 0) {
     manager.connectToAllDatabases().then(async() => {
         if (!manager.getConfig("api").offline_mode) {

diff --git a/plugins/hooks/api/parts/effects/custom_code.js b/plugins/hooks/api/parts/effects/custom_code.js
@@ -1,8 +1,7 @@
 const utils = require("../../utils");
 const common = require('../../../../../api/utils/common.js');
 const log = common.log("hooks:api:api_custom_code_effect");
-const request = require("countly-request");
-const {NodeVM} = require('vm2');
+const {Sandbox} = require("v8-sandbox");
 
 /**
  * custom code effect
@@ -39,25 +38,23 @@ class CustomCodeEffect {
                 };
 
                 genCode = `
-                    const CUSTOM_MAIN = async () => {
-                        try {
-                            ${code}
-                         }
-                         catch(e) {
-                            CUSTOM_CODE_ERROR_CALLBACK(e);                        
-                            CUSTOM_CODE_RESOLVER();
-                         }
-                         CUSTOM_CODE_RESOLVER();
-                    }
-                    CUSTOM_MAIN();
+                    ${code}
+                    setResult({ value: params });
                 `;
-                const vm = new NodeVM({
-                    timeout: 30000,
-                    console: 'inherit',
-                    sandbox: {params, setTimeout, request, CUSTOM_CODE_RESOLVER, CUSTOM_CODE_ERROR_CALLBACK},
-                    require: false,
-                });
-                vm.run(genCode, 'vm.js');
+                const sandbox = new Sandbox();
+
+                (async() => {
+                    const { error, value } = await sandbox.execute({ code: genCode, timeout: 3000, globals: { params } });
+
+                    await sandbox.shutdown();
+
+                    if (error) {
+                        CUSTOM_CODE_ERROR_CALLBACK(error);
+                    }
+                    options.params = value;
+                    log.d("Resolved value:", value);
+                    CUSTOM_CODE_RESOLVER();
+                })();
             });
         }
         catch (e) {