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

Merge pull request #6706 from vgaetera/fw-redirect-any

Browse source 
luci-app-firewall: allow redirects using ip family any
This commit is contained in:
Paul Donald 2023-12-04 05:13:33 +01:00 committed by GitHub
commit 3633bea613
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js
View file

@ -9,7 +9,7 @@
'require tools.widgets as widgets'; 'require tools.widgets as widgets';
function rule_proto_txt(s, ctHelpers) { function rule_proto_txt(s, ctHelpers) {
var family = (uci.get('firewall', s, 'family') || '').toLowerCase().replace(/^(?:any|\*)$/, ''); var family = (uci.get('firewall', s, 'family') || '').toLowerCase().replace(/^(?:all|\*)$/, 'any');
var dip = uci.get('firewall', s, 'dest_ip') || ''; var dip = uci.get('firewall', s, 'dest_ip') || '';
var proto = L.toArray(uci.get('firewall', s, 'proto')).filter(function(p) { var proto = L.toArray(uci.get('firewall', s, 'proto')).filter(function(p) {
return (p != '*' && p != 'any' && p != 'all'); return (p != '*' && p != 'any' && p != 'all');
@ -38,8 +38,8 @@ function rule_proto_txt(s, ctHelpers) {
} : null; } : null;
return fwtool.fmt(_('Incoming %{ipv6?%{ipv4?<var>IPv4</var> and <var>IPv6</var>:<var>IPv6</var>}:<var>IPv4</var>}%{proto?, protocol %{proto#%{next?, }%{item.types?<var class="cbi-tooltip-container">%{item.name}<span class="cbi-tooltip">ICMP with types %{item.types#%{next?, }<var>%{item}</var>}</span></var>:<var>%{item.name}</var>}}}%{mark?, mark <var%{mark.inv? data-tooltip="Match fwmarks except %{mark.num}%{mark.mask? with mask %{mark.mask}}.":%{mark.mask? data-tooltip="Mask fwmark value with %{mark.mask} before compare."}}>%{mark.val}</var>}%{helper?, helper %{helper.inv?<var data-tooltip="Match any helper except &quot;%{helper.name}&quot;">%{helper.val}</var>:<var data-tooltip="%{helper.name}">%{helper.val}</var>}}'), { return fwtool.fmt(_('Incoming %{ipv6?%{ipv4?<var>IPv4</var> and <var>IPv6</var>:<var>IPv6</var>}:<var>IPv4</var>}%{proto?, protocol %{proto#%{next?, }%{item.types?<var class="cbi-tooltip-container">%{item.name}<span class="cbi-tooltip">ICMP with types %{item.types#%{next?, }<var>%{item}</var>}</span></var>:<var>%{item.name}</var>}}}%{mark?, mark <var%{mark.inv? data-tooltip="Match fwmarks except %{mark.num}%{mark.mask? with mask %{mark.mask}}.":%{mark.mask? data-tooltip="Mask fwmark value with %{mark.mask} before compare."}}>%{mark.val}</var>}%{helper?, helper %{helper.inv?<var data-tooltip="Match any helper except &quot;%{helper.name}&quot;">%{helper.val}</var>:<var data-tooltip="%{helper.name}">%{helper.val}</var>}}'), {
ipv4: ((!family && dip.indexOf(':') == -1) || family == 'ipv4'), ipv4: ((!family && dip.indexOf(':') == -1) || family == 'any' || (!family && !dip) || family == 'ipv4'),
ipv6: ((!family && dip.indexOf(':') != -1) || (!family && !dip) || family == 'ipv6'), ipv6: ((!family && dip.indexOf(':') != -1) || family == 'any' || family == 'ipv6'),
proto: proto, proto: proto,
helper: h, helper: h,
mark: f mark: f
@ -101,7 +101,7 @@ function validate_opt_family(m, section_id, opt) {
var dip = dopt.formvalue(section_id) || '', var dip = dopt.formvalue(section_id) || '',
fm = fmopt.formvalue(section_id) || ''; fm = fmopt.formvalue(section_id) || '';
if (fm == '' || (fm == 'ipv6' && (dip.indexOf(':') != -1 || dip == '')) || (fm == 'ipv4' && dip.indexOf(':') == -1)) if (fm == '' || (fm == 'any' && dip == '') || (fm == 'ipv6' && (dip.indexOf(':') != -1 || dip == '')) || (fm == 'ipv4' && dip.indexOf(':') == -1))
return true; return true;
return _('Address family, Internal IP address must match'); return _('Address family, Internal IP address must match');
@ -187,14 +187,17 @@ return view.extend({
o = s.taboption('general', form.ListValue, 'family', _('Restrict to address family')); o = s.taboption('general', form.ListValue, 'family', _('Restrict to address family'));
o.modalonly = true; o.modalonly = true;
o.rmempty = true; o.rmempty = true;
o.value('any', _('IPv4 and IPv6'));
o.value('ipv4', _('IPv4 only')); o.value('ipv4', _('IPv4 only'));
o.value('ipv6', _('IPv6 only')); o.value('ipv6', _('IPv6 only'));
o.value('', _('automatic')); // infer from zone or used IP addresses o.value('', _('automatic')); // infer from zone or used IP addresses
o.cfgvalue = function(section_id) { o.cfgvalue = function(section_id) {
var val = this.map.data.get(this.map.config, section_id, 'family'); var val = this.map.data.get(this.map.config, section_id, 'family');
if (!val || val == 'any' || val == 'all' || val == '*') if (!val)
return ''; return '';
else if (val == 'any' || val == 'all' || val == '*')
return 'any';
else if (val == 'inet' || String(val).indexOf('4') != -1) else if (val == 'inet' || String(val).indexOf('4') != -1)
return 'ipv4'; return 'ipv4';
else if (String(val).indexOf('6') != -1) else if (String(val).indexOf('6') != -1)