diff --git a/lib/net.js b/lib/net.js index 2442bcdee36cd4..dfce8cf7e8710c 100644 --- a/lib/net.js +++ b/lib/net.js @@ -1571,12 +1571,12 @@ exports.isIP = cares.isIP; exports.isIPv4 = function(input) { - return exports.isIP(input) === 4; + return cares.isIPv4(input); }; exports.isIPv6 = function(input) { - return exports.isIP(input) === 6; + return cares.isIPv6(input); }; diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc index 62ad44bd992f24..a23b839fbb7575 100644 --- a/src/cares_wrap.cc +++ b/src/cares_wrap.cc @@ -1087,6 +1087,27 @@ static void IsIP(const FunctionCallbackInfo& args) { args.GetReturnValue().Set(rc); } +static void IsIPv4(const FunctionCallbackInfo& args) { + node::Utf8Value ip(args.GetIsolate(), args[0]); + char address_buffer[sizeof(struct in_addr)]; + + if (uv_inet_pton(AF_INET, *ip, &address_buffer) == 0) { + args.GetReturnValue().Set(true); + } else { + args.GetReturnValue().Set(false); + } +} + +static void IsIPv6(const FunctionCallbackInfo& args) { + node::Utf8Value ip(args.GetIsolate(), args[0]); + char address_buffer[sizeof(struct in6_addr)]; + + if (uv_inet_pton(AF_INET6, *ip, &address_buffer) == 0) { + args.GetReturnValue().Set(true); + } else { + args.GetReturnValue().Set(false); + } +} static void GetAddrInfo(const FunctionCallbackInfo& args) { Environment* env = Environment::GetCurrent(args); @@ -1327,6 +1348,8 @@ static void Initialize(Local target, env->SetMethod(target, "getaddrinfo", GetAddrInfo); env->SetMethod(target, "getnameinfo", GetNameInfo); env->SetMethod(target, "isIP", IsIP); + env->SetMethod(target, "isIPv4", IsIPv4); + env->SetMethod(target, "isIPv6", IsIPv6); env->SetMethod(target, "strerror", StrError); env->SetMethod(target, "getServers", GetServers); diff --git a/test/parallel/test-net-isip.js b/test/parallel/test-net-isip.js index 76432ed3488240..6b159b59d8c8c0 100644 --- a/test/parallel/test-net-isip.js +++ b/test/parallel/test-net-isip.js @@ -31,11 +31,40 @@ assert.equal(net.isIP('0000:0000:0000:0000:0000:0000:12345:0000'), 0); assert.equal(net.isIP('0'), 0); assert.equal(net.isIP(), 0); assert.equal(net.isIP(''), 0); +assert.equal(net.isIP(null), 0); +assert.equal(net.isIP(123), 0); +assert.equal(net.isIP(true), 0); +assert.equal(net.isIP({}), 0); +assert.equal(net.isIP({ toString: () => '::2001:252:1:255.255.255.255' }), 6); +assert.equal(net.isIP({ toString: () => '127.0.0.1' }), 4); +assert.equal(net.isIP({ toString: () => 'bla' }), 0); assert.equal(net.isIPv4('127.0.0.1'), true); assert.equal(net.isIPv4('example.com'), false); assert.equal(net.isIPv4('2001:252:0:1::2008:6'), false); +assert.equal(net.isIPv4(), false); +assert.equal(net.isIPv4(''), false); +assert.equal(net.isIPv4(null), false); +assert.equal(net.isIPv4(123), false); +assert.equal(net.isIPv4(true), false); +assert.equal(net.isIPv4({}), false); +assert.equal(net.isIPv4({ + toString: () => '::2001:252:1:255.255.255.255' +}), false); +assert.equal(net.isIPv4({ toString: () => '127.0.0.1' }), true); +assert.equal(net.isIPv4({ toString: () => 'bla' }), false); assert.equal(net.isIPv6('127.0.0.1'), false); assert.equal(net.isIPv6('example.com'), false); assert.equal(net.isIPv6('2001:252:0:1::2008:6'), true); +assert.equal(net.isIPv6(), false); +assert.equal(net.isIPv6(''), false); +assert.equal(net.isIPv6(null), false); +assert.equal(net.isIPv6(123), false); +assert.equal(net.isIPv6(true), false); +assert.equal(net.isIPv6({}), false); +assert.equal(net.isIPv6({ + toString: () => '::2001:252:1:255.255.255.255' +}), true); +assert.equal(net.isIPv6({ toString: () => '127.0.0.1' }), false); +assert.equal(net.isIPv6({ toString: () => 'bla' }), false);