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

OPNSense/core 9951b13src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api FilterController.php

Update src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterController.php

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

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

system: experiment with is_int+array_key_first #9485
DeltaFile
+3-3src/opnsense/mvc/app/library/OPNsense/Core/Config.php
+3-31 files

OPNSense/core 9e80580src/etc config.xml.sample

system: scrub config.xml sample with toArray/fromArray
DeltaFile
+4-4src/etc/config.xml.sample
+4-41 files

OPNSense/core 8070438src/etc config.xml.sample

system: fix indent in config.xml sample
DeltaFile
+7-7src/etc/config.xml.sample
+7-71 files

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

Revert "Config - ditch isArraySequential() in favor of the new array_is_list() introduced in PHP 8.1. closes https://github.com/opnsense/core/pull/9424"

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

This reverts commit 76d9f0ad599b5ce80d607ff5ed185b967a70fb15.
DeltaFile
+12-2src/opnsense/mvc/app/library/OPNsense/Core/Config.php
+12-21 files

OPNSense/core 2c3e2f9src/opnsense/mvc/app/controllers/OPNsense/Unbound/Api SettingsController.php

unbound: move this up

(cherry picked from commit 633bc0bb94ee94a149a1e5d88ef43bd520f600a1)
DeltaFile
+7-7src/opnsense/mvc/app/controllers/OPNsense/Unbound/Api/SettingsController.php
+7-71 files

OPNSense/core 633bc0bsrc/opnsense/mvc/app/controllers/OPNsense/Unbound/Api SettingsController.php

unbound: move this up
DeltaFile
+7-7src/opnsense/mvc/app/controllers/OPNsense/Unbound/Api/SettingsController.php
+7-71 files

OPNSense/core e24d3cdsrc/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 cf65f9bsrc/opnsense/mvc/app/controllers/OPNsense/Kea/forms dialogSubnet4.xml dialogSubnet6.xml, src/opnsense/mvc/app/models/OPNsense/Kea KeaDhcpv4.xml KeaDhcpv6.xml

Services: Kea DHCP: Kea DHCPv4 - add DNR DHCP Option (#9341)

* Services: Kea DHCP: Kea DHCPv4 - add DNR DHCP Option

(cherry picked from commit b5195f8a22885f72a2a40953c86f38cb274c6302)
DeltaFile
+10-0src/opnsense/mvc/app/controllers/OPNsense/Kea/forms/dialogSubnet4.xml
+10-0src/opnsense/mvc/app/controllers/OPNsense/Kea/forms/dialogSubnet6.xml
+3-0src/opnsense/mvc/app/models/OPNsense/Kea/KeaDhcpv4.xml
+3-0src/opnsense/mvc/app/models/OPNsense/Kea/KeaDhcpv6.xml
+26-04 files

OPNSense/core 0ead4ecsrc/opnsense/mvc/app/controllers/OPNsense/Unbound/Api SettingsController.php

unbound: overview: fix quick allow/blocklist actions

(cherry picked from commit 344c322e8124a611c0e9c23195f071a4273398af)
(cherry picked from commit c39134ab9456642ff8ab4302fc3e97ad1ea1651a)
DeltaFile
+39-34src/opnsense/mvc/app/controllers/OPNsense/Unbound/Api/SettingsController.php
+39-341 files

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

firewall: not taking any chances with isset() then via @adschellevis
DeltaFile
+3-1src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/FilterRuleField.php
+3-11 files

OPNSense/core c39134asrc/opnsense/mvc/app/controllers/OPNsense/Unbound/Api SettingsController.php

unbound: style
DeltaFile
+0-1src/opnsense/mvc/app/controllers/OPNsense/Unbound/Api/SettingsController.php
+0-11 files

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

firewall: make missing interface floating too in FilterRuleField
DeltaFile
+2-3src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/FilterRuleField.php
+2-31 files

OPNSense/core 344c322src/opnsense/mvc/app/controllers/OPNsense/Unbound/Api SettingsController.php

unbound: overview: fix quick allow/blocklist actions

The quick fix here is to block & allow on every defined policy. Ideally
one should be able to select a policy where an entry should apply
to in the case of a block action, and map back to the policy in case
of an allow action. The latter isn't possible in the current construct
yet as it needs a slight adjustment to the data format.
DeltaFile
+40-34src/opnsense/mvc/app/controllers/OPNsense/Unbound/Api/SettingsController.php
+40-341 files

OPNSense/core b9620fdsrc/opnsense/mvc/app/controllers/OPNsense/Firewall/Api FilterController.php, src/opnsense/mvc/app/models/OPNsense/Firewall Filter.php

mvc: a bit more of asInt() and friends
DeltaFile
+9-7src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterController.php
+4-6src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.php
+4-4src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/FilterRuleField.php
+1-1src/opnsense/mvc/app/models/OPNsense/Kea/KeaCtrlAgent.php
+1-1src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.php
+19-195 files

OPNSense/core b864f36src/etc rc.filter_synchronize

firewall: safe execution changes in rc.filter_synchronize
DeltaFile
+4-4src/etc/rc.filter_synchronize
+4-41 files