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

luci-app-firewall: disallow creating zone without name

Browse source 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2019-09-11 12:46:59 +02:00
parent 34e73fd983
commit eeced34765
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
View file

@ -92,11 +92,14 @@ return L.view.extend({
o = s.taboption('general', form.Value, 'name', _('Name')); o = s.taboption('general', form.Value, 'name', _('Name'));
o.placeholder = _('Unnamed zone'); o.placeholder = _('Unnamed zone');
o.modalonly = true; o.modalonly = true;
o.rmempty = false;
o.datatype = 'and(uciname,maxlength(11))'; o.datatype = 'and(uciname,maxlength(11))';
o.write = function(section_id, formvalue) { o.write = function(section_id, formvalue) {
var cfgvalue = this.cfgvalue(section_id); var cfgvalue = this.cfgvalue(section_id);
if (cfgvalue != formvalue) if (cfgvalue == null || cfgvalue == '')
return uci.set('firewall', section_id, 'name', formvalue);
else if (cfgvalue != formvalue)
return firewall.renameZone(cfgvalue, formvalue); return firewall.renameZone(cfgvalue, formvalue);
}; };
@ -269,7 +272,7 @@ return L.view.extend({
o.cfgvalue = function(section_id) { o.cfgvalue = function(section_id) {
var out = (this.option == 'out'), var out = (this.option == 'out'),
zone = this.lookupZone(uci.get('firewall', section_id, 'name')), zone = this.lookupZone(uci.get('firewall', section_id, 'name')),
fwds = zone.getForwardingsBy(out ? 'src' : 'dest'), fwds = zone ? zone.getForwardingsBy(out ? 'src' : 'dest') : [],
value = []; value = [];
for (var i = 0; i < fwds.length; i++) for (var i = 0; i < fwds.length; i++)
@ -280,7 +283,7 @@ return L.view.extend({
o.write = o.remove = function(section_id, formvalue) { o.write = o.remove = function(section_id, formvalue) {
var out = (this.option == 'out'), var out = (this.option == 'out'),
zone = this.lookupZone(uci.get('firewall', section_id, 'name')), zone = this.lookupZone(uci.get('firewall', section_id, 'name')),
fwds = zone.getForwardingsBy(out ? 'src' : 'dest'); fwds = zone ? zone.getForwardingsBy(out ? 'src' : 'dest') : [];
if (formvalue == null) if (formvalue == null)
formvalue = []; formvalue = [];