From df0243a42ee787322ec8c50261e9fc8f67733ed7 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Thu, 25 Nov 2021 14:12:58 +0100
Subject: [PATCH] net/firewall - "No RDR" option for Automation / Source NAT,
 closes https://github.com/opnsense/plugins/issues/2504

---
 .../controllers/OPNsense/Firewall/forms/dialogSNatRule.xml  | 6 ++++++
 .../OPNsense/Firewall/FieldTypes/SourceNatRuleField.php     | 2 +-
 .../opnsense/mvc/app/models/OPNsense/Firewall/Filter.xml    | 6 +++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/net/firewall/src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogSNatRule.xml b/net/firewall/src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogSNatRule.xml
index 48e1b9a5f..0c87b0450 100644
--- a/net/firewall/src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogSNatRule.xml
+++ b/net/firewall/src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogSNatRule.xml
@@ -5,6 +5,12 @@
         <type>checkbox</type>
         <help>Enable this rule</help>
     </field>
+    <field>
+        <id>rule.nonat</id>
+        <label>Do not NAT</label>
+        <type>checkbox</type>
+        <help>Enabling this option will disable NAT for traffic matching this rule and stop processing Outbound NAT rules.</help>
+    </field>
     <field>
         <id>rule.sequence</id>
         <label>Sequence</label>
diff --git a/net/firewall/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/SourceNatRuleField.php b/net/firewall/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/SourceNatRuleField.php
index f00fb1c98..de1e1ad91 100644
--- a/net/firewall/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/SourceNatRuleField.php
+++ b/net/firewall/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/SourceNatRuleField.php
@@ -45,7 +45,7 @@ class SourceNatRuleContainerField extends ContainerField
      */
     public function serialize()
     {
-        $result = array();
+        $result = [];
         $source_mapper = [
             'enabled' => false,
             'source_net' => false,
diff --git a/net/firewall/src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.xml b/net/firewall/src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.xml
index 3fa4cfc8c..3655695e3 100644
--- a/net/firewall/src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.xml
+++ b/net/firewall/src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.xml
@@ -1,6 +1,6 @@
 <model>
     <mount>//OPNsense/Firewall/Filter</mount>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <migration_prefix>MFP</migration_prefix>
     <description>
         OPNsense firewall filter rules
@@ -112,6 +112,10 @@
                     <default>1</default>
                     <Required>Y</Required>
                 </enabled>
+                <nonat type="BooleanField">
+                    <default>0</default>
+                    <Required>Y</Required>
+                </nonat>
                 <sequence type="IntegerField">
                     <MinimumValue>1</MinimumValue>
                     <MaximumValue>99999</MaximumValue>