From 375a476d27afae5c978b48a555fe32c94e2cf854 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 16 Dec 2011 06:05:51 +0000 Subject: libs/web: rework hostname match to not allow arbritary sequences of numbers and dots --- libs/web/htdocs/luci-static/resources/cbi.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'libs/web/htdocs/luci-static') diff --git a/libs/web/htdocs/luci-static/resources/cbi.js b/libs/web/htdocs/luci-static/resources/cbi.js index 8d32b669d1..e932dac1d0 100644 --- a/libs/web/htdocs/luci-static/resources/cbi.js +++ b/libs/web/htdocs/luci-static/resources/cbi.js @@ -153,8 +153,9 @@ var cbi_validators = { 'hostname': function(v) { if (v.length <= 253) - return (v.match(/^[a-zA-Z0-9]+$/) != null || - v.match(/^[a-zA-Z0-9][a-zA-Z0-9\-.]*[a-zA-Z0-9]$/) != null); + return (v.match(/^[a-zA-Z]+$/) != null || + (v.match(/^[a-zA-Z0-9][a-zA-Z0-9\-.]*[a-zA-Z0-9]$/) && + v.match(/[^0-9.]/))); return false; }, @@ -191,7 +192,7 @@ var cbi_validators = { 'neg_network_ip4addr': function(v) { v = v.replace(/^\s*!/, ""); - return cbi_validators.uciname(v) || cbi_validators.ip4addr(v); + return cbi_validators.uciname(v) || cbi_validators.ip4addr(v); }, 'range': function(v, args) -- cgit v1.2.3