Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-mod-network: add stricter wireless interface name validation

Browse source 
Linux wireless interface names have the following restrictions:

 * It must not be an empty string
 * It must not be '.' or '..'
 * It must not contain any /, : or space character ( , \t, \n, ...)
 * It must be less than 16 chars
 * It likely must not contain any % either

Fixes: 8673aef8db ("luci-mod-network: remove uciname validation from wireless interface")
Signed-off-by: Glenn Washburn <development@efficientek.com>
[reword validation error messages, remove extended description text as it would be
 shown as part of the validation errors]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Glenn Washburn 2023-03-01 23:39:48 -06:00 committed by Jo-Philipp Wich
parent 9c55500fe8
commit 6ad6a241c3
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/luci-base/htdocs/luci-static/resources/validation.js
View file

@ -426,6 +426,15 @@ var ValidatorFactory = baseclass.extend({
return this.assert(this.value.match(/^[a-zA-Z0-9_]+$/), _('valid UCI identifier'));
},
netdevname: function() {
var v = this.value;
if (v == '.' || v == '..')
return this.assert(false, _('valid network device name, not "." or ".."'));
return this.assert(v.match(/^[^:/%\s]{1,15}$/), _('valid network device name between 1 and 15 characters not containing ":", "/", "%" or spaces'));
},
range: function(min, max) {
var val = this.factory.parseDecimal(this.value);
return this.assert(val >= +min && val <= +max, _('value between %f and %f').format(min, max));

2
modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
View file

@ -1152,7 +1152,7 @@ return view.extend({
o = ss.taboption('advanced', form.Value, 'ifname', _('Interface name'), _('Override default interface name'));
o.optional = true;
o.datatype = 'maxlength(15)';
o.datatype = 'netdevname';
o.placeholder = radioNet.getIfname();
if (/^radio\d+\.network/.test(o.placeholder))
o.placeholder = '';