meta: merge node/master into node-chakracore/master

chakrabot · chakrabot · commit 86c1bc30bd05 · 2018-01-19T11:36:08.000-08:00
Merge b5d4153 as of 2017-12-22 This commit was automatically generated. For any problems, please contact jackhorton Reviewed-By: Taylor Woll <tawoll@ntdev.microsoft.com>
diff --git a/deps/chakrashim/include/v8-version.h b/deps/chakrashim/include/v8-version.h
@@ -11,7 +11,7 @@
 #define V8_MAJOR_VERSION 6
 #define V8_MINOR_VERSION 3
 #define V8_BUILD_NUMBER 292
-#define V8_PATCH_LEVEL 46
+#define V8_PATCH_LEVEL 48
 
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
diff --git a/deps/v8/include/v8-version.h b/deps/v8/include/v8-version.h
@@ -11,7 +11,7 @@
 #define V8_MAJOR_VERSION 6
 #define V8_MINOR_VERSION 3
 #define V8_BUILD_NUMBER 292
-#define V8_PATCH_LEVEL 46
+#define V8_PATCH_LEVEL 48
 
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
diff --git a/deps/v8/src/builtins/builtins-typedarray-gen.cc b/deps/v8/src/builtins/builtins-typedarray-gen.cc
@@ -799,7 +799,7 @@ void TypedArrayBuiltinsAssembler::SetTypedArraySource(
   // means we're safe from overflows in the following multiplication.
   TNode<IntPtrT> source_byte_length = IntPtrMul(source_length, source_el_size);
   CSA_ASSERT(this,
-             IntPtrGreaterThanOrEqual(source_byte_length, IntPtrConstant(0)));
+             UintPtrGreaterThanOrEqual(source_byte_length, IntPtrConstant(0)));
 
   Label call_memmove(this), fast_c_call(this), out(this);
   Branch(Word32Equal(source_el_kind, target_el_kind), &call_memmove,
@@ -821,17 +821,17 @@ void TypedArrayBuiltinsAssembler::SetTypedArraySource(
 
     TNode<IntPtrT> target_byte_length =
         IntPtrMul(target_length, target_el_size);
-    CSA_ASSERT(this,
-               IntPtrGreaterThanOrEqual(target_byte_length, IntPtrConstant(0)));
+    CSA_ASSERT(
+        this, UintPtrGreaterThanOrEqual(target_byte_length, IntPtrConstant(0)));
 
     TNode<IntPtrT> target_data_end_ptr =
         IntPtrAdd(target_data_ptr, target_byte_length);
     TNode<IntPtrT> source_data_end_ptr =
         IntPtrAdd(source_data_ptr, source_byte_length);
 
     GotoIfNot(
-        Word32Or(IntPtrLessThanOrEqual(target_data_end_ptr, source_data_ptr),
-                 IntPtrLessThanOrEqual(source_data_end_ptr, target_data_ptr)),
+        Word32Or(UintPtrLessThanOrEqual(target_data_end_ptr, source_data_ptr),
+                 UintPtrLessThanOrEqual(source_data_end_ptr, target_data_ptr)),
         call_runtime);
 
     TNode<IntPtrT> source_length =
diff --git a/deps/v8/src/debug/debug-coverage.cc b/deps/v8/src/debug/debug-coverage.cc
@@ -544,9 +544,6 @@ void Coverage::SelectMode(Isolate* isolate, debug::Coverage::Mode mode) {
             if (!shared->IsSubjectToDebugging()) continue;
             vector->clear_invocation_count();
             vectors.emplace_back(vector, isolate);
-          } else if (current_obj->IsJSFunction()) {
-            JSFunction* function = JSFunction::cast(current_obj);
-            function->set_code(function->shared()->code());
           }
         }
       }
diff --git a/deps/v8/test/mjsunit/regress/regress-786784.js b/deps/v8/test/mjsunit/regress/regress-786784.js
@@ -0,0 +1,34 @@
+// Copyright 2017 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax
+
+function f() {
+  function g(arg) { return arg; }
+  // The closure contains a call IC slot.
+  return function() { return g(42); };
+}
+
+const a = Realm.create();
+const b = Realm.create();
+
+// Create two closures in different contexts sharing the same
+// SharedFunctionInfo (shared due to code caching).
+const x = Realm.eval(a, f.toString() + " f()");
+const y = Realm.eval(b, f.toString() + " f()");
+
+// Run the first closure to create SFI::code.
+x();
+
+// At this point, SFI::code is set and `x` has a feedback vector (`y` does not).
+
+// Enabling block code coverage deoptimizes all functions and triggers the
+// buggy code path in which we'd unconditionally replace JSFunction::code with
+// its SFI::code (but skip feedback vector setup).
+%DebugToggleBlockCoverage(true);
+
+// Still no feedback vector set on `y` but it now contains code. Run it to
+// trigger the crash when attempting to write into the non-existent feedback
+// vector.
+y();
diff --git a/doc/api/modules.md b/doc/api/modules.md
@@ -841,11 +841,19 @@ added: v9.3.0
 A list of the names of all modules provided by Node.js. Can be used to verify
 if a module is maintained by a third-party module or not.
 
