Add support for IPv4 trailing and leading zeros

whitequark · Apr 6, 2018 · d591d47 · d591d47
1 parent 2906429
commit d591d47
Show file tree

Hide file tree

Showing 4 changed files with 10 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(/^\d+(\.\d+){3}$/)) {
+    if (ipaddr.IPv4.isValid(string) && string.match(/^[1-9]\d*(\.[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(/^\d+(\.\d+){3}$/)
+  if ipaddr.IPv4.isValid(string) and string.match(/^[1-9]\d*(\.[1-9]\d*){3}$/)
     return true
   else
     return false

diff --git a/test/ipaddr.test.coffee b/test/ipaddr.test.coffee
@@ -114,6 +114,13 @@ module.exports =
       test.equal(ipaddr.IPv4.isValidFourPartDecimal('0xc0.168.1.1'), false)
       test.done()
 
+  'refuses to construct IPv4 address with trailing and leading zeros': (test) ->
+      test.equal(ipaddr.IPv4.isValidFourPartDecimal('000000192.168.100.2'), false)
+      test.equal(ipaddr.IPv4.isValidFourPartDecimal('192.0000168.100.2'), false)
+      test.equal(ipaddr.IPv4.isValidFourPartDecimal('192.168.100.00000002'), false)
+      test.equal(ipaddr.IPv4.isValidFourPartDecimal('192.168.100.20000000'), false)
+      test.done() 
+
   'can construct IPv6 from 16bit parts': (test) ->
     test.doesNotThrow ->
       new ipaddr.IPv6([0x2001, 0xdb8, 0xf53a, 0, 0, 0, 0, 1])