From ebb676ef7b03a7fed4062931be147d43d3855b64 Mon Sep 17 00:00:00 2001 From: Nicholas Smith Date: Fri, 11 Jun 2021 22:19:40 +1000 Subject: [PATCH] luci-proto-modemmanager: add APN and PIN validation Signed-off-by: Nicholas Smith [squash commits, fix white space] Signed-off-by: Jo-Philipp Wich --- .../luci-static/resources/protocol/modemmanager.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/protocols/luci-proto-modemmanager/htdocs/luci-static/resources/protocol/modemmanager.js b/protocols/luci-proto-modemmanager/htdocs/luci-static/resources/protocol/modemmanager.js index 3825b8ef16..88e516a8ec 100644 --- a/protocols/luci-proto-modemmanager/htdocs/luci-static/resources/protocol/modemmanager.js +++ b/protocols/luci-proto-modemmanager/htdocs/luci-static/resources/protocol/modemmanager.js @@ -91,8 +91,16 @@ return network.registerProtocol('modemmanager', { }, this)); }; - 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))'; o = s.taboption('general', form.ListValue, 'auth', _('Authentication Type')); o.value('both', _('PAP/CHAP (both)'));