+Note that `module` in this context isn't the same object that's provided
+by the [module wrapper][]. To access it, require the `Module` module:
+
+```js
+const builtin = require('module').builtinModules;
+```
+
 [`__dirname`]: #modules_dirname
 [`__filename`]: #modules_filename
 [`Error`]: errors.html#errors_class_error
 [`module` object]: #modules_the_module_object
 [`path.dirname()`]: path.html#path_path_dirname_path
 [exports shortcut]: #modules_exports_shortcut
 [module resolution]: #modules_all_together
+[module wrapper]: #modules_the_module_wrapper
 [native addons]: addons.html
diff --git a/lib/_tls_legacy.js b/lib/_tls_legacy.js
@@ -632,6 +632,8 @@ function onhandshakestart() {
     // state machine and OpenSSL is not re-entrant. We cannot allow the user's
     // callback to destroy the connection right now, it would crash and burn.
     setImmediate(function() {
+      // Old-style error is not being migrated to the newer style
+      // internal/errors.js because _tls_legacy.js has been deprecated.
       var err = new Error('TLS session renegotiation attack detected');
       if (self.cleartext) self.cleartext.emit('error', err);
     });
diff --git a/lib/internal/wrap_js_stream.js b/lib/internal/wrap_js_stream.js
@@ -136,7 +136,6 @@ class JSStreamWrap extends Socket {
         if (!self._dequeue(item))
           return;
 
-        handle.doAfterWrite(req);
         handle.finishWrite(req, errCode);
       });
     }
@@ -196,7 +195,6 @@ class JSStreamWrap extends Socket {
 
         const errCode = uv.UV_ECANCELED;
         if (item.type === 'write') {
-          handle.doAfterWrite(req);
           handle.finishWrite(req, errCode);
         } else if (item.type === 'shutdown') {
           handle.finishShutdown(req, errCode);
diff --git a/src/js_stream.cc b/src/js_stream.cc
@@ -169,17 +169,6 @@ void JSStream::New(const FunctionCallbackInfo<Value>& args) {
 }
 
 
-void JSStream::DoAfterWrite(const FunctionCallbackInfo<Value>& args) {
-  JSStream* wrap;
-  CHECK(args[0]->IsObject());
-  WriteWrap* w;
-  ASSIGN_OR_RETURN_UNWRAP(&wrap, args.Holder());
-  ASSIGN_OR_RETURN_UNWRAP(&w, args[0].As<Object>());
-
-  w->Done(0);
-}
-
-
 template <class Wrap>
 void JSStream::Finish(const FunctionCallbackInfo<Value>& args) {
   Wrap* w;
@@ -235,7 +224,6 @@ void JSStream::Initialize(Local<Object> target,
 
   AsyncWrap::AddWrapMethods(env, t);
 
-  env->SetProtoMethod(t, "doAfterWrite", DoAfterWrite);
   env->SetProtoMethod(t, "finishWrite", Finish<WriteWrap>);
   env->SetProtoMethod(t, "finishShutdown", Finish<ShutdownWrap>);
   env->SetProtoMethod(t, "readBuffer", ReadBuffer);
diff --git a/src/js_stream.h b/src/js_stream.h
@@ -37,7 +37,6 @@ class JSStream : public AsyncWrap, public StreamBase {
   AsyncWrap* GetAsyncWrap() override;
 
   static void New(const v8::FunctionCallbackInfo<v8::Value>& args);
-  static void DoAfterWrite(const v8::FunctionCallbackInfo<v8::Value>& args);
   static void ReadBuffer(const v8::FunctionCallbackInfo<v8::Value>& args);
   static void EmitEOF(const v8::FunctionCallbackInfo<v8::Value>& args);
 
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
@@ -3783,9 +3783,17 @@ void CipherBase::SetAuthTag(const FunctionCallbackInfo<Value>& args) {
     return args.GetReturnValue().Set(false);
   }
 
-  // FIXME(bnoordhuis) Throw when buffer length is not a valid tag size.
+  // Restrict GCM tag lengths according to NIST 800-38d, page 9.
+  unsigned int tag_len = Buffer::Length(args[0]);
+  if (tag_len > 16 || (tag_len < 12 && tag_len != 8 && tag_len != 4)) {
+    ProcessEmitWarning(cipher->env(),
+        "Permitting authentication tag lengths of %u bytes is deprecated. "
+        "Valid GCM tag lengths are 4, 8, 12, 13, 14, 15, 16.",
+        tag_len);
+  }
+
   // Note: we don't use std::max() here to work around a header conflict.
-  cipher->auth_tag_len_ = Buffer::Length(args[0]);
+  cipher->auth_tag_len_ = tag_len;
   if (cipher->auth_tag_len_ > sizeof(cipher->auth_tag_))
     cipher->auth_tag_len_ = sizeof(cipher->auth_tag_);
 
diff --git a/test/common/README.md b/test/common/README.md
@@ -340,11 +340,6 @@ original state after calling [`common.hijackStdOut()`][].
 
 Path to the 'root' directory. either `/` or `c:\\` (windows)
 
-### projectDir
-* [&lt;String>]
-
-Path to the project directory.
-
 ### skip(msg)
 * `msg` [&lt;String>]
 
diff --git a/test/common/index.js b/test/common/index.js
@@ -70,7 +70,6 @@ exports.enoughTestCpu = Array.isArray(cpus) &&
                         (cpus.length > 1 || cpus[0].speed > 999);
 
 exports.rootDir = exports.isWindows ? 'c:\\' : '/';
-exports.projectDir = path.resolve(__dirname, '..', '..');
 
 exports.buildType = process.config.target_defaults.default_configuration;
 
@@ -850,23 +849,6 @@ exports.crashOnUnhandledRejection = function() {
              (err) => process.nextTick(() => { throw err; }));
 };
 
-exports.getTTYfd = function getTTYfd() {
-  const tty = require('tty');
-  let tty_fd = 0;
-  if (!tty.isatty(tty_fd)) tty_fd++;
-  else if (!tty.isatty(tty_fd)) tty_fd++;
-  else if (!tty.isatty(tty_fd)) tty_fd++;
-  else {
-    try {
-      tty_fd = fs.openSync('/dev/tty');
-    } catch (e) {
-      // There aren't any tty fd's available to use.
-      return -1;
-    }
-  }
-  return tty_fd;
-};
-
 // Hijack stdout and stderr
 const stdWrite = {};
 function hijackStdWritable(name, listener) {
@@ -895,12 +877,3 @@ exports.hijackStdout = hijackStdWritable.bind(null, 'stdout');
 exports.hijackStderr = hijackStdWritable.bind(null, 'stderr');
 exports.restoreStdout = restoreWritable.bind(null, 'stdout');
 exports.restoreStderr = restoreWritable.bind(null, 'stderr');
-
-let fd = 2;
-exports.firstInvalidFD = function firstInvalidFD() {
-  // Get first known bad file descriptor.
-  try {
-    while (fs.fstatSync(++fd));
-  } catch (e) {}
-  return fd;
-};
diff --git a/test/doctool/test-make-doc.js b/test/doctool/test-make-doc.js
@@ -11,7 +11,7 @@ const assert = require('assert');
 const fs = require('fs');
 const path = require('path');
 
-const apiPath = path.resolve(common.projectDir, 'out', 'doc', 'api');
+const apiPath = path.resolve(__dirname, '..', '..', 'out', 'doc', 'api');
 const docs = fs.readdirSync(apiPath);
 assert.ok(docs.includes('_toc.html'));
 
diff --git a/test/parallel/test-crypto-authenticated.js b/test/parallel/test-crypto-authenticated.js
@@ -335,6 +335,14 @@ const errMessages = {
 
 const ciphers = crypto.getCiphers();
 
+common.expectWarning('Warning', (common.hasFipsCrypto ? [] : [
+  'Use Cipheriv for counter mode of aes-192-gcm'
+]).concat(
+  [0, 1, 2, 6, 9, 10, 11, 17]
+  .map((i) => `Permitting authentication tag lengths of ${i} bytes is ` +
+            'deprecated. Valid GCM tag lengths are 4, 8, 12, 13, 14, 15, 16.')
+));
+
 for (const i in TEST_CASES) {
   const test = TEST_CASES[i];
 
@@ -476,3 +484,14 @@ for (const i in TEST_CASES) {
   assert.throws(() => encrypt.setAAD(Buffer.from('123', 'ascii')),
                 errMessages.state);
 }
+
+// GCM only supports specific authentication tag lengths, invalid lengths should
+// produce warnings.
+{
+  for (const length of [0, 1, 2, 4, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17]) {
+    const decrypt = crypto.createDecipheriv('aes-256-gcm',
+                                            'FxLKsqdmv0E9xrQhp0b1ZgI0K7JFZJM8',
+                                            'qkuZpJWCewa6Szih');
+    decrypt.setAuthTag(Buffer.from('1'.repeat(length)));
+  }
+}
diff --git a/test/parallel/test-crypto-cipher-decipher.js b/test/parallel/test-crypto-cipher-decipher.js
@@ -216,7 +216,7 @@ testCipher2(Buffer.from('0123456789abcdef'));
 // setAutoPadding/setAuthTag/setAAD should return `this`
 {
   const key = '0123456789';
-  const tagbuf = Buffer.from('tagbuf');
+  const tagbuf = Buffer.from('auth_tag');
   const aadbuf = Buffer.from('aadbuf');
   const decipher = crypto.createDecipher('aes-256-gcm', key);
   assert.strictEqual(decipher.setAutoPadding(), decipher);
diff --git a/test/parallel/test-http2-respond-file-fd-invalid.js b/test/parallel/test-http2-respond-file-fd-invalid.js
@@ -3,8 +3,10 @@
 const common = require('../common');
 if (!common.hasCrypto)
   common.skip('missing crypto');
-const http2 = require('http2');
+
 const assert = require('assert');
+const fs = require('fs');
+const http2 = require('http2');
 
 const {
   NGHTTP2_INTERNAL_ERROR
@@ -18,7 +20,16 @@ const errorCheck = common.expectsError({
 
 const server = http2.createServer();
 server.on('stream', (stream) => {
-  stream.respondWithFD(common.firstInvalidFD());
+  let fd = 2;
+
+  // Get first known bad file descriptor.
+  try {
+    while (fs.fstatSync(++fd));
+  } catch (e) {
+    // do nothing; we now have an invalid fd
+  }
+
+  stream.respondWithFD(fd);
   stream.on('error', common.mustCall(errorCheck));
 });
 server.listen(0, () => {
diff --git a/test/parallel/test-listen-fd-ebadf.js b/test/parallel/test-listen-fd-ebadf.js
@@ -21,12 +21,24 @@
 
 'use strict';
 const common = require('../common');
+
 const assert = require('assert');
+const fs = require('fs');
 const net = require('net');
 
 net.createServer(common.mustNotCall()).listen({ fd: 2 })
   .on('error', common.mustCall(onError));
-net.createServer(common.mustNotCall()).listen({ fd: 42 })
+
+let invalidFd = 2;
+
+// Get first known bad file descriptor.
+try {
+  while (fs.fstatSync(++invalidFd));
+} catch (e) {
+  // do nothing; we now have an invalid fd
+}
+
+net.createServer(common.mustNotCall()).listen({ fd: invalidFd })
   .on('error', common.mustCall(onError));
 
 function onError(ex) {
diff --git a/test/parallel/test-repl-definecommand.js b/test/parallel/test-repl-definecommand.js
@@ -23,14 +23,14 @@ r.defineCommand('say1', {
   help: 'help for say1',
   action: function(thing) {
     output = '';
-    this.write(`hello ${thing}`);
+    this.output.write(`hello ${thing}\n`);
     this.displayPrompt();
   }
 });
 
 r.defineCommand('say2', function() {
   output = '';
-  this.write('hello from say2');
+  this.output.write('hello from say2\n');
   this.displayPrompt();
 });
 
@@ -39,6 +39,12 @@ assert(/\n\.say1     help for say1\n/.test(output),
        'help for say1 not present');
 assert(/\n\.say2\n/.test(output), 'help for say2 not present');
 inputStream.write('.say1 node developer\n');
-assert(/> hello node developer/.test(output), 'say1 outputted incorrectly');
+assert.ok(output.startsWith('hello node developer\n'),
+          `say1 output starts incorrectly: "${output}"`);
+assert.ok(output.includes('> '),
+          `say1 output does not include prompt: "${output}"`);
 inputStream.write('.say2 node developer\n');
-assert(/> hello from say2/.test(output), 'say2 outputted incorrectly');
+assert.ok(output.startsWith('hello from say2\n'),
+          `say2 output starts incorrectly: "${output}"`);
+assert.ok(output.includes('> '),
+          `say2 output does not include prompt: "${output}"`);
diff --git a/test/sequential/test-async-wrap-getasyncid.js b/test/sequential/test-async-wrap-getasyncid.js

Original file line number	Diff line number	Diff line change
`@@ -544,9 +544,6 @@ void Coverage::SelectMode(Isolate* isolate, debug::Coverage::Mode mode) {`
`544`	`544`	`if (!shared->IsSubjectToDebugging()) continue;`
`545`	`545`	`vector->clear_invocation_count();`
`546`	`546`	`vectors.emplace_back(vector, isolate);`
`547`		`- } else if (current_obj->IsJSFunction()) {`
`548`		`- JSFunction* function = JSFunction::cast(current_obj);`
`549`		`- function->set_code(function->shared()->code());`
`550`	`547`	`}`
`551`	`548`	`}`
`552`	`549`	`}`