From 7cbbb27c0721ced7b74fc39033c8485b8d2ad864 Mon Sep 17 00:00:00 2001 From: Joyee Cheung Date: Mon, 6 Aug 2018 23:27:03 +0800 Subject: src: perform integrity checks on built-in code cache Currently V8 only checks that the length of the source code is the same as the code used to generate the hash, so we add an additional check here: 1. During compile time, when generating node_javascript.cc and node_code_cache.cc, we compute and include the hash of the (unwrapped) JavaScript source in both. 2. At runtime, we check that the hash of the code being compiled and the hash of the code used to generate the cache (inside the wrapper) is the same. This is based on the assumptions: 1. `internalBinding('code_cache_hash')` must be in sync with `internalBinding('code_cache')` (same C++ file) 2. `internalBinding('natives_hash')` must be in sync with `process.binding('natives')` (same C++ file) 3. If `internalBinding('natives_hash')` is in sync with `internalBinding('natives_hash')`, then the (unwrapped) code used to generate `internalBinding('code_cache')` should be in sync with the (unwrapped) code in `process.binding('natives')` There will be, however, false positives if the wrapper used to generate the cache is different from the one used at run time, and the length of the wrapper somehow stays the same. But that should be rare and can be eased once we make the two bootstrappers cached and checked as well. PR-URL: https://github.com/nodejs/node/pull/22152 Reviewed-By: Anna Henningsen Reviewed-By: Tiancheng "Timothy" Gu Reviewed-By: James M Snell Reviewed-By: Gus Caplan --- tools/generate_code_cache.js | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) (limited to 'tools/generate_code_cache.js') diff --git a/tools/generate_code_cache.js b/tools/generate_code_cache.js index 740cbd718a..35411bc5af 100644 --- a/tools/generate_code_cache.js +++ b/tools/generate_code_cache.js @@ -9,9 +9,17 @@ const { getCodeCache, + getSource, cachableBuiltins } = require('internal/bootstrap/cache'); +function hash(str) { + if (process.versions.openssl) { + return require('crypto').createHash('sha256').update(str).digest('hex'); + } + return ''; +} + const fs = require('fs'); const resultPath = process.argv[2]; @@ -51,6 +59,8 @@ function getInitalizer(key, cache) { const defName = key.replace(/\//g, '_').replace(/-/g, '_'); const definition = `static uint8_t ${defName}_raw[] = {\n` + `${cache.join(',')}\n};`; + const source = getSource(key); + const sourceHash = hash(source); const initializer = ` v8::Local ${defName}_ab = v8::ArrayBuffer::New(isolate, ${defName}_raw, ${cache.length}); @@ -60,13 +70,19 @@ function getInitalizer(key, cache) { FIXED_ONE_BYTE_STRING(isolate, "${key}"), ${defName}_array).FromJust(); `; + const hashIntializer = ` + target->Set(context, + FIXED_ONE_BYTE_STRING(isolate, "${key}"), + OneByteString(isolate, "${sourceHash}")).FromJust(); + `; return { - definition, initializer + definition, initializer, hashIntializer, sourceHash }; } const cacheDefinitions = []; const cacheInitializers = []; +const cacheHashInitializers = []; let totalCacheSize = 0; @@ -79,11 +95,14 @@ for (const key of cachableBuiltins) { const length = cachedData.length; totalCacheSize += length; - const { definition, initializer } = getInitalizer(key, cachedData); + const { + definition, initializer, hashIntializer, sourceHash + } = getInitalizer(key, cachedData); cacheDefinitions.push(definition); cacheInitializers.push(initializer); + cacheHashInitializers.push(hashIntializer); console.log(`Generated cache for '${key}', size = ${formatSize(length)}` + - `, total = ${formatSize(totalCacheSize)}`); + `, hash = ${sourceHash}, total = ${formatSize(totalCacheSize)}`); } const result = `#include "node.h" @@ -106,6 +125,13 @@ void DefineCodeCache(Environment* env, v8::Local target) { ${cacheInitializers.join('\n')} } +// The target here will be returned as \`internalBinding('code_cache_hash')\` +void DefineCodeCacheHash(Environment* env, v8::Local target) { + v8::Isolate* isolate = env->isolate(); + v8::Local context = env->context(); + ${cacheHashInitializers.join('\n')} +} + } // namespace node `; -- cgit v1.2.3