From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 2 Dec 2015 10:13:18 +0000 (+0100)
Subject: luci-base: add hostport and ipaddrport validation types
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9b30357454ea53a9f1d7e82d8f894db5f409de98;p=oweals%2Fluci.git

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>
---

diff --git a/modules/luci-base/htdocs/luci-static/resources/cbi.js b/modules/luci-base/htdocs/luci-static/resources/cbi.js
index 02c54ad3e..8a3cb6fca 100644
--- a/modules/luci-base/htdocs/luci-static/resources/cbi.js
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi.js
@@ -161,6 +161,28 @@ var cbi_validators = {
 			cbi_validators.host.apply(this);
 	},
 
+	'hostport': function()
+	{
+		var hp = this.split(/:/);
+
+		if (hp.length == 2)
+			return (cbi_validators.host.apply(hp[0]) &&
+			        cbi_validators.port.apply(hp[1]));
+
+		return false;
+	},
+
+	'ipaddrport': function()
+	{
+		var hp = this.split(/:/);
+
+		if (hp.length == 2)
+			return (cbi_validators.ipaddr.apply(hp[0]) &&
+			        cbi_validators.port.apply(hp[1]));
+
+		return false;
+	},
+
 	'wpakey': function()
 	{
 		var v = this;
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)