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

OPNSense/core 3cd72b0src/etc rc.routing_configure

system: safe execution tweaks in rc.routing_configure
DeltaFile
+3-3src/etc/rc.routing_configure
+3-31 files

OPNSense/core a282443src/etc/inc util.inc

backend: extend mwexecfb() with PID and log file support
DeltaFile
+15-1src/etc/inc/util.inc
+15-11 files

OPNSense/core 1194bdfsrc/etc/inc util.inc

backend: use mwexecf(m) where possible
DeltaFile
+6-8src/etc/inc/util.inc
+6-81 files

OPNSense/core af157c1src/etc/inc filter.inc

firewall: safe execution changes in rules reloading code
DeltaFile
+12-13src/etc/inc/filter.inc
+12-131 files

OPNSense/core ef7286csrc/etc/inc filter.inc

firewall: tweak previous a bit more
DeltaFile
+5-5src/etc/inc/filter.inc
+5-51 files

OPNSense/core d13fa46src/etc/inc filter.inc

firewall: this looks a little better
DeltaFile
+1-1src/etc/inc/filter.inc
+1-11 files

OPNSense/core a8072d0src/opnsense/mvc/app/controllers/OPNsense/Kea DhcpController.php, src/opnsense/mvc/app/controllers/OPNsense/Kea/Api LeasesController.php

dhcp/kea: Add lease commands, tabulator GroupBy, URL hashes (#9409)

(cherry picked from commit cc2fa5ff1f30167a06a2500effb0f22a1cb41202)
(cherry picked from commit b6b61f9e94dccf6a5308fbb99cc0c930953e300a)
(cherry picked from commit 6d1ff4c975f8468dacd0c8416c09b0e8ba49a0d0)
DeltaFile
+119-75src/opnsense/mvc/app/views/OPNsense/Kea/dhcpv6.volt
+97-40src/opnsense/mvc/app/views/OPNsense/Kea/dhcpv4.volt
+47-1src/opnsense/mvc/app/views/OPNsense/Kea/leases4.volt
+46-0src/opnsense/mvc/app/views/OPNsense/Kea/leases6.volt
+25-0src/opnsense/mvc/app/controllers/OPNsense/Kea/Api/LeasesController.php
+7-7src/opnsense/mvc/app/controllers/OPNsense/Kea/DhcpController.php
+341-1233 files not shown
+355-1259 files

OPNSense/core e0d429fsrc/opnsense/mvc/app/views/OPNsense/Diagnostics fw_log.volt

firewall: live log: revert static property, persistence is disabled for this grid

ref: https://forum.opnsense.org/index.php?topic=49874.0
(cherry picked from commit c11efa62bda8af907ff4b6877727b4c100334560)
DeltaFile
+0-1src/opnsense/mvc/app/views/OPNsense/Diagnostics/fw_log.volt
+0-11 files

OPNSense/core c49f1fdsrc/opnsense/mvc/app/views/OPNsense/Diagnostics fw_log.volt

firewall: live view: restructure DOM layout to reduce wasted space. Closes https://github.com/opnsense/core/issues/9416

(cherry picked from commit d698b4e5ad41b30c5b89e2cdd842b6889543178f)
DeltaFile
+6-11src/opnsense/mvc/app/views/OPNsense/Diagnostics/fw_log.volt
+6-111 files

OPNSense/core 800a641src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes BaseField.php

mvc: typ typo
DeltaFile
+1-1src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php
+1-11 files

OPNSense/core d128db0src/etc/inc console.inc

shell: rewite timeout() using safe execution functions

This now works like opnsense-importer does it except for the print
which still counts here instead of showing a character per second.
Instead of returning the character we return the error if a key was
pressed, i.e. reversed to signal that timeout() was an actual timeout
or interrupted.
DeltaFile
+16-29src/etc/inc/console.inc
+16-291 files

OPNSense/core 96f2c34src/opnsense/scripts/filter/lib/alias __init__.py

Firewall: Aliases - do not support nesting in geoip aliases to prevent overlapping countries with existing alias contents, closes https://github.com/opnsense/core/issues/9482

(cherry picked from commit 7b9aaf9f5dd6f747f1eaafefa5ba1bd5bd6549c3)
DeltaFile
+11-2src/opnsense/scripts/filter/lib/alias/__init__.py
+11-21 files

OPNSense/core 7b9aaf9src/opnsense/scripts/filter/lib/alias __init__.py

Firewall: Aliases - do not support nesting in geoip aliases to prevent overlapping countries with existing alias contents, closes https://github.com/opnsense/core/issues/9482
DeltaFile
+11-2src/opnsense/scripts/filter/lib/alias/__init__.py
+11-21 files