Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

http: throw error if options of http.Server is array #46283

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions lib/_http_server.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,12 @@ const {
ERR_HTTP_HEADERS_SENT,
ERR_HTTP_INVALID_STATUS_CODE,
ERR_HTTP_SOCKET_ENCODING,
ERR_INVALID_ARG_TYPE,
ERR_INVALID_ARG_VALUE,
ERR_INVALID_CHAR
} = codes;
const {
kEmptyObject,
} = require('internal/util');
const {
validateInteger,
validateBoolean,
Expand Down Expand Up @@ -433,9 +435,6 @@ function storeHTTPOptions(options) {
validateBoolean(insecureHTTPParser, 'options.insecureHTTPParser');
this.insecureHTTPParser = insecureHTTPParser;

if (options.noDelay === undefined)
options.noDelay = true;

const requestTimeout = options.requestTimeout;
if (requestTimeout !== undefined) {
validateInteger(requestTimeout, 'requestTimeout', 0);
Expand Down Expand Up @@ -502,17 +501,17 @@ function Server(options, requestListener) {

if (typeof options === 'function') {
requestListener = options;
options = {};
} else if (options == null || typeof options === 'object') {
options = { ...options };
options = kEmptyObject;
} else if (options == null) {
options = kEmptyObject;
} else {
throw new ERR_INVALID_ARG_TYPE('options', 'object', options);
validateObject(options, 'options');
}

storeHTTPOptions.call(this, options);
net.Server.call(
this,
{ allowHalfOpen: true, noDelay: options.noDelay,
{ allowHalfOpen: true, noDelay: options.noDelay ?? true,
keepAlive: options.keepAlive,
keepAliveInitialDelay: options.keepAliveInitialDelay });

Expand Down
26 changes: 16 additions & 10 deletions lib/https.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,25 +53,31 @@ let debug = require('internal/util/debuglog').debuglog('https', (fn) => {
debug = fn;
});
const { URL, urlToHttpOptions, searchParamsSymbol } = require('internal/url');
const { validateObject } = require('internal/validators');

function Server(opts, requestListener) {
if (!(this instanceof Server)) return new Server(opts, requestListener);

if (typeof opts === 'function') {
requestListener = opts;
opts = undefined;
}
opts = { ...opts };

if (!opts.ALPNProtocols) {
// http/1.0 is not defined as Protocol IDs in IANA
// https://www.iana.org/assignments/tls-extensiontype-values
// /tls-extensiontype-values.xhtml#alpn-protocol-ids
opts.ALPNProtocols = ['http/1.1'];
opts = kEmptyObject;
} else if (opts == null) {
opts = kEmptyObject;
} else {
validateObject(opts, 'options');
}

FunctionPrototypeCall(storeHTTPOptions, this, opts);
FunctionPrototypeCall(tls.Server, this, opts, _connectionListener);
FunctionPrototypeCall(tls.Server, this,
{
noDelay: true,
// http/1.0 is not defined as Protocol IDs in IANA
// https://www.iana.org/assignments/tls-extensiontype-values
// /tls-extensiontype-values.xhtml#alpn-protocol-ids
ALPNProtocols: ['http/1.1'],
...opts,
lpinca marked this conversation as resolved.
Show resolved Hide resolved
},
_connectionListener);

this.httpAllowHalfOpen = false;

Expand Down
5 changes: 1 addition & 4 deletions test/parallel/test-http-server.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,7 @@ const http = require('http');
const url = require('url');
const qs = require('querystring');

// TODO: documentation does not allow Array as an option, so testing that
// should fail, but currently http.Server does not typecheck further than
// if `option` is `typeof object` - so we don't test that here right now
const invalid_options = [ 'foo', 42, true ];
const invalid_options = [ 'foo', 42, true, [] ];

invalid_options.forEach((option) => {
assert.throws(() => {
Expand Down
9 changes: 9 additions & 0 deletions test/parallel/test-https-simple.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,15 @@ const serverCallback = common.mustCall(function(req, res) {
res.end(body);
});

const invalid_options = [ 'foo', 42, true, [] ];
invalid_options.forEach((option) => {
assert.throws(() => {
new https.Server(option);
}, {
code: 'ERR_INVALID_ARG_TYPE',
});
});

const server = https.createServer(options, serverCallback);

server.listen(0, common.mustCall(() => {
Expand Down