http2: improve errors thrown in header validation

PR-URL: #16718 Reviewed-By: Anatoli Papirovski <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>

Author: joyeecheung

doc/api/errors.md

@@ -808,7 +808,7 @@ requests and responses.
 <aid="ERR_HTTP2_INVALID_HEADER_VALUE"></a>
 ### ERR_HTTP2_INVALID_HEADER_VALUE
 
-Used to indicate that an invalid HTTP/2 header value has been specified.
+Used to indicate that an invalid HTTP2 header value has been specified.
 
 <aid="ERR_HTTP2_INVALID_INFO_STATUS"></a>
 ### ERR_HTTP2_INVALID_INFO_STATUS

lib/internal/errors.js

@@ -202,7 +202,7 @@ E('ERR_HTTP2_INFO_STATUS_NOT_ALLOWED',
 'Informational status codes cannot be used');
 E('ERR_HTTP2_INVALID_CONNECTION_HEADERS',
 'HTTP/1 Connection specific headers are forbidden: "%s"');
-E('ERR_HTTP2_INVALID_HEADER_VALUE','Value must not be undefined or null');
+E('ERR_HTTP2_INVALID_HEADER_VALUE','Invalid value "%s" for header "%s"');
 E('ERR_HTTP2_INVALID_INFO_STATUS',
 (code)=>`Invalid informational status code: ${code}`);
 E('ERR_HTTP2_INVALID_PACKED_SETTINGS_LENGTH',

lib/internal/http2/compat.js

@@ -40,12 +40,18 @@ let statusMessageWarned = false;
 // close as possible to the current require('http') API
 
 functionassertValidHeader(name,value){
-if(name===''||typeofname!=='string')
-thrownewerrors.TypeError('ERR_INVALID_HTTP_TOKEN','Header name',name);
-if(isPseudoHeader(name))
-thrownewerrors.Error('ERR_HTTP2_PSEUDOHEADER_NOT_ALLOWED');
-if(value===undefined||value===null)
-thrownewerrors.TypeError('ERR_HTTP2_INVALID_HEADER_VALUE');
+leterr;
+if(name===''||typeofname!=='string'){
+err=newerrors.TypeError('ERR_INVALID_HTTP_TOKEN','Header name',name);
+}elseif(isPseudoHeader(name)){
+err=newerrors.Error('ERR_HTTP2_PSEUDOHEADER_NOT_ALLOWED');
+}elseif(value===undefined||value===null){
+err=newerrors.TypeError('ERR_HTTP2_INVALID_HEADER_VALUE',value,name);
+}
+if(err!==undefined){
+Error.captureStackTrace(err,assertValidHeader);
+throwerr;
+}
 }
 
 functionisPseudoHeader(name){

test/parallel/test-http2-compat-serverresponse-headers.js

@@ -85,14 +85,14 @@ server.listen(0, common.mustCall(function(){
 },common.expectsError({
 code: 'ERR_HTTP2_INVALID_HEADER_VALUE',
 type: TypeError,
-message: 'Value must not be undefined or null'
+message: 'Invalid value "null" for header "foo-bar"'
 }));
 assert.throws(function(){
 response.setHeader(real,undefined);
 },common.expectsError({
 code: 'ERR_HTTP2_INVALID_HEADER_VALUE',
 type: TypeError,
-message: 'Value must not be undefined or null'
+message: 'Invalid value "undefined" for header "foo-bar"'
 }));
 common.expectsError(
 ()=>response.setHeader(),// header name undefined

test/parallel/test-http2-compat-serverresponse-trailers.js

@@ -28,15 +28,15 @@ server.listen(0, common.mustCall(() =>{
 {
 code: 'ERR_HTTP2_INVALID_HEADER_VALUE',
 type: TypeError,
-message: 'Value must not be undefined or null'
+message: 'Invalid value "undefined" for header "test"'
 }
 );
 common.expectsError(
 ()=>response.setTrailer('test',null),
 {
 code: 'ERR_HTTP2_INVALID_HEADER_VALUE',
 type: TypeError,
-message: 'Value must not be undefined or null'
+message: 'Invalid value "null" for header "test"'
 }
 );
 common.expectsError(