From 7a316b14e61b546cde94445509a4eb5b1d6f3d61 Mon Sep 17 00:00:00 2001
From: Soam Vasani <soamvasani@platform9.com>
Date: Wed, 24 Aug 2016 13:10:35 -0700
Subject: [PATCH] Use require instead of eval to load user code

---
 src/function-run/nodejs/server.js    | 9 +++------
 src/function-run/nodejs/test/test.js | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/function-run/nodejs/server.js b/src/function-run/nodejs/server.js
index 92720b0b..059189f4 100644
--- a/src/function-run/nodejs/server.js
+++ b/src/function-run/nodejs/server.js
@@ -32,14 +32,11 @@ function specialize(req, res) {
     // Read and load the code. It's placed there securely by the fission runtime.
     try {
         var startTime = process.hrtime();
-
-        const code = fs.readFileSync(argv.codepath).toString();
-        userFunction = eval(code);
-
+        userFunction = require(argv.codepath);
         var elapsed = process.hrtime(startTime);
-        console.log(`user code loaded in ${elapsed[0]}sec ${elapsed[1]}ns`);
+        console.log(`user code loaded in ${elapsed[0]}sec ${elapsed[1]/1000000}ms`);
     } catch(e) {
-        console.error(`eval error: ${e}`);
+        console.error(`user code load error: ${e}`);
         res.status(500).send(JSON.stringify(e));
         return;
     }
diff --git a/src/function-run/nodejs/test/test.js b/src/function-run/nodejs/test/test.js
index d3e16c38..fc8fca57 100644
--- a/src/function-run/nodejs/test/test.js
+++ b/src/function-run/nodejs/test/test.js
@@ -1,4 +1,4 @@
-exports = function (context, callback) {
+module.exports = function (context, callback) {
   console.log("Test function");
   callback(200, "Hello, world!");
 }