From 66e2b7a340ffd0345721f9b84dd938a8dc9d531e Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Thu, 5 Mar 2020 17:26:32 +0100
Subject: [PATCH] os-firewall: hook in rules and minor changes to
 FilterRuleField (https://github.com/opnsense/plugins/issues/1720)

---
 .../src/etc/inc/plugins.inc.d/pfplugin.inc    | 41 +++++++++++++++++++
 .../Firewall/FieldTypes/FilterRuleField.php   |  7 +++-
 2 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 net/firewall/src/etc/inc/plugins.inc.d/pfplugin.inc

diff --git a/net/firewall/src/etc/inc/plugins.inc.d/pfplugin.inc b/net/firewall/src/etc/inc/plugins.inc.d/pfplugin.inc
new file mode 100644
index 000000000..a9c194806
--- /dev/null
+++ b/net/firewall/src/etc/inc/plugins.inc.d/pfplugin.inc
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * Copyright (C) 2020 Deciso B.V.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+ /**
+  * @param $fw
+  */
+ function pfplugin_firewall($fw)
+ {
+     $mdlFilter = new OPNsense\Firewall\Filter();
+     foreach ($mdlFilter->rules->rule->sortedBy(["sequence"]) as $key => $rule) {
+          $content = $rule->serialize();
+          $content["#ref"] = "ui/firewall/filter#" . (string)$rule->getAttributes()['uuid'];
+          $fw->registerFilterRule($rule->getPriority(), $content);
+     }
+ }
diff --git a/net/firewall/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/FilterRuleField.php b/net/firewall/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/FilterRuleField.php
index 4a73c35fc..6556ae488 100644
--- a/net/firewall/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/FilterRuleField.php
+++ b/net/firewall/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/FilterRuleField.php
@@ -54,6 +54,10 @@ class FilterRuleContainerField extends ContainerField
             if (!in_array($key, $map_manual)) {
                 if (is_a($node, "OPNsense\\Base\\FieldTypes\\BooleanField")) {
                     $result[$key] = !empty((string)$node);
+                } elseif (is_a($node, "OPNsense\\Base\\FieldTypes\\ProtocolField")) {
+                    if ((string)$node != 'any') {
+                        $result[$key] = (string)$node;
+                    }
                 } else {
                     $result[$key] = (string)$node;
                 }
@@ -76,9 +80,8 @@ class FilterRuleContainerField extends ContainerField
                 $result['destination']['port'] = (string)$this->destination_port;
             }
         }
-        // swap enabled
+        // field mappings and differences
         $result['disabled'] = empty((string)$this->enabled);
-        //
         $result['descr'] = (string)$this->description;
         $result['type'] = (string)$this->action;
         if (strpos((string)$this->interface, ",") !== false) {