validator code partially integrated in dhcp

git-svn-id: svn://svn.alpinelinux.org/acf/dhcp/trunk@290 ab2d0c66-481e-0410-8bed-d214d4d58bed

1 files changed, 108 insertions, 1 deletions

diff --git a/dhcp-model.lua b/dhcp-model.lua
index 4fca1a9..60fb86a 100644
--- a/dhcp-model.lua
+++ b/dhcp-model.lua
@@ -3,6 +3,7 @@
 module (..., package.seeall)
 
 require("lfs")
+require("validator")
 
 local subnet = { }
 local cfgdir = "/etc/dhcp/"
@@ -53,6 +54,10 @@ subnet_read = function( name )
 end
 
 subnet_write = function( net )
+	msg, fields = validate_network( net )
+	if #msg > 0 then
+		return cfe({ msg = msg, fields = fields }), net
+	end
 	local filename = cfgdir .. net.name.value .. ".subnet"
 	local file = io.open( filename, "w+" )
 	file:write( "def-lease-time: " .. net.defleasetime.value .. "\n" )
@@ -67,7 +72,87 @@ subnet_write = function( net )
 	file:write( "lease-range-end: " .. net.leaserangeend.value .. "\n" )
 	file:write( "wpad: " .. net.wpad.value .. "\n" )
 	file:close()
-	return net
+	return cfe({ msg = "", fields = {}}), net
+end
+
+subnet_create = function( net )
+	if file_exists( net.name.value ) then
+		return cfe({ msg = "This subnet already exists!", fields = {}}), net
+	end
+	retcode, net = subnet_write( net )	
+	return retcode, net
+end
+
+_tonumber = function( value )
+	ret = tonumber( value )
+	if (ret == nil) then
+		ret = 0
+	end
+	return ret
+end
+
+validate_network = function( net )
+	fields = {}
+	msg = ""
+	if #net.name.value < 4 then
+		table.insert(fields, "name")
+		msg = msg .. "Minimum network name length is 4 characters!\n"
+	end
+	if not validator.is_integer_in_range(_tonumber(net.defleasetime.value), 1800, 86400) then
+		table.insert(fields, "defleasetime")
+		msg = msg .. "Default-Lease-Time must be: 1800 < x < 86400\n"
+	end
+	if not validator.is_integer_in_range(_tonumber(net.maxleasetime.value), 1800, 86400) then
+		table.insert(fields, "maxleasetime")
+		msg = msg .. "Maximum-Lease-Time must be: 1800 < x < 86400\n"
+	end
+	if not validator.is_ipv4(net.gateway.value) then
+		table.insert(fields, "gateway")
+		msg = msg .. "Gateway: invalid IPv4 address!\n"
+	end
+	if not validator.is_ipv4(net.dnssrv1.value) then
+		table.insert(fields, "dnssrv1")
+		msg = msg .. "DNS Server 1: invalid IPv4 address!\n"
+	end
+	if not validator.is_ipv4(net.dnssrv2.value) then
+		if #net.dnssrv2.value > 0 then
+			table.insert(fields, "dnssrv2")
+			msg = msg .. "DNS Server 2: invalid IPv4 address!\n"
+		end
+	end
+	if not validator.is_ipv4(net.subnet.value) then
+		table.insert(fields, "subnet")
+		msg = msg .. "Subnet: invalid IPv4 address!\n"
+	end
+	if not validator.is_ipv4(net.netmask.value) then
+		table.insert(fields, "netmask")
+		msg = msg .. "Netmask: invalid IPv4 address!\n"
+	end
+	if not validator.is_ipv4(net.leaserangestart.value) then
+		if #net.leaserangestart.value > 0 then
+			table.insert(fields, "leaserangestart")
+			msg = msg .. "Lease-Range-Start: invalid IPv4 address!\n"
+		end
+	end
+	if not validator.is_ipv4(net.leaserangeend.value) then
+		if #net.leaserangeend.value > 0 then
+			table.insert(fields, "leaserangeend")
+			msg = msg .. "Lease-Range-End: invalid IPv4 address!\n"
+		end
+	end
+
+	return msg, fields
+end
+
+file_exists = function( filename )
+	retval = false
+	fn = cfgdir .. net.name.value .. ".subnet"
+	file = io.open( fn, "r" )
+	if file ~= nil then
+		retval = true
+		file:close()
+	end
+	return retval
 end
 
 read_file = function ( filename )
@@ -154,4 +239,26 @@ get_subnets = function ()
 	
 	return retval
 end
+
+create_new_net = function( name, defleasetime, maxleasetime, gateway, domainname, dnssrv1, dnssrv2, subnet, netmask, leaserangestart, leaserangeend, wpad )
+	net = { name         = { label="Name", value=nonil(name), type="message" },
+	        defleasetime = { label="Default Lease Time", value=nonil(defleasetime), type="text" },
+	        maxleasetime = { label="Maximum Lease Time", value=nonil(maxleasetime), type="text" },
+	        gateway      = { label="Gateway", value=nonil(gateway), type="text" },
+	        domainname   = { label="Domainname", value=nonil(domainname), type="text" },
+	        dnssrv1      = { label="DNS Server 1", value=nonil(dnssrv1), type="text" },
+	        dnssrv2      = { label="DNS Server 2", value=nonil(dnssrv2), type="text" },
+	        subnet       = { label="Subnet", value=nonil(subnet), type="text" },
+	        netmask      = { label="Netmask", value=nonil(netmask), type="text" },
+	        leaserangestart = { label="Lease Range Start", value=nonil(leaserangestart), type="text" },
+	        leaserangeend   = { label="Lease Range End", value=nonil(leaserangeend), type="text" },
+	        wpad         = { label="Web Proxy Auto Discovery", value=nonil(wpad),
+	        type="select", value=nonil(wpad), option = { "yes", "no"} }
+	      }
+	if net.wpad.value == "" then
+		net.wpad.value = "no"
+	end
+	      
+	return net
+end