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

luci-app-firewall: support 'helper' and 'set_helper' parameters for rules

Browse source 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2020-01-16 16:12:38 +01:00
parent b65588ebc6
commit d601e79da5
1 changed files with 40 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js
View file

@ -148,14 +148,23 @@ return L.view.extend({
expect: { '': {} } expect: { '': {} }
}), }),
callConntrackHelpers: rpc.declare({
object: 'luci',
method: 'getConntrackHelpers',
expect: { result: [] }
}),
load: function() { load: function() {
return this.callHostHints().catch(function(e) { return Promise.all([
console.debug('load fail', e); this.callHostHints(),
}); this.callConntrackHelpers()
]);
}, },
render: function(hosts) { render: function(data) {
var m, s, o; var hosts = data[0],
ctHelpers = data[1],
m, s, o;
m = new form.Map('firewall', _('Firewall - Traffic Rules'), m = new form.Map('firewall', _('Firewall - Traffic Rules'),
_('Traffic rules define policies for packets traveling between different zones, for example to reject traffic between certain hosts or to open WAN ports on the router.')); _('Traffic rules define policies for packets traveling between different zones, for example to reject traffic between certain hosts or to open WAN ports on the router.'));
@ -383,6 +392,32 @@ return L.view.extend({
o.value('ACCEPT', _('accept')); o.value('ACCEPT', _('accept'));
o.value('REJECT', _('reject')); o.value('REJECT', _('reject'));
o.value('NOTRACK', _("don't track")); o.value('NOTRACK', _("don't track"));
o.value('HELPER', _('assign conntrack helper'));
o = s.taboption('general', form.ListValue, 'set_helper', _('Tracking helper'), _('Assign the specified connection tracking helper to matched traffic.'));
o.modalonly = true;
o.placeholder = _('any');
o.depends('target', 'HELPER');
for (var i = 0; i < ctHelpers.length; i++)
o.value(ctHelpers[i].name, '%s (%s)'.format(ctHelpers[i].description, ctHelpers[i].name.toUpperCase()));
o = s.taboption('advanced', form.Value, 'helper', _('Match helper'), _('Match traffic using the specified connection tracking helper.'));
o.modalonly = true;
o.placeholder = _('any');
for (var i = 0; i < ctHelpers.length; i++)
o.value(ctHelpers[i].name, '%s (%s)'.format(ctHelpers[i].description, ctHelpers[i].name.toUpperCase()));
o.validate = function(section_id, value) {
if (value == '' || value == null)
return true;
value = value.replace(/^!\s*/, '');
for (var i = 0; i < ctHelpers.length; i++)
if (value == ctHelpers[i].name)
return true;
return _('Unknown or not installed conntrack helper "%s"').format(value);
};
o = s.taboption('advanced', form.Value, 'extra', _('Extra arguments'), o = s.taboption('advanced', form.Value, 'extra', _('Extra arguments'),
_('Passes additional arguments to iptables. Use with care!')); _('Passes additional arguments to iptables. Use with care!'));