Skip to content

Commit

Permalink
http: add --security-revert for CVE-2018-12116
Browse files Browse the repository at this point in the history
PR-URL: nodejs-private/node-private#146
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
  • Loading branch information
mcollina authored and rvagg committed Nov 27, 2018
1 parent 35344e8 commit dd20c01
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
11 changes: 10 additions & 1 deletion lib/_http_client.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ const OutgoingMessage = require('_http_outgoing').OutgoingMessage;
const Agent = require('_http_agent');
const Buffer = require('buffer').Buffer;

const REVERT_CVE_2018_12116 = process.REVERT_CVE_2018_12116;

const INVALID_PATH_REGEX = /[^\u0021-\u00ff]/;

function ClientRequest(options, cb) {
Expand Down Expand Up @@ -47,7 +49,14 @@ function ClientRequest(options, cb) {
var path;
if (options.path) {
path = String(options.path);
if (INVALID_PATH_REGEX.test(path))
var invalidPath;
if (REVERT_CVE_2018_12116) {
invalidPath = /[\u0000-\u0020]/.test(path);
} else {
invalidPath = INVALID_PATH_REGEX.test(path);
}

if (invalidPath)
throw new TypeError('Request path contains unescaped characters');
}

Expand Down
4 changes: 2 additions & 2 deletions src/node_revert.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
**/
namespace node {

#define SECURITY_REVERSIONS(XX)
// XX(CVE_2016_PEND, "CVE-2016-PEND", "Vulnerability Title")
#define SECURITY_REVERSIONS(XX) \
XX(CVE_2018_12116, "CVE-2018-12116", "HTTP request splitting")

enum reversion {
#define V(code, ...) SECURITY_REVERT_##code,
Expand Down

0 comments on commit dd20c01

Please sign in to comment.