v8: disable eval() function, add test_eval.js ut.

nf/nvm/engine_v8_test.go

@@ -29,13 +29,15 @@ import (
 
 func TestRunScriptSource(t *testing.T) {
 	tests := []struct {
-		filepath string
+		filepath    string
+		expectedErr error
 	}{
-		{"test/test_console.js"},
-		{"test/test_storage_handlers.js"},
-		{"test/test_storage_class.js"},
-		{"test/test_storage.js"},
-		{"test/test_ERC20.js"},
+		{"test/test_console.js", nil},
+		{"test/test_storage_handlers.js", nil},
+		{"test/test_storage_class.js", nil},
+		{"test/test_storage.js", nil},
+		{"test/test_ERC20.js", nil},
+		{"test/test_eval.js", ErrExecutionFailed},
 	}
 
 	for _, tt := range tests {
@@ -50,9 +52,8 @@ func TestRunScriptSource(t *testing.T) {
 
 			engine := NewV8Engine(balanceTrie, lcsTrie, gcsTrie)
 			err = engine.RunScriptSource(string(data))
+			assert.Equal(t, tt.expectedErr, err)
 			engine.Dispose()
-
-			assert.Nil(t, err)
 		})
 	}
 }

nf/nvm/storage.go

@@ -67,7 +67,7 @@ func StorageGetFunc(handler unsafe.Pointer, key *C.char) *C.char {
 			"func":    "nvm.StorageGetFunc",
 			"handler": uint64(uintptr(handler)),
 			"key":     C.GoString(key),
-		}).Error("StorageGetFunc get key failed.")
+		}).Warn("StorageGetFunc get key failed.")
 		return nil
 	}
 	return C.CString(string(val))
@@ -87,7 +87,7 @@ func StoragePutFunc(handler unsafe.Pointer, key *C.char, value *C.char) int {
 			"handler": uint64(uintptr(handler)),
 			"key":     C.GoString(key),
 			"err":     err,
-		}).Error("StoragePutFunc get key failed.")
+		}).Error("StoragePutFunc put key failed.")
 		return 1
 	}
 	return 0
@@ -108,7 +108,7 @@ func StorageDelFunc(handler unsafe.Pointer, key *C.char) int {
 			"handler": uint64(uintptr(handler)),
 			"key":     C.GoString(key),
 			"err":     err,
-		}).Error("StorageDelFunc get key failed.")
+		}).Warn("StorageDelFunc del key failed.")
 		return 1
 	}
 

nf/nvm/test/ERC20.js

@@ -1,3 +1,21 @@
+// Copyright (C) 2017 go-nebulas authors
+//
+// This file is part of the go-nebulas library.
+//
+// the go-nebulas library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// the go-nebulas library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with the go-nebulas library.  If not, see <http://www.gnu.org/licenses/>.
+//
+
 'use strict';
 
 var StandardToken = function () {

nf/nvm/test/test_eval.js

@@ -0,0 +1,20 @@
+// Copyright (C) 2017 go-nebulas authors
+//
+// This file is part of the go-nebulas library.
+//
+// the go-nebulas library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// the go-nebulas library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with the go-nebulas library.  If not, see <http://www.gnu.org/licenses/>.
+//
+'use strict';
+
+eval("console.error(\"this log is executed by eval, please disable eval function ASAP.\");");

nf/nvm/v8/engine.cc

@@ -98,6 +98,10 @@ int RunScriptSource(V8Engine *e, const char *data, void *lcsHandler,
 
   // Create a new context.
   Local<Context> context = Context::New(isolate, NULL, globalTpl);
+
+  // Disable eval().
+  context->AllowCodeGenerationFromStrings(false);
+
   // Enter the context for compiling and running the hello world script.
   Context::Scope context_scope(context);