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

Merge pull request #6063 from Zeranoe/fix-address-validator

Browse source 
luci-mod-network: fix address validation
This commit is contained in:
Jo-Philipp Wich 2022-11-23 13:43:15 +01:00 committed by GitHub
commit 885e3a5f0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
View file

@ -126,7 +126,7 @@ function validateHostname(sid, s) {
if (s.length > 256)
return _('Expecting: %s').format(_('valid hostname'));
var labels = s.replace(/^\.+|\.$/g, '').split(/\./);
var labels = s.replace(/^\*?\.?|\.$/g, '').split(/\./);
for (var i = 0; i < labels.length; i++)
if (!labels[i].match(/^[a-z0-9_](?:[a-z0-9-]{0,61}[a-z0-9])?$/i))
@ -156,13 +156,15 @@ function validateServerSpec(sid, s) {
if (s == null || s == '')
return true;
var m = s.match(/^(?:\/(.+)\/)?(.*)$/);
var m = s.match(/^(\/.*\/)?(.*)$/);
if (!m)
return _('Expecting: %s').format(_('valid hostname'));
var res = validateAddressList(sid, m[1]);
if (res !== true)
return res;
if (m[1] != '//' && m[1] != '/#/') {
var res = validateAddressList(sid, m[1]);
if (res !== true)
return res;
}
if (m[2] == '' || m[2] == '#')
return true;