From 1661ac6bf888e4563546cc63fe0e228af8889bf0 Mon Sep 17 00:00:00 2001 From: Nicholas Smith Date: Sun, 27 Jun 2021 15:43:13 +1000 Subject: luci-proto-ncm: add APN and PIN validation Signed-off-by: Nicholas Smith [squash commits, fix whitespace] Signed-off-by: Jo-Philipp Wich --- .../htdocs/luci-static/resources/protocol/ncm.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js') diff --git a/protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js b/protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js index 0daa7c16c1..4d2f446793 100644 --- a/protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js +++ b/protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js @@ -84,8 +84,17 @@ return network.registerProtocol('ncm', { o.value('IPV4V6', _('IPv4+IPv6')); o.value('IPV6', _('IPv6')); - s.taboption('general', form.Value, 'apn', _('APN')); - s.taboption('general', form.Value, 'pincode', _('PIN')); + o = s.taboption('general', form.Value, 'apn', _('APN')); + o.validate = function(section_id, value) { + if (!/^[a-zA-Z0-9\-.]*[a-zA-Z0-9]$/.test(value)) + return _('Invalid APN provided'); + + return true; + }; + + o = s.taboption('general', form.Value, 'pincode', _('PIN')); + o.datatype = 'and(uinteger,minlength(4),maxlength(8))'; + s.taboption('general', form.Value, 'username', _('PAP/CHAP username')); o = s.taboption('general', form.Value, 'password', _('PAP/CHAP password')); -- cgit v1.2.3