iputils: use lpeg for octet split

Author: Aaron Meihm

lpeg/CMakeLists.txt.lpeg

@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
-project(lpeg VERSION 1.0.10 LANGUAGES C)
+project(lpeg VERSION 1.0.11 LANGUAGES C)
 
 set(CPACK_PACKAGE_NAME luasandbox-${PROJECT_NAME})
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Lua LPeg Module (Parsing Expression Grammars)")

lpeg/modules/lpeg/ip_address.lua

@@ -14,11 +14,13 @@
 * `host_field` - returns the host as a Heka message field table `{value="127.0.0.1", representation="ipv4"}`
 * 'v4_field' - converts a version 4 ip address into a Heka message field
 * `v6_field` - converts a version 6 ip address into a Heka message field
+* 'v4_octets' - converts a version 4 ip address into an array of octets
 --]]
 
 -- Imports
 local string = require "string"
 local l = require "lpeg"
+local tonumber = tonumber
 l.locale(l)
 
 local M = {}
@@ -31,6 +33,8 @@ local d8    = "1" * l.digit * l.digit
               + l.digit
 v4          = d8 * "." * d8 * "." * d8 * "." * d8
 
+local octet = d8 / tonumber
+v4_octets = l.Ct(octet * "." * octet * "." * octet * "." * octet)
 
 local h16   = l.xdigit * l.xdigit^-3
 local hg    = h16 * ":"

moz_security/modules/iputils.lua

@@ -55,6 +55,7 @@ local tonumber  = tonumber
 local tostring  = tostring
 local type      = type
 
+local ipa       = require("lpeg.ip_address")
 local bit       = require("bit")
 local string    = require("string")
 
@@ -78,27 +79,7 @@ end
 
 
 local function split_octets(input)
-    local pos = 0
-    local prev = 0
-    local octs = {}
-
-    for i=1,4 do
-        pos = string.find(input, ".", prev, true)
-        if pos then
-            if i == 4 then
-                return nil
-            end
-            octs[i] = string.sub(input, prev, pos-1)
-        elseif i == 4 then
-            octs[i] = string.sub(input, prev, -1)
-            break
-        else
-            return nil
-        end
-        prev = pos + 1
-    end
-
-    return octs
+    return ipa.v4_octets:match(input)
 end
 
 

moz_security/tests/iputils.lua

@@ -47,6 +47,7 @@ chk_ip_in_cidr(true, "10.0.0.1", pc)
 chk_ip_in_cidr(true, "10.0.254.254", pc)
 chk_ip_in_cidr(false, "10.2.0.0", pc)
 chk_ip_in_cidr(false, "172.16.25.25", pc)
+chk_ip_in_cidr(nil, "1.2", pc)
 chk_ip_in_cidr(nil, "invalid", pc)
 chk_ip_in_cidr(nil, nil, pc)
 chk_ip_in_cidr(nil, nil, nil)