From feb6e1ffb86c57f8a37556f8c6a4232787b15e43 Mon Sep 17 00:00:00 2001
From: Pranshu Srivastava <rexagod@gmail.com>
Date: Sun, 3 May 2020 11:02:13 +0530
Subject: [PATCH] http: don't throw on `Uint8Array`s for
 `http.ServerResponse#write`

Don't throw errors on Uint8Arrays and added test for all
valid types.

Backport-PR-URL: https://github.com/nodejs/node/pull/33490
PR-URL: https://github.com/nodejs/node/pull/33155
Fixes: https://github.com/nodejs/node/issues/33379
Refs: https://github.com/nodejs/node/issues/29829
Reviewed-By: Robert Nagy <ronagy@icloud.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Zeyu Yang <himself65@outlook.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 lib/_http_outgoing.js                         |  5 ++--
 test/parallel/test-http-outgoing-proto.js     |  4 ++--
 .../test-http-outgoing-write-types.js         | 24 +++++++++++++++++++
 3 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 test/parallel/test-http-outgoing-write-types.js

diff --git a/lib/_http_outgoing.js b/lib/_http_outgoing.js
index 6e1888c6f6dd12..aba05590dc25c3 100644
--- a/lib/_http_outgoing.js
+++ b/lib/_http_outgoing.js
@@ -61,6 +61,7 @@ const {
   hideStackFrames
 } = require('internal/errors');
 const { validateString } = require('internal/validators');
+const { isUint8Array } = require('internal/util/types');
 
 const HIGH_WATER_MARK = getDefaultHighWaterMark();
 const { CRLF, debug } = common;
@@ -669,9 +670,9 @@ function write_(msg, chunk, encoding, callback, fromEnd) {
     return true;
   }
 
-  if (!fromEnd && typeof chunk !== 'string' && !(chunk instanceof Buffer)) {
+  if (!fromEnd && typeof chunk !== 'string' && !(isUint8Array(chunk))) {
     throw new ERR_INVALID_ARG_TYPE('first argument',
-                                   ['string', 'Buffer'], chunk);
+                                   ['string', 'Buffer', 'Uint8Array'], chunk);
   }
 
   if (!fromEnd && msg.socket && !msg.socket.writableCorked) {
diff --git a/test/parallel/test-http-outgoing-proto.js b/test/parallel/test-http-outgoing-proto.js
index 4a07d18c601c5c..6968b7b0450168 100644
--- a/test/parallel/test-http-outgoing-proto.js
+++ b/test/parallel/test-http-outgoing-proto.js
@@ -83,7 +83,7 @@ assert.throws(() => {
   code: 'ERR_INVALID_ARG_TYPE',
   name: 'TypeError',
   message: 'The first argument must be of type string or an instance of ' +
-           'Buffer. Received undefined'
+           'Buffer or Uint8Array. Received undefined'
 });
 
 assert.throws(() => {
@@ -93,7 +93,7 @@ assert.throws(() => {
   code: 'ERR_INVALID_ARG_TYPE',
   name: 'TypeError',
   message: 'The first argument must be of type string or an instance of ' +
-           'Buffer. Received type number (1)'
+           'Buffer or Uint8Array. Received type number (1)'
 });
 
 // addTrailers()
diff --git a/test/parallel/test-http-outgoing-write-types.js b/test/parallel/test-http-outgoing-write-types.js
new file mode 100644
index 00000000000000..6257b87eea8eb1
--- /dev/null
+++ b/test/parallel/test-http-outgoing-write-types.js
@@ -0,0 +1,24 @@
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+const http = require('http');
+
+const httpServer = http.createServer(common.mustCall(function(req, res) {
+  httpServer.close();
+  assert.throws(() => {
+    res.write(['Throws.']);
+  }, {
+    code: 'ERR_INVALID_ARG_TYPE'
+  });
+  // should not throw
+  res.write('1a2b3c');
+  // should not throw
+  res.write(new Uint8Array(1024));
+  // should not throw
+  res.write(Buffer.from('1'.repeat(1024)));
+  res.end();
+}));
+
+httpServer.listen(0, common.mustCall(function() {
+  http.get({ port: this.address().port });
+}));