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

Remove this shadowing of the interface variable which came from the earlier merge conflict with master
DeltaFile
+0-3src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/FilterRuleField.php
+0-31 files

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

unbound: clean up marker and size files, closes #9489 (#9491)

* unbound: clean up marker and size files, closes #9489

* unbound: ditch dnsbl_available and bind around self.dnsbl

* unbound: ditch chained comparison
DeltaFile
+29-28src/opnsense/scripts/unbound-dnsbl/lib/dnsbl.py
+29-281 files

OPNSense/core 7b175c7src/etc/inc/plugins.inc.d dhcpd.inc, src/opnsense/mvc/app/models/OPNsense/Firewall Filter.php

Merge branch 'master' into firewall-interfacenot-floating
DeltaFile
+111-108src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModelTest.php
+101-97src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.php
+114-0src/opnsense/mvc/tests/app/library/OPNsense/Core/ConfigTest.php
+48-0src/opnsense/mvc/tests/app/library/OPNsense/Core/ConfigConfig/backup/array.xml
+26-8src/etc/inc/plugins.inc.d/dhcpd.inc
+28-5src/opnsense/mvc/app/views/OPNsense/Diagnostics/fw_log.volt
+428-21831 files not shown
+589-32737 files

OPNSense/core 9209c65src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api FilterController.php, src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes FilterRuleField.php

Firewall: Rules [new] - cleanup logic for https://github.com/opnsense/core/pull/9426
DeltaFile
+13-18src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterController.php
+1-6src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/FilterRuleField.php
+14-242 files

OPNSense/core 972433b. Makefile

make: allow test to be run always

I think the install dependencies were removed.  At least when patching
the local installation the tests do not care suggesting they use the
proper repository files for testing.
DeltaFile
+0-6Makefile
+0-61 files

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

mvc: use LIBXML_NOBLANKS when loading config files

This avoids edge cases where the tag is not closing or leaving
whitespaces around.
DeltaFile
+1-1src/opnsense/mvc/app/library/OPNsense/Core/Config.php
+1-11 files

OPNSense/core 80d87f7. plist, src/opnsense/mvc/tests/app/library/OPNsense/Core ConfigTest.php

tests: restructure ConfigTest to allow for multiple test files

And add the failing test for the upcoming fix.
DeltaFile
+48-0src/opnsense/mvc/tests/app/library/OPNsense/Core/ConfigConfig/backup/array.xml
+0-48src/opnsense/mvc/tests/app/library/OPNsense/Core/ConfigConfig/backup/config.xml
+36-4src/opnsense/mvc/tests/app/library/OPNsense/Core/ConfigTest.php
+8-0src/opnsense/mvc/tests/app/library/OPNsense/Core/ConfigConfig/backup/object.xml
+2-1plist
+94-535 files

OPNSense/core f372161src/opnsense/mvc/app/models/OPNsense/Firewall Filter.php

Firewall - fix regression in https://github.com/opnsense/core/commit/b9620fd6791ab8730467ae9cc4ca33adb9a9a84c caused by fields not available in both snat and rules.

This commit re-arranges the existing validations so the type specific ones are only evaluated on that type.
DeltaFile
+101-97src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.php
+101-971 files

OPNSense/core e9d2b9e. plist, src/opnsense/mvc/app/views/OPNsense/Firewall filter.volt

filter.volt has no consumer left and can be removed
DeltaFile
+0-159src/opnsense/mvc/app/views/OPNsense/Firewall/filter.volt
+0-1plist
+0-1602 files

OPNSense/core 4d81f7csrc/opnsense/mvc/app/controllers/OPNsense/Firewall SourceNatController.php, src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api SourceNatController.php

nat/snat: Refactor source nat view
DeltaFile
+623-0src/opnsense/mvc/app/views/OPNsense/Firewall/snat_rule.volt
+200-81src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogSNatRule.xml
+34-4src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/SourceNatController.php
+4-16src/opnsense/mvc/app/controllers/OPNsense/Firewall/SourceNatController.php
+3-3src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.xml
+3-3src/opnsense/mvc/app/models/OPNsense/Firewall/Menu/Menu.xml
+867-1073 files not shown
+874-1079 files

OPNSense/core ff084dasrc/etc/inc/plugins.inc.d netflow.inc core.inc

System: High Availability - missing syslog caused by netflow_xmlrpc_sync() shadowing the section

PR: https://github.com/opnsense/core/issues/9481

(cherry picked from commit 6e478cf67131b2646ea53e2da3bb855a74bb5b3b)
(cherry picked from commit 4bfa65463c869d0e9decd26aa9a3e1e315e8b579)
DeltaFile
+4-7src/etc/inc/plugins.inc.d/netflow.inc
+1-1src/etc/inc/plugins.inc.d/core.inc
+5-82 files

OPNSense/core 4bfa654src/etc/inc/plugins.inc.d netflow.inc

netflow: annotate typo via b2074ef3a3b73cddb2 #9481
DeltaFile
+4-7src/etc/inc/plugins.inc.d/netflow.inc
+4-71 files

OPNSense/core 0ac213bsrc/opnsense/mvc/app/views/OPNsense/Diagnostics fw_log.volt, src/opnsense/www/js opnsense_bootgrid.js

firewall: live view: allow column modifications and combine hostname columns

Since the normal bootgrid implementation expects an action bar to
be able to provide a reset, the shortest path here is to expose
the _setPersistence toggle to allow manual resets from pages
where an action bar is not present.

While here, modify the lookup formatter such that it includes
ports as well, and make sure we unset the src/dst columns
if we lookup hostnames, and vice versa if we don't.
DeltaFile
+28-5src/opnsense/mvc/app/views/OPNsense/Diagnostics/fw_log.volt
+4-0src/opnsense/www/js/opnsense_bootgrid.js
+32-52 files

OPNSense/core 6e478cfsrc/etc/inc/plugins.inc.d core.inc

System: High Availability - missing syslog caused by netflow_xmlrpc_sync() shadowing the section. closes https://github.com/opnsense/core/issues/9481

As people might already be using "syslog" to sync Netflow, we better rename syslog with syslog-ng (which we use anyway).
DeltaFile
+1-1src/etc/inc/plugins.inc.d/core.inc
+1-11 files

OPNSense/core 8a33ce8. plist, src/opnsense/mvc/app/models/OPNsense/Radvd Radvd.xml Radvd.php

radvd: MVC/API WIP #8351
DeltaFile
+136-0src/opnsense/mvc/app/models/OPNsense/Radvd/Migrations/M1_0_0.php
+73-0src/opnsense/mvc/app/models/OPNsense/Radvd/Radvd.xml
+35-0src/opnsense/mvc/app/models/OPNsense/Radvd/Radvd.php
+3-0plist
+247-04 files

OPNSense/core 15a0918. plist, src/opnsense/mvc/app/models/OPNsense/Radvd Radvd.xml Radvd.php

radvd: MVC/API WIP #8351
DeltaFile
+82-0src/opnsense/mvc/app/models/OPNsense/Radvd/Radvd.xml
+76-0src/opnsense/mvc/app/models/OPNsense/Radvd/Migrations/M1_0_0.php
+35-0src/opnsense/mvc/app/models/OPNsense/Radvd/Radvd.php
+3-0plist
+196-04 files

OPNSense/core 8d89a6csrc/opnsense/scripts/filter update_tables.py, src/opnsense/scripts/filter/lib/alias __init__.py bgpasn.py

Firewall: Aliases - add has_parser() to check if an alias has a valid parser available (get_parser() may throw an exception when failed) and re-throw requests.exceptions.ConnectionError as IOError in BGPASN, likely closes https://github.com/opnsense/core/issues/9505
DeltaFile
+9-2src/opnsense/scripts/filter/lib/alias/__init__.py
+6-1src/opnsense/scripts/filter/lib/alias/bgpasn.py
+1-1src/opnsense/scripts/filter/update_tables.py
+16-43 files

OPNSense/core 21a0fb7src/etc/inc util.inc

backend: remove mwexecf_bg() which is already unused
DeltaFile
+0-5src/etc/inc/util.inc
+0-51 files

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

The interface formatter is useless here since only one interface is allowed and there is no inversion allowed
DeltaFile
+0-25src/opnsense/mvc/app/views/OPNsense/Firewall/onat_rule.volt
+0-1src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogOneToOneRule.xml
+0-262 files

OPNSense/core 4810ad6src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms dialogNptRule.xml, src/opnsense/mvc/app/views/OPNsense/Firewall npt_rule.volt

The interface formatter is useless here since only one interface is allowed and there is no inversion allowed
DeltaFile
+0-25src/opnsense/mvc/app/views/OPNsense/Firewall/npt_rule.volt
+0-2src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogNptRule.xml
+0-272 files

OPNSense/core 5a48dacsrc/opnsense/mvc/app/controllers/OPNsense/Firewall NptController.php, src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api NptController.php

Fix copyright date
DeltaFile
+1-1src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/NptController.php
+1-1src/opnsense/mvc/app/controllers/OPNsense/Firewall/NptController.php
+2-22 files

OPNSense/core bc5e670. plist, src/opnsense/mvc/app/controllers/OPNsense/Firewall NptController.php

nat: Refactor network prefix translation (NPT) view
DeltaFile
+532-0src/opnsense/mvc/app/views/OPNsense/Firewall/npt_rule.volt
+88-28src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogNptRule.xml
+33-9src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/NptController.php
+3-24src/opnsense/mvc/app/controllers/OPNsense/Firewall/NptController.php
+3-3src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.xml
+1-0plist
+660-646 files

OPNSense/core 18205c7src/etc/inc/plugins.inc.d dhcrelay.inc

dhcrelay: some style in the pugin file
DeltaFile
+14-12src/etc/inc/plugins.inc.d/dhcrelay.inc
+14-121 files

OPNSense/core 9dd1bd1src/etc/rc.subr.d php var, src/opnsense/mvc/tests/app/config config.php

mvc: now that config.xml behaviour is fixed change tests to own directory
DeltaFile
+3-4src/opnsense/mvc/tests/app/config/config.php
+1-1src/etc/rc.subr.d/php
+1-0src/etc/rc.subr.d/var
+5-53 files

OPNSense/core 7cbda13src/opnsense/mvc/app/config config.php, src/opnsense/mvc/app/controllers/OPNsense/Core/Api TunablesController.php DefaultsController.php

mvc: introduce defaultConfig property for AppConfig

Related to testing there is a side effect from snatching the
default config.xml if no other configuration was found.  We
want the tests to be independent of runtime so this is a first
step towards it.  While here replace other uses of the default
file acquire and almost completely fix the permission issue
on default bootstrap.
DeltaFile
+10-4src/opnsense/mvc/app/library/OPNsense/Core/Config.php
+9-3src/opnsense/mvc/app/controllers/OPNsense/Core/Api/TunablesController.php
+6-2src/opnsense/mvc/app/controllers/OPNsense/Core/Api/DefaultsController.php
+1-0src/opnsense/mvc/app/config/config.php
+1-0src/opnsense/mvc/tests/app/config/config.php
+27-95 files

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

Simplify labels
DeltaFile
+2-2src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogOneToOneRule.xml
+2-21 files

OPNSense/core 7eaf080src/opnsense/mvc/tests/app/library/OPNsense/Core ConfigTest.php

tests: ConfigTest: we can cast and do not need save
DeltaFile
+1-2src/opnsense/mvc/tests/app/library/OPNsense/Core/ConfigTest.php
+1-21 files

OPNSense/core 6e634f6. plist, src/opnsense/mvc/tests/app/library/OPNsense/Core ConfigTest.php

tests: add a Core\Config class test for toArray/fromArray
DeltaFile
+83-0src/opnsense/mvc/tests/app/library/OPNsense/Core/ConfigTest.php
+48-0src/opnsense/mvc/tests/app/library/OPNsense/Core/ConfigConfig/backup/config.xml
+2-0plist
+133-03 files

OPNSense/core b9d7cf3src/opnsense/mvc/tests/app/models/OPNsense/Base BaseModelTest.php, src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModelConfig/backup config.xml

tests: BaseModelTest: disable backups and mock revision

Change class invokes to self and add a $configDir variable.
DeltaFile
+79-78src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModelTest.php
+3-3src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModelConfig/backup/config.xml
+82-812 files

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/etc/config.xml.sample
+0-5src/opnsense/mvc/tests/app/models/OPNsense/ACL/AclConfig/config.xml
+0-102 files