Commit 90abdd3
net: validate custom lookup() output
This commit adds validation to the IP address returned by the
net module's custom DNS lookup() function.
PR-URL: #34813
Fixes: #34812
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Ricky Zhou <0x19951125@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>1 parent 6b45bf3 commit 90abdd3
2 files changed
Lines changed: 14 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1051,6 +1051,9 @@ function lookupAndConnect(self, options) { | |||
| 1051 | 1051 | // calls net.Socket.connect() on it (that's us). There are no event | |
| 1052 | 1052 | // listeners registered yet so defer the error event to the next tick. | |
| 1053 | 1053 | process.nextTick(connectErrorNT, self, err); | |
| 1054 | + } else if (!isIP(ip)) { | ||
| 1055 | + err = new ERR_INVALID_IP_ADDRESS(ip); | ||
| 1056 | + process.nextTick(connectErrorNT, self, err); | ||
| 1054 | 1057 | } else if (addressType !== 4 && addressType !== 6) { | |
| 1055 | 1058 | err = new ERR_INVALID_ADDRESS_FAMILY(addressType, | |
| 1056 | 1059 | options.host, | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -41,3 +41,14 @@ function check(addressType, cb) { | |||
| 41 | 41 | check(4, function() { | |
| 42 | 42 | common.hasIPv6 && check(6); | |
| 43 | 43 | }); | |
| 44 | + | ||
| 45 | + // Verify that bad lookup() IPs are handled. | ||
| 46 | + { | ||
| 47 | + net.connect({ | ||
| 48 | + host: 'localhost', | ||
| 49 | + port: 80, | ||
| 50 | + lookup(host, dnsopts, cb) { | ||
| 51 | + cb(null, undefined, 4); | ||
| 52 | + } | ||
| 53 | + }).on('error', common.expectsError({ code: 'ERR_INVALID_IP_ADDRESS' })); | ||
| 54 | + } | ||
0 commit comments