luci-base: add hostport and ipaddrport validation types

Add two new types 'hostport' and 'ipaddrport' to validate strings in the form
'sub.example.org:1234' and '0.0.0.0:80'. The 'hostport' accepts hostnames or
IP addresses followed by a colon and a port number while the 'ipaddrport' type
accepts numeric IP addresses only, followed by a colon and a port.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

1 files changed, 10 insertions, 0 deletions

diff --git a/modules/luci-base/luasrc/cbi/datatypes.lua b/modules/luci-base/luasrc/cbi/datatypes.lua
index ebd7e594f..52f90afee 100644
--- a/modules/luci-base/luasrc/cbi/datatypes.lua
+++ b/modules/luci-base/luasrc/cbi/datatypes.lua
@@ -184,6 +184,16 @@ function network(val)
 	return uciname(val) or host(val)
 end
 
+function hostport(val)
+	local h, p = val:match("^([^:]+):([^:]+)$")
+	return not not (h and p and host(h) and port(p))
+end
+
+function ipaddrport(val)
+	local h, p = val:match("^([^:]+):([^:]+)$")
+	return not not (h and p and ipaddr(h) and port(p))
+end
+
 function wpakey(val)
 	if #val == 64 then
 		return (val:match("^[a-fA-F0-9]+$") ~= nil)