diff --git a/doc/api/errors.md b/doc/api/errors.md index fa56c7a5295ab6..981ed8eefe1958 100644 --- a/doc/api/errors.md +++ b/doc/api/errors.md @@ -754,6 +754,11 @@ more headers. Used when an invalid character is found in an HTTP response status message (reason phrase). + +### ERR_HTTP_INVALID_HEADER_VALUE + +Used to indicate that an invalid HTTP header value has been specified. + ### ERR_HTTP_INVALID_STATUS_CODE diff --git a/lib/_http_outgoing.js b/lib/_http_outgoing.js index 76d83b19218ceb..b4cfe61d86bf0d 100644 --- a/lib/_http_outgoing.js +++ b/lib/_http_outgoing.js @@ -437,16 +437,7 @@ function _storeHeader(firstLine, headers) { function storeHeader(self, state, key, value, validate) { if (validate) { - if (typeof key !== 'string' || !key || !checkIsHttpToken(key)) { - throw new errors.TypeError( - 'ERR_INVALID_HTTP_TOKEN', 'Header name', key); - } - if (value === undefined) { - throw new errors.TypeError('ERR_MISSING_ARGS', `header "${key}"`); - } else if (checkInvalidHeaderChar(value)) { - debug('Header "%s" contains invalid characters', key); - throw new errors.TypeError('ERR_INVALID_CHAR', 'header content', key); - } + validateHeader(key, value); } state.header += key + ': ' + escapeHeaderValue(value) + CRLF; matchHeader(self, state, key, value); @@ -494,20 +485,27 @@ function matchHeader(self, state, field, value) { } } -function validateHeader(msg, name, value) { - if (typeof name !== 'string' || !name || !checkIsHttpToken(name)) - throw new errors.TypeError('ERR_INVALID_HTTP_TOKEN', 'Header name', name); - if (value === undefined) - throw new errors.TypeError('ERR_MISSING_ARGS', 'value'); - if (msg._header) - throw new errors.Error('ERR_HTTP_HEADERS_SENT', 'set'); - if (checkInvalidHeaderChar(value)) { +function validateHeader(name, value) { + let err; + if (typeof name !== 'string' || !name || !checkIsHttpToken(name)) { + err = new errors.TypeError('ERR_INVALID_HTTP_TOKEN', 'Header name', name); + } else if (value === undefined) { + err = new errors.TypeError('ERR_HTTP_INVALID_HEADER_VALUE', value, name); + } else if (checkInvalidHeaderChar(value)) { debug('Header "%s" contains invalid characters', name); - throw new errors.TypeError('ERR_INVALID_CHAR', 'header content', name); + err = new errors.TypeError('ERR_INVALID_CHAR', 'header content', name); + } + if (err !== undefined) { + Error.captureStackTrace(err, validateHeader); + throw err; } } + OutgoingMessage.prototype.setHeader = function setHeader(name, value) { - validateHeader(this, name, value); + if (this._header) { + throw new errors.Error('ERR_HTTP_HEADERS_SENT', 'set'); + } + validateHeader(name, value); if (!this[outHeadersKey]) this[outHeadersKey] = {}; diff --git a/lib/internal/errors.js b/lib/internal/errors.js index d13a8e85de0917..01cff7d2233328 100644 --- a/lib/internal/errors.js +++ b/lib/internal/errors.js @@ -317,6 +317,7 @@ E('ERR_HTTP2_UNSUPPORTED_PROTOCOL', E('ERR_HTTP_HEADERS_SENT', 'Cannot %s headers after they are sent to the client'); E('ERR_HTTP_INVALID_CHAR', 'Invalid character in statusMessage.'); +E('ERR_HTTP_INVALID_HEADER_VALUE', 'Invalid value "%s" for header "%s"'); E('ERR_HTTP_INVALID_STATUS_CODE', (originalStatusCode) => `Invalid status code: ${originalStatusCode}`); E('ERR_HTTP_TRAILER_INVALID', diff --git a/test/parallel/test-http-mutable-headers.js b/test/parallel/test-http-mutable-headers.js index 929a566caf5578..2473a08eb1978e 100644 --- a/test/parallel/test-http-mutable-headers.js +++ b/test/parallel/test-http-mutable-headers.js @@ -61,9 +61,9 @@ const s = http.createServer(common.mustCall((req, res) => { common.expectsError( () => res.setHeader('someHeader'), { - code: 'ERR_MISSING_ARGS', + code: 'ERR_HTTP_INVALID_HEADER_VALUE', type: TypeError, - message: 'The "value" argument must be specified' + message: 'Invalid value "undefined" for header "someHeader"' } ); common.expectsError( diff --git a/test/parallel/test-http-outgoing-proto.js b/test/parallel/test-http-outgoing-proto.js index 22eba0981f6fc2..7db252dfbf9855 100644 --- a/test/parallel/test-http-outgoing-proto.js +++ b/test/parallel/test-http-outgoing-proto.js @@ -34,9 +34,9 @@ assert.throws(() => { const outgoingMessage = new OutgoingMessage(); outgoingMessage.setHeader('test'); }, common.expectsError({ - code: 'ERR_MISSING_ARGS', + code: 'ERR_HTTP_INVALID_HEADER_VALUE', type: TypeError, - message: 'The "value" argument must be specified' + message: 'Invalid value "undefined" for header "test"' })); assert.throws(() => { diff --git a/test/parallel/test-http-write-head.js b/test/parallel/test-http-write-head.js index 70ad5935a92690..e254f8d64da349 100644 --- a/test/parallel/test-http-write-head.js +++ b/test/parallel/test-http-write-head.js @@ -44,9 +44,9 @@ const s = http.createServer(common.mustCall((req, res) => { common.expectsError( () => res.setHeader('foo', undefined), { - code: 'ERR_MISSING_ARGS', + code: 'ERR_HTTP_INVALID_HEADER_VALUE', type: TypeError, - message: 'The "value" argument must be specified' + message: 'Invalid value "undefined" for header "foo"' } );