OPNSense/core 18b3e24src/etc config.xml.sample, src/opnsense/mvc/tests/app/models/OPNsense/ACL/AclConfig config.xml

system: remove long obsolete snmpd section from default config
DeltaFile
+0-5src/opnsense/mvc/tests/app/models/OPNsense/ACL/AclConfig/config.xml
+0-5src/etc/config.xml.sample
+0-102 files

OPNSense/core 69d8515src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api OneToOneController.php

Apply suggestions from code review

Co-authored-by: Franco Fichtner <franco at opnsense.org>
DeltaFile
+1-1src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/OneToOneController.php
+1-11 files

OPNSense/core fdf52dc. Makefile plist, src/opnsense/mvc/tests/app/models/OPNsense/Base BaseModelTest.php

tests: unwind BaseModel test side effect on AclConfig

Give the test its own empty config to migrate into, which makes
resetting it irrelevant.  A tiny bit of magic is needed to bootstrap
a config.xml so it's not the one that is checked in and we also
remove the temporary files from the tree so it does not confuse git.

save() is a far-reaching side effect in the test, but more or less
necessary for better test coverage.  But I'd still want a simpler
test around Core\Config and this offers merely offers the groundwork
also removing the need to reset this from make commands.
DeltaFile
+37-35src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModelTest.php
+1-7Makefile
+8-0src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModelConfig/backup/config.xml
+1-0plist
+47-424 files

OPNSense/core 28ea98asrc/opnsense/mvc/app/models/OPNsense/Core ACL.php

mvc: advertise use of Config instead of just using it in ACL
DeltaFile
+1-0src/opnsense/mvc/app/models/OPNsense/Core/ACL.php
+1-01 files

OPNSense/core c7fc716src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms dialogDNatRule.xml dialogOneToOneRule.xml

Change general header in dialog to organization, to be in line with firewall filter dialog
DeltaFile
+1-1src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogDNatRule.xml
+1-1src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogOneToOneRule.xml
+2-22 files

OPNSense/core e0bfc35src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms dialogOneToOneRule.xml

Using / in labels messes with the label in column headers
DeltaFile
+3-3src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogOneToOneRule.xml
+3-31 files

OPNSense/core 472f17fsrc/opnsense/mvc/app/controllers/OPNsense/Firewall/Api FilterBaseController.php OneToOneController.php

Turn moveRuleBeforeAction() and toggleRuleLogAction() into shared based methods
DeltaFile
+101-0src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterBaseController.php
+4-78src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/OneToOneController.php
+2-73src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/DNatController.php
+1-25src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterController.php
+108-1764 files

OPNSense/core 0b86124src/opnsense/scripts/unbound-dnsbl/lib dnsbl.py

unbound: ditch dnsbl_available and bind around self.dnsbl
DeltaFile
+6-11src/opnsense/scripts/unbound-dnsbl/lib/dnsbl.py
+6-111 files

OPNSense/core 3b01394src/opnsense/scripts/unbound-dnsbl dnsbl_module.py

Services: Unbound DNS - fix "configctl unbound check" as it doesn't use a chroot.

ref: https://forum.opnsense.org/index.php?topic=49989.0
DeltaFile
+1-0src/opnsense/scripts/unbound-dnsbl/dnsbl_module.py
+1-01 files

OPNSense/core d4567fesrc/opnsense/mvc/app/controllers/OPNsense/Firewall/forms dialogOneToOneRule.xml

These labels are not needed in grid_view
DeltaFile
+0-2src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogOneToOneRule.xml
+0-21 files

OPNSense/core fb2cbffsrc/opnsense/mvc/app/views/OPNsense/Firewall onat_rule.volt

nat/one-to-one: Refactor UI part to be in line with other firewall components
DeltaFile
+2-2src/opnsense/mvc/app/views/OPNsense/Firewall/onat_rule.volt
+2-21 files

OPNSense/core 5a0fadbsrc/opnsense/mvc/app/controllers/OPNsense/Firewall/forms dialogOneToOneRule.xml

nat/one-to-one: Refactor UI part to be in line with other firewall components
DeltaFile
+1-1src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogOneToOneRule.xml
+1-11 files

OPNSense/core cceaf1asrc/opnsense/mvc/app/controllers/OPNsense/Firewall/Api OneToOneController.php, src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms dialogOneToOneRule.xml

nat/one-to-one: Refactor UI part to be in line with other firewall components
DeltaFile
+23-3src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/OneToOneController.php
+4-5src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogOneToOneRule.xml
+27-82 files

OPNSense/core b8e5cfcsrc/opnsense/scripts/unbound-dnsbl/lib dnsbl.py

unbound: clean up marker and size files, closes #9489
DeltaFile
+32-26src/opnsense/scripts/unbound-dnsbl/lib/dnsbl.py
+32-261 files

OPNSense/core cc9159fsrc/opnsense/mvc/app/controllers/OPNsense/Firewall/forms dialogOneToOneRule.xml, src/opnsense/mvc/app/views/OPNsense/Firewall onat_rule.volt

nat/one-to-one: Refactor UI part to be in line with other firewall components
DeltaFile
+138-61src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogOneToOneRule.xml
+2-2src/opnsense/mvc/app/views/OPNsense/Firewall/onat_rule.volt
+140-632 files

OPNSense/core a7564c2src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api OneToOneController.php, src/opnsense/mvc/app/models/OPNsense/Firewall Filter.xml

nat/one-to-one: Refactor UI part to be in line with other firewall components
DeltaFile
+88-0src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/OneToOneController.php
+4-4src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.xml
+2-2src/opnsense/mvc/app/views/OPNsense/Firewall/onat_rule.volt
+1-1src/opnsense/mvc/app/models/OPNsense/Firewall/Menu/Menu.xml
+95-74 files

OPNSense/core 0fba32esrc/opnsense/scripts/syslog log_matcher.py

System/Logging - bugfix for https://github.com/opnsense/core/commit/803a2615b381e679dfb69e7f5b833f19f53b6e4a, record should be None when not matched.

(cherry picked from commit 8cf3898282561e55c05849e00db69579bbe520f7)
DeltaFile
+2-1src/opnsense/scripts/syslog/log_matcher.py
+2-11 files

OPNSense/core 11f2103. plist, src/opnsense/mvc/app/controllers/OPNsense/Firewall OneToOneController.php

nat/one-to-one: Refactor UI part to be in line with other firewall components
DeltaFile
+623-0src/opnsense/mvc/app/views/OPNsense/Firewall/onat_rule.volt
+3-33src/opnsense/mvc/app/controllers/OPNsense/Firewall/OneToOneController.php
+1-0plist
+627-333 files

OPNSense/core 8cf3898src/opnsense/scripts/syslog log_matcher.py

System/Logging - bugfix for https://github.com/opnsense/core/commit/803a2615b381e679dfb69e7f5b833f19f53b6e4a, record should be None when not matched.
DeltaFile
+2-1src/opnsense/scripts/syslog/log_matcher.py
+2-11 files

OPNSense/core 4859bcbsrc/etc rc.filter_synchronize

firewall: slight simplification in filter sync script

Usually we can let static command line switches live in the format
string.  While here omit the use of the first $output assignment.
DeltaFile
+2-5src/etc/rc.filter_synchronize
+2-51 files

OPNSense/core 9c161e3src/etc/inc interfaces.inc, src/opnsense/scripts/interfaces reconfigure_neighbors.php

interfaces: unbreak neighbor apply
DeltaFile
+1-1src/etc/inc/interfaces.inc
+1-1src/opnsense/scripts/interfaces/reconfigure_neighbors.php
+2-22 files

OPNSense/core 05abe13src/etc/inc interfaces.inc, src/etc/inc/plugins.inc.d dhcpd.inc

isc-dhcp: interalize interfaces_staticarp_configure(); closes #9476

Instead of making the interface code pluggable, push the code that
causes the persistent side effect to the ISC DHCP plugin which then
gets to fix the stuck static ARP flag after disable/deinstall and a
reboot.  The situation isn't ideal, but much better than before.
DeltaFile
+26-8src/etc/inc/plugins.inc.d/dhcpd.inc
+5-23src/etc/inc/interfaces.inc
+31-312 files

OPNSense/core ffb816bsrc/opnsense/mvc/app/controllers/OPNsense/Dnsmasq/forms general.xml, src/opnsense/mvc/app/models/OPNsense/Dnsmasq Dnsmasq.xml

dnsmasq: Add DHCP logging flags which can influence log verbosity (#9480)

DeltaFile
+18-0src/opnsense/mvc/app/models/OPNsense/Dnsmasq/Dnsmasq.xml
+14-0src/opnsense/mvc/app/controllers/OPNsense/Dnsmasq/forms/general.xml
+10-0src/opnsense/service/templates/OPNsense/Dnsmasq/dnsmasq.conf
+42-03 files

OPNSense/core 170f29bsrc/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes FilterRuleField.php

mvc: annotate previous too
DeltaFile
+1-0src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/FilterRuleField.php
+1-01 files

OPNSense/core 7b60ce8src/opnsense/mvc/app/controllers/OPNsense/Dnsmasq/forms general.xml, src/opnsense/mvc/app/models/OPNsense/Dnsmasq Dnsmasq.xml

Simplify and add a SingleSelectConstraint
DeltaFile
+17-9src/opnsense/mvc/app/models/OPNsense/Dnsmasq/Dnsmasq.xml
+4-3src/opnsense/service/templates/OPNsense/Dnsmasq/dnsmasq.conf
+2-3src/opnsense/mvc/app/controllers/OPNsense/Dnsmasq/forms/general.xml
+23-153 files

OPNSense/core a92d96bsrc/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes FilterRuleField.php

mvc: FilterRuleField: remove the other strpos() and reformat

We don't actually know what the separator char is although it's very
likely the default getValues() will always do the right thing and
make the following test a tiny bit easier.

While unwiwnding the if-else we can do a few simplifications along
the way.
DeltaFile
+14-11src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/FilterRuleField.php
+14-111 files

OPNSense/core 0814f39src/opnsense/mvc/app/controllers/OPNsense/Dnsmasq/forms general.xml, src/opnsense/mvc/app/models/OPNsense/Dnsmasq Dnsmasq.xml

Split log-dhcp and the quiet-* flags into two options
DeltaFile
+7-7src/opnsense/mvc/app/models/OPNsense/Dnsmasq/Dnsmasq.xml
+9-2src/opnsense/mvc/app/controllers/OPNsense/Dnsmasq/forms/general.xml
+4-1src/opnsense/service/templates/OPNsense/Dnsmasq/dnsmasq.conf
+20-103 files

OPNSense/core 2eb539dsrc/opnsense/mvc/app/library/OPNsense/Core Config.php

system: use is_int()/array_key_first() in toArray() and fromArray() #9485

The approximation of the magic here is that we are looking for array
elements created by a natural append [] = or equivalent which has
an integer key of a rough range of 0 to count() - 1, but not always as
we can see from the ticket.

unset() breaks the pledge of sequential lists and makes array_is_list()
fail.  Sorting would also break the sequential pledge without resetting
the keyes using array_values() but that approach is too broad.

Instead, get a single key we can do a strict int type check on so that
we are as likely to succeed as was the case before the change in 7ee3b2c.

It's also fast.  ;)
DeltaFile
+3-3src/opnsense/mvc/app/library/OPNsense/Core/Config.php
+3-31 files

OPNSense/core 703835asrc/opnsense/mvc/app/library/OPNsense/Core Config.php

system: use is_int()/array_key_first() in toArray() and fromArray() #9485

The approximation of the magic here is that we are looking for array
elements created by a natural append [] = or equivalent which has
an integer key of a rough range of 0 to count() - 1, but not always as
we can see from the ticket.

unset() breaks the pledge of sequential lists and makes array_is_list()
fail.  Sorting would also break the sequential pledge without resetting
the keyes using array_values() but that approach is too broad.

Instead, get a single key we can do a strict int type check on so that
we are as likely to succeed as was the case before the change in 7ee3b2c.

It's also fast.  ;)
DeltaFile
+3-3src/opnsense/mvc/app/library/OPNsense/Core/Config.php
+3-31 files

OPNSense/core 8f152d9src/opnsense/mvc/app/views/OPNsense/Firewall dnat_rule.volt, src/opnsense/service/templates/OPNsense/IDS suricata.yaml

Merge branch 'master' into firewall-interfacenot-floating
DeltaFile
+0-2,241src/opnsense/www/js/jquery.bootgrid.js
+30-1,768src/opnsense/service/templates/OPNsense/IDS/suricata.yaml
+0-1,144src/www/firewall_nat_edit.php
+627-0src/opnsense/mvc/app/views/OPNsense/Firewall/dnat_rule.volt
+0-625src/opnsense/www/js/opnsense_bootgrid_plugin.js
+0-570src/www/firewall_nat.php
+657-6,348111 files not shown
+2,690-7,275117 files