From: Paul Donald <newtwen+github@gmail.com>
Date: Wed, 3 Apr 2024 21:38:31 +0000 (+0200)
Subject: luci-app-firewall: Add 'any' choice for SNAT 'family' option
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=4ca87f6576272d4a4659e995bef00cf34d5746e9;p=project%2Fluci.git

luci-app-firewall: Add 'any' choice for SNAT 'family' option

If one sets a SNAT rule via the GUI as 'automatic', the
'family' remains empty. In fw4.uc code, this is interpreted as:

/* default to IPv4 only for backwards compatibility,
 unless an explicit family any was configured */

'any' is handled by fw4 as IPv4+6.

Also prevent 'any' from triggering a validation error (non-SNAT targets
hide 'snat_ip' which remains empty, and triggered an error).

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
---

diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js
index 3c1bbaaa2a..015b8b7681 100644
--- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js
+++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js
@@ -9,7 +9,7 @@
 'require tools.widgets as widgets';
 
 function rule_proto_txt(s) {
-	var family = (uci.get('firewall', s, 'family') || '').toLowerCase().replace(/^(?:any|\*)$/, '');
+	var family = (uci.get('firewall', s, 'family') || '').toLowerCase().replace(/^(?:all|\*)$/, 'any');
 	var sip = uci.get('firewall', s, 'src_ip') || '';
 	var dip = uci.get('firewall', s, 'dest_ip') || '';
 	var rwip = uci.get('firewall', s, 'snat_ip') || '';
@@ -125,7 +125,7 @@ function validate_opt_family(m, section_id, opt) {
 		return true;
 	if (fm == 'ipv4' && (sip.indexOf(':') == -1) && (dip.indexOf(':') == -1) && ((rwip.indexOf(':') == -1 && tg == 'SNAT') || rwip == ''))
 		return true;
-	if (fm == '') {
+	if (fm == '' || fm == 'any') {
 		if ((sip.indexOf(':') != -1 || sip == '') && (dip.indexOf(':') != -1 || dip == '') && ((rwip.indexOf(':') != -1 && tg == 'SNAT') || rwip == ''))
 			return true;
 		if ((sip.indexOf(':') == -1) && (dip.indexOf(':') == -1) && ((rwip.indexOf(':') == -1 && tg == 'SNAT') || rwip == ''))
@@ -215,14 +215,17 @@ return view.extend({
 			o = s.taboption('general', form.ListValue, 'family', _('Restrict to address family'));
 			o.modalonly = true;
 			o.rmempty = true;
+			o.value('any', _('IPv4 and IPv6'));
 			o.value('ipv4', _('IPv4 only'));
 			o.value('ipv6', _('IPv6 only'));
 			o.value('', _('automatic'));  // infer from zone or used IP addresses
 			o.cfgvalue = function(section_id) {
 				var val = this.map.data.get(this.map.config, section_id, 'family');
 
-				if (!val || val == 'any' || val == 'all' || val == '*')
+				if (!val)
 					return '';
+				else if (val == 'any' || val == 'all' || val == '*')
+					return 'any';
 				else if (val == 'inet' || String(val).indexOf('4') != -1)
 					return 'ipv4';
 				else if (String(val).indexOf('6') != -1)