From 2d166a9a97f51108b0b02fa7c66588dc1204f4e7 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 31 Aug 2023 10:15:56 +0200
Subject: [PATCH] mvc: fix default issue with models and try to simplify (part
 1 of a few)

---
 .../OPNsense/CaptivePortal/CaptivePortal.xml  |  1 -
 .../mvc/app/models/OPNsense/Core/Firmware.xml | 29 ++++---------------
 .../models/OPNsense/Diagnostics/Netflow.xml   |  2 --
 .../app/models/OPNsense/Diagnostics/Ping.xml  | 11 ++++---
 .../mvc/app/models/OPNsense/Monit/Monit.xml   |  2 --
 .../app/models/OPNsense/OpenVPN/Export.xml    | 11 ++-----
 .../mvc/app/models/OPNsense/Syslog/Syslog.xml |  1 -
 7 files changed, 14 insertions(+), 43 deletions(-)

diff --git a/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml b/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml
index 102abe5d2..0ea1bef10 100644
--- a/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml
@@ -30,7 +30,6 @@
                 <authservers type="AuthenticationServerField">
                     <Required>N</Required>
                     <multiple>Y</multiple>
-                    <default>Local Database</default>
                 </authservers>
                 <alwaysSendAccountingReqs type="BooleanField">
                     <default>0</default>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Core/Firmware.xml b/src/opnsense/mvc/app/models/OPNsense/Core/Firmware.xml
index 5664c0d31..b446d4586 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Core/Firmware.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Core/Firmware.xml
@@ -1,29 +1,12 @@
 <model>
     <mount>//system/firmware</mount>
     <version>1.0.1</version>
-    <description>
-        OPNsense Firmware settings
-    </description>
+    <description>OPNsense Firmware settings</description>
     <items>
-        <mirror type="TextField">
-            <Required>N</Required>
-            <default></default>
-        </mirror>
-        <flavour type="TextField">
-            <Required>N</Required>
-            <default></default>
-        </flavour>
-        <plugins type="TextField">
-            <Required>N</Required>
-            <default></default>
-        </plugins>
-        <type type="TextField">
-            <Required>N</Required>
-            <default></default>
-        </type>
-        <subscription type="TextField">
-            <Required>N</Required>
-            <default></default>
-        </subscription>
+        <mirror type="TextField"/>
+        <flavour type="TextField"/>
+        <plugins type="TextField"/>
+        <type type="TextField"/>
+        <subscription type="TextField"/>
     </items>
 </model>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Netflow.xml b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Netflow.xml
index 72550334e..776655afe 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Netflow.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Netflow.xml
@@ -8,7 +8,6 @@
         <capture>
             <interfaces type="InterfaceField">
                 <Required>N</Required>
-                <default></default>
                 <multiple>Y</multiple>
                 <filters>
                     <enable>/^(?!0).*$/</enable>
@@ -16,7 +15,6 @@
             </interfaces>
             <egress_only type="InterfaceField">
                 <Required>N</Required>
-                <default></default>
                 <multiple>Y</multiple>
                 <filters>
                     <enable>/^(?!0).*$/</enable>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Ping.xml b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Ping.xml
index 62d0817bd..221e6c8e8 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Ping.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Ping.xml
@@ -19,17 +19,16 @@
                 </OptionValues>
             </fam>
             <source_address type="NetworkField">
-              <Required>N</Required>
-              <NetMaskAllowed>N</NetMaskAllowed>
-              <ValidationMessage>Provide a valid source address</ValidationMessage>
+                <Required>N</Required>
+                <NetMaskAllowed>N</NetMaskAllowed>
+                <ValidationMessage>Provide a valid source address</ValidationMessage>
             </source_address>
             <packetsize type="IntegerField">
+                <Required>N</Required>
                 <MinimumValue>1</MinimumValue>
                 <MaximumValue>65535</MaximumValue>
             </packetsize>
-            <disable_frag type="BooleanField">
-                <default>0</default>
-            </disable_frag>
+            <disable_frag type="BooleanField"/>
             <description type="TextField">
                 <Required>N</Required>
                 <mask>/^(.){1,255}$/u</mask>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Monit/Monit.xml b/src/opnsense/mvc/app/models/OPNsense/Monit/Monit.xml
index f8d1db806..2d1b2778f 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Monit/Monit.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Monit/Monit.xml
@@ -64,7 +64,6 @@
          </sslverify>
          <logfile type="TextField">
             <Required>N</Required>
-            <default>syslog facility log_daemon</default>
             <mask>/^(\/[^\/ ]*)+\/?|syslog.*$/</mask>
             <ValidationMessage>Should be a valid absolute path to the log file or the keyword "syslog".</ValidationMessage>
          </logfile>
@@ -166,7 +165,6 @@
             <Required>N</Required>
          </format>
          <reminder type="IntegerField">
-            <default>10</default>
             <Required>N</Required>
             <MinimumValue>0</MinimumValue>
             <MaximumValue>86400</MaximumValue>
diff --git a/src/opnsense/mvc/app/models/OPNsense/OpenVPN/Export.xml b/src/opnsense/mvc/app/models/OPNsense/OpenVPN/Export.xml
index 10050ad39..7d78d7ec1 100644
--- a/src/opnsense/mvc/app/models/OPNsense/OpenVPN/Export.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/OpenVPN/Export.xml
@@ -15,6 +15,7 @@
                 </hostname>
                 <template type="TextField"/>
                 <local_port type="IntegerField">
+                    <Required>N</Required>
                     <MinimumValue>1</MinimumValue>
                     <MaximumValue>65535</MaximumValue>
                     <ValidationMessage>Port needs to be an integer value between 1 and 65535</ValidationMessage>
@@ -27,14 +28,8 @@
                     <default>1</default>
                     <Required>Y</Required>
                 </validate_server_cn>
-                <cryptoapi type="BooleanField">
-                    <default>0</default>
-                    <Required>N</Required>
-                </cryptoapi>
-                <auth_nocache type="BooleanField">
-                    <default>0</default>
-                    <Required>N</Required>
-                </auth_nocache>
+                <cryptoapi type="BooleanField"/>
+                <auth_nocache type="BooleanField"/>
                 <plain_config type="TextField"/>
             </server>
         </servers>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Syslog/Syslog.xml b/src/opnsense/mvc/app/models/OPNsense/Syslog/Syslog.xml
index a7c61474b..922659ba5 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Syslog/Syslog.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Syslog/Syslog.xml
@@ -48,7 +48,6 @@
                       <alert>alert</alert>
                       <emerg>emergency</emerg>
                   </OptionValues>
-                  <default>info,notice,warn,err,crit,alert,emerg</default>
                 </level>
                 <facility type="OptionField">
                   <Required>N</Required>