Fix "class notations" parsing

Author: rs

lib/netmask.coffee

@@ -19,9 +19,29 @@ ip2long = (ip) ->
         b.push(n)
     if ip.length != 0
         throw new Error('Invalid IP')
-    while b.length < 4
-        b.unshift(0)
-    return (b[0] << 24 | b[1] << 16 | b[2] << 8 | b[3]) >>> 0
+    switch b.length
+        when 1
+            # Long input notation
+            if b[0] > 0xFFFFFFFF
+                throw new Error('Invalid IP')
+            return b[0] >>> 0
+        when 2
+            # Class A notation
+            if b[0] > 0xFF or b[1] > 0xFFFFFF
+                throw new Error('Invalid IP')
+            return (b[0] << 24 | b[1]) >>> 0
+        when 3
+            # Class B notation
+            if b[0] > 0xFF or b[1] > 0xFF or b[2] > 0xFFFF
+                throw new Error('Invalid IP')
+            return (b[0] << 24 | b[1] << 16 | b[2]) >>> 0
+        when 4
+            # Dotted quad notation 
+            if b[0] > 0xFF or b[1] > 0xFF or b[2] > 0xFF or b[3] > 0xFF
+                throw new Error('Invalid IP')
+            return (b[0] << 24 | b[1] << 16 | b[2] << 8 | b[3]) >>> 0
+        else
+            throw new Error('Invalid IP')
 
 chr = (b) ->
     return b.charCodeAt(0)
@@ -46,18 +66,18 @@ atob = (s) ->
     start = i
     while s.length > 0
         if '0' <= s[i] and s[i] <= dmax
-            n = n*base + (chr(s[i])-chr0)
+            n = (n*base + (chr(s[i])-chr0)) >>> 0
         else if base == 16
             if 'a' <= s[i] and s[i] <= 'f'
-                n = n*base + (10+chr(s[i])-chra)
+                n = (n*base + (10+chr(s[i])-chra)) >>> 0
             else if 'A' <= s[i] and s[i] <= 'F'
-                n = n*base + (10+chr(s[i])-chrA)
+                n = (n*base + (10+chr(s[i])-chrA)) >>> 0
             else
                 break
         else
             break
-        if n > 0xFF
-            throw new Error('byte overflow')
+        if n > 0xFFFFFFFF
+            throw new Error('too large')
         i++
     if i == start
         throw new Error('empty octet')

test/badnets.coffee

@@ -26,11 +26,11 @@ vows.describe('IPs with bytes greater than 255')
         '209.500.70.33/19': shouldFailWithError 'Invalid net'
         '140.999.82': shouldFailWithError 'Invalid net'
         '899.174': shouldFailWithError 'Invalid net'
-        '900': shouldFailWithError 'Invalid net'
-        '209.157.300/19': shouldFailWithError 'Invalid net'
+        '209.157.65536/19': shouldFailWithError 'Invalid net'
         '209.300.64.0.10': shouldFailWithError 'Invalid net'
         'garbage': shouldFailWithError 'Invalid net'
     .export(module)
+    
 
 vows.describe('Invalid IP format')
     .addBatch

test/netmasks.coffee

@@ -10,14 +10,19 @@ fixtures =
     ['209.157.68.22',               '255.255.224.0',    '209.157.64.0',     '255.255.224.0',    19]
     ['209.157.70.33/19',            null,               '209.157.64.0',     '255.255.224.0',    19]
     ['209.157.70.33',               null,               '209.157.70.33',    '255.255.255.255',  32]
-    ['140.174.82',                  null,               '0.140.174.82',     '255.255.255.255',  32]
-    ['140.174',                     null,               '0.0.140.174',      '255.255.255.255',  32]
+    ['140.174.82',                  null,               '140.174.0.82',     '255.255.255.255',  32]
+    ['140.174',                     null,               '140.0.0.174',      '255.255.255.255',  32]
     ['10',                          null,               '0.0.0.10',         '255.255.255.255',  32]
     ['10/8',                        null,               '0.0.0.0',          '255.0.0.0',        8]
-    ['209.157.64/19',               null,               '0.209.128.0',      '255.255.224.0',    19]
+    ['209.157.64/19',               null,               '209.157.0.0',      '255.255.224.0',    19]
     ['216.140.48.16/32',            null,               '216.140.48.16',    '255.255.255.255',  32]
-    ['209.157/17',                  null,               '0.0.128.0',        '255.255.128.0',    17]
+    ['209.157/17',                  null,               '209.0.0.0',        '255.255.128.0',    17]
     ['0.0.0.0/0',                   null,               '0.0.0.0',          '0.0.0.0',          0]
+    ['0xffffffff',                  null,               '255.255.255.255',  '255.255.255.255',  32]
+    ['1.1',                         null,               '1.0.0.1',          '255.255.255.255',  32]
+    ['1.0xffffff',                  null,               '1.255.255.255',    '255.255.255.255',  32]
+    ['1.2.3',                       null,               '1.2.0.3',          '255.255.255.255',  32]
+    ['1.2.0xffff',                  null,               '1.2.255.255',      '255.255.255.255',  32]
 ]
 
 contexts = []