Fix validation of IPv4 four-part decimals containing individual zeroes

Fixes #103
whitequark · May 11, 2018 · 845a4f2 · 845a4f2
1 parent c645e0b
commit 845a4f2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/ipaddr.min.js b/ipaddr.min.js
diff --git a/lib/ipaddr.js b/lib/ipaddr.js
@@ -451,7 +451,7 @@
   };
 
   ipaddr.IPv4.isValidFourPartDecimal = function(string) {
-    if (ipaddr.IPv4.isValid(string) && string.match(/^[1-9]\d*(\.[1-9]\d*){3}$/)) {
+    if (ipaddr.IPv4.isValid(string) && string.match(/^(0|[1-9]\d*)(\.(0|[1-9]\d*)){3}$/)) {
       return true;
     } else {
       return false;

diff --git a/src/ipaddr.coffee b/src/ipaddr.coffee
@@ -414,7 +414,7 @@ ipaddr.IPv4.isValid = (string) ->
     return false
 
 ipaddr.IPv4.isValidFourPartDecimal = (string) ->
-  if ipaddr.IPv4.isValid(string) and string.match(/^[1-9]\d*(\.[1-9]\d*){3}$/)
+  if ipaddr.IPv4.isValid(string) and string.match(/^(0|[1-9]\d*)(\.(0|[1-9]\d*)){3}$/)
     return true
   else
     return false

diff --git a/test/ipaddr.test.coffee b/test/ipaddr.test.coffee
@@ -110,6 +110,8 @@ module.exports =
     test.done()
 
   'checks the conventional IPv4 address format': (test) ->
+      test.equal(ipaddr.IPv4.isValidFourPartDecimal('0.0.0.0'),  true)
+      test.equal(ipaddr.IPv4.isValidFourPartDecimal('127.0.0.1'),  true)
       test.equal(ipaddr.IPv4.isValidFourPartDecimal('192.168.1.1'),  true)
       test.equal(ipaddr.IPv4.isValidFourPartDecimal('0xc0.168.1.1'), false)
       test.done()