X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fluci-base%2Fluasrc%2Fcbi%2Fdatatypes.lua;h=cf56566287760f0dfb0ecf218b692d807768dc9a;hp=626ad91c756dac87272f5bcf3094b4105cfac087;hb=cd8333cf0b90c6498366c993f8135dbd29cd6000;hpb=967bb1f36f9f30d19e13aecf3a550eea5fd73c6b

diff --git a/modules/luci-base/luasrc/cbi/datatypes.lua b/modules/luci-base/luasrc/cbi/datatypes.lua
index 626ad91c7..cf5656628 100644
--- a/modules/luci-base/luasrc/cbi/datatypes.lua
+++ b/modules/luci-base/luasrc/cbi/datatypes.lua
@@ -1,4 +1,5 @@
 -- Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
+-- Copyright 2017 Dan Luedtke <mail@danrl.com>
 -- Licensed to the public under the Apache License 2.0.
 
 local fs = require "nixio.fs"
@@ -131,6 +132,48 @@ function ip6prefix(val)
 	return ( val and val >= 0 and val <= 128 )
 end
 
+function ipmask(val)
+	return ipmask4(val) or ipmask6(val)
+end
+
+function ipmask4(val)
+	local ip, mask = val:match("^([^/]+)/([^/]+)$")
+	local bits = tonumber(mask)
+
+	if bits and (bits < 0 or bits > 32) then
+		return false
+	end
+
+	if not bits and mask and not ip4addr(mask) then
+		return false
+	end
+
+	return ip4addr(ip or val)
+end
+
+function ipmask6(val)
+	local ip, mask = val:match("^([^/]+)/([^/]+)$")
+	local bits = tonumber(mask)
+
+	if bits and (bits < 0 or bits > 128) then
+		return false
+	end
+
+	if not bits and mask and not ip6addr(mask) then
+		return false
+	end
+
+	return ip6addr(ip or val)
+end
+
+function ip6hostid(val)
+	if val and val:match("^[a-fA-F0-9:]+$") and (#val > 2) then
+		return (ip6addr("2001:db8:0:0" .. val) or ip6addr("2001:db8:0:0:" .. val))
+	end
+
+	return false
+end
+
 function port(val)
 	val = tonumber(val)
 	return ( val and val >= 0 and val <= 65535 )
@@ -233,11 +276,33 @@ function wepkey(val)
 	end
 end
 
+function hexstring(val)
+	if val then
+		return (val:match("^[a-fA-F0-9]+$") ~= nil)
+	end
+	return false
+end
+
+function hex(val, maxbytes)
+	maxbytes = tonumber(maxbytes)
+	if val and maxbytes ~= nil then
+		return ((val:match("^0x[a-fA-F0-9]+$") ~= nil) and (#val <= 2 + maxbytes * 2))
+	end
+	return false
+end
+
+function base64(val)
+	if val then
+		return (val:match("^[a-zA-Z0-9/+]+=?=?$") ~= nil) and (math.fmod(#val, 4) == 0)
+	end
+	return false
+end
+
 function string(val)
 	return true		-- Everything qualifies as valid string
 end
 
-function directory( val, seen )
+function directory(val, seen)
 	local s = fs.stat(val)
 	seen = seen or { }
 
@@ -253,7 +318,7 @@ function directory( val, seen )
 	return false
 end
 
-function file( val, seen )
+function file(val, seen)
 	local s = fs.stat(val)
 	seen = seen or { }
 
@@ -269,7 +334,7 @@ function file( val, seen )
 	return false
 end
 
-function device( val, seen )
+function device(val, seen)
 	local s = fs.stat(val)
 	seen = seen or { }
 
@@ -378,30 +443,29 @@ function dateyyyymmdd(val)
 			return false;
 		end
 
-        	local days_in_month = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
-
-        	local function is_leap_year(year)
-            		return (year % 4 == 0) and ((year % 100 ~= 0) or (year % 400 == 0))
-        	end
-
-        	function get_days_in_month(month, year)
-            		if (month == 2) and is_leap_year(year) then
-               			return 29
-            		else
-                		return days_in_month[month]
-            		end
-        	end
-        	if (year < 2015) then
-	    		return false
-        	end 
-        	if ((month == 0) or (month > 12)) then
-            		return false
-        	end 
-        	if ((day == 0) or (day > get_days_in_month(month, year))) then
-            		return false
-        	end
-        	return true
+		local days_in_month = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
+
+		local function is_leap_year(year)
+			return (year % 4 == 0) and ((year % 100 ~= 0) or (year % 400 == 0))
+		end
+
+		function get_days_in_month(month, year)
+			if (month == 2) and is_leap_year(year) then
+				return 29
+			else
+				return days_in_month[month]
+			end
+		end
+		if (year < 2015) then
+			return false
+		end
+		if ((month == 0) or (month > 12)) then
+			return false
+		end
+		if ((day == 0) or (day > get_days_in_month(month, year))) then
+			return false
+		end
+		return true
 	end
 	return false
 end
-