tls: fix convertALPNProtocols accepting ArrayBufferViews

LiviaMedeiros · bengl · commit 447bbd0d662d · 2022-05-30T12:59:37.000-04:00
PR-URL: #43211 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
diff --git a/lib/tls.js b/lib/tls.js
@@ -54,7 +54,11 @@ const {
 } = require('internal/errors').codes;
 const internalUtil = require('internal/util');
 internalUtil.assertCrypto();
-const { isArrayBufferView } = require('internal/util/types');
+const {
+ isArrayBufferView,
+ isDataView,
+ isUint8Array,
+} = require('internal/util/types');
 
 const net = require('net');
 const { getOptionValue } = require('internal/options');
@@ -143,9 +147,16 @@ exports.convertALPNProtocols = function convertALPNProtocols(protocols, out) {
 // If protocols is Array - translate it into buffer
 if (ArrayIsArray(protocols)) {
 out.ALPNProtocols = convertProtocols(protocols);
- } else if (isArrayBufferView(protocols)) {
+ } else if (Buffer.isBuffer(protocols) || isUint8Array(protocols)) {
 // Copy new buffer not to be modified by user.
 out.ALPNProtocols = Buffer.from(protocols);
+ } else if (isDataView(protocols)) {
+ out.ALPNProtocols = Buffer.from(protocols.buffer.slice(
+ protocols.byteOffset,
+ protocols.byteOffset + protocols.byteLength
+ ));
+ } else if (isArrayBufferView(protocols)) {
+ out.ALPNProtocols = Buffer.from(protocols.slice().buffer);
 }
 };
 
diff --git a/test/parallel/test-tls-basic-validations.js b/test/parallel/test-tls-basic-validations.js
@@ -103,8 +103,11 @@ assert.throws(
 const inputBuffer = Buffer.from(arrayBufferViewStr.repeat(8), 'utf8');
 for (const expectView of common.getArrayBufferViews(inputBuffer)) {
 const out = {};
+ const expected = Buffer.from(expectView.buffer.slice(),
+ expectView.byteOffset,
+ expectView.byteLength);
 tls.convertALPNProtocols(expectView, out);
- assert(out.ALPNProtocols.equals(Buffer.from(expectView)));
+ assert(out.ALPNProtocols.equals(expected));
 }
 }
 

-Original file line number
+Diff line change
 }=require('internal/errors').codes;
 constinternalUtil=require('internal/util');
 internalUtil.assertCrypto();
 -const{ isArrayBufferView }=require('internal/util/types');
 +const{
 + isArrayBufferView,
 + isDataView,
 + isUint8Array,
 +}=require('internal/util/types');
 constnet=require('net');
 const{ getOptionValue }=require('internal/options');
 // If protocols is Array - translate it into buffer
 if(ArrayIsArray(protocols)){
 out.ALPNProtocols=convertProtocols(protocols);
 -}elseif(isArrayBufferView(protocols)){
 +}elseif(Buffer.isBuffer(protocols)||isUint8Array(protocols)){
 // Copy new buffer not to be modified by user.
 out.ALPNProtocols=Buffer.from(protocols);
 +}elseif(isDataView(protocols)){
 +out.ALPNProtocols=Buffer.from(protocols.buffer.slice(
 +protocols.byteOffset,
 +protocols.byteOffset+protocols.byteLength
 +));
 +}elseif(isArrayBufferView(protocols)){
 +out.ALPNProtocols=Buffer.from(protocols.slice().buffer);
+}
 };
Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,11 @@ assert.throws(`
`103`	`103`	`constinputBuffer=Buffer.from(arrayBufferViewStr.repeat(8),'utf8');`
`104`	`104`	`for(constexpectViewofcommon.getArrayBufferViews(inputBuffer)){`
`105`	`105`	`constout={};`
	`106`	`+constexpected=Buffer.from(expectView.buffer.slice(),`
	`107`	`+expectView.byteOffset,`
	`108`	`+expectView.byteLength);`
`106`	`109`	`tls.convertALPNProtocols(expectView,out);`
`107`		`-assert(out.ALPNProtocols.equals(Buffer.from(expectView)));`
	`110`	`+assert(out.ALPNProtocols.equals(expected));`
`108`	`111`	`}`
`109`	`112`	`}`
`110`	`113`