openwrt/luci
1
0
Fork 0
mirror of https://github.com/openwrt/luci.git synced 2026-02-04 12:06:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

luci-base: add IPv6 LL and ULA validation

Browse Source 
Also fix a bug in apply that assigned undefined to a value if
this.apply was used multiple times in the same caller.

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
This commit is contained in:
Paul Donald
2026-01-23 19:46:58 +01:00
parent 20fd3ca00f
commit 04b289c16d
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/luci-base/htdocs/luci-static/resources/validation.js
View File

@@ -51,7 +51,7 @@ const Validator = baseclass.extend({
else
return false;
if (value != null)
if (value != null && value != undefined)
this.value = value;
return func.apply(this, args);
@@ -287,6 +287,24 @@ const ValidatorFactory = baseclass.extend({
nomask ? _('valid IPv6 address') : _('valid IPv6 address or prefix'));
},
ip6ll(nomask) {
/* fe80::/10 -> 0xfe80 .. 0xfebf */
const x = parseInt(this.value, 16) | 0;
const isll = (((x & 0xffc0) ^ 0xfe80) === 0);
return this.assert(isll && this.apply('ip6addr', nomask),
_('valid IPv6 Link Local address'));
},
ip6ula(nomask) {
/* fd00::/8 -> 0xfd00 .. 0xfdff */
const x = parseInt(this.value, 16) | 0;
const isula = (((x & 0xfe00) ^ 0xfc00) === 0);
return this.assert(isula && this.apply('ip6addr', nomask),
_('valid IPv6 ULA address'));
},
ip4prefix() {
return this.assert(!isNaN(this.value) && this.value >= 0 && this.value <= 32,
_('valid IPv4 prefix value (0-32)'));