OPNSense/core 0bb5afbsrc/opnsense/mvc/app/controllers/OPNsense/Monit/Api StatusController.php

Services: Monit: Status - sanitize monit output before offering it.
DeltaFile
+2-1src/opnsense/mvc/app/controllers/OPNsense/Monit/Api/StatusController.php
+2-11 files

OPNSense/core 6207b5csrc/opnsense/mvc/app/views/OPNsense/Firewall alias.volt, src/opnsense/mvc/app/views/OPNsense/Hostdiscovery settings.volt

ui: apply button on multiple tab pages (#10331)
DeltaFile
+4-14src/opnsense/mvc/app/views/OPNsense/IPsec/settings.volt
+2-3src/opnsense/mvc/app/views/OPNsense/Syslog/index.volt
+2-2src/opnsense/mvc/app/views/OPNsense/Hostdiscovery/settings.volt
+1-1src/opnsense/mvc/app/views/OPNsense/Firewall/alias.volt
+9-204 files

OPNSense/core b2d3674src/opnsense/mvc/app/controllers/OPNsense/Routing/Api GroupSettingsController.php, src/opnsense/mvc/app/models/OPNsense/Routing GatewayGroups.php Gateways.php

Merge remote-tracking branch 'origin/master' into kea-dynamic-poc
DeltaFile
+308-0src/opnsense/mvc/app/models/OPNsense/Routing/GatewayGroups.php
+0-288src/www/system_gateway_groups_edit.php
+0-221src/www/system_gateway_groups.php
+147-0src/opnsense/mvc/app/controllers/OPNsense/Routing/Api/GroupSettingsController.php
+2-121src/opnsense/mvc/app/models/OPNsense/Routing/Gateways.php
+83-0src/opnsense/mvc/app/views/OPNsense/Routing/groups.volt
+540-63023 files not shown
+903-73429 files

OPNSense/core 0bd2324src/opnsense/mvc/app/models/OPNsense/Kea KeaDhcpv6.xml

Services: Kea DHCPv6: Clean up allocator and pd-allocator terminology (#10330)
DeltaFile
+6-5src/opnsense/mvc/app/models/OPNsense/Kea/KeaDhcpv6.xml
+6-51 files

OPNSense/core db642a0src/opnsense/mvc/app/views/OPNsense/Unbound dnsbl.volt, src/opnsense/mvc/app/views/layout_partials base_apply_button.volt

ui: SimpleActionButton tab exclusion (#10328)
DeltaFile
+8-19src/opnsense/mvc/app/views/OPNsense/Unbound/dnsbl.volt
+12-0src/opnsense/www/js/opnsense_ui.js
+3-0src/opnsense/mvc/app/views/layout_partials/base_apply_button.volt
+23-193 files

OPNSense/core 6188aa8src/opnsense/mvc/app/controllers/OPNsense/Kea/forms dialogSubnet4.xml, src/opnsense/mvc/app/models/OPNsense/Kea KeaDhcpv4.xml KeaDhcpv4.php

Services: Kea DHCP: Kea DHCPv4 - add subnet allocator field (#10327)

---------

Co-authored-by: Monviech <79600909+Monviech at users.noreply.github.com>
DeltaFile
+10-0src/opnsense/mvc/app/controllers/OPNsense/Kea/forms/dialogSubnet4.xml
+8-0src/opnsense/mvc/app/models/OPNsense/Kea/KeaDhcpv4.xml
+4-0src/opnsense/mvc/app/models/OPNsense/Kea/KeaDhcpv4.php
+22-03 files

OPNSense/core f7c1d83src/etc/inc/plugins.inc.d kea.inc

Services: Kea DHCPv6: Always start the prefix watcher when DHCPv6 is enabled. A reservation with a prefix but without a configured pd_pool is also valid, it's more pragmatic to allow it than doing some complex validation gymnastics to prevent it. (#10329)
DeltaFile
+1-1src/etc/inc/plugins.inc.d/kea.inc
+1-11 files

OPNSense/core d22b3aesrc/etc/inc/plugins.inc.d kea.inc

Services: Kea DHCPv6: Always start the prefix watcher when DHCPv6 is enabled. A reservation with a prefix but without a configured pd_pool is also valid, it's more pragmatic to allow it than doing some complex validation gymnastics to prevent it.
DeltaFile
+1-1src/etc/inc/plugins.inc.d/kea.inc
+1-11 files

OPNSense/core 3d2fa55src/opnsense/www/js opnsense_ui.js

ui: allow multiple tabs, comma separated
DeltaFile
+2-2src/opnsense/www/js/opnsense_ui.js
+2-21 files

OPNSense/core 88200basrc/opnsense/www/js opnsense_ui.js

missing semicolon
DeltaFile
+1-1src/opnsense/www/js/opnsense_ui.js
+1-11 files

OPNSense/core b72be86src/opnsense/mvc/app/views/OPNsense/Unbound dnsbl.volt, src/opnsense/mvc/app/views/layout_partials base_apply_button.volt

ui: SimpleActionButton tab exclusion
DeltaFile
+8-19src/opnsense/mvc/app/views/OPNsense/Unbound/dnsbl.volt
+11-0src/opnsense/www/js/opnsense_ui.js
+3-0src/opnsense/mvc/app/views/layout_partials/base_apply_button.volt
+22-193 files

OPNSense/core 9426be7src/opnsense/mvc/app/views/OPNsense/Unbound dnsbl.volt

unbound: blocklists apply button message (#10283)
DeltaFile
+16-14src/opnsense/mvc/app/views/OPNsense/Unbound/dnsbl.volt
+16-141 files

OPNSense/core 0c8a28esrc/etc/inc filter.lib.inc

firewall: fold legacu DHCPv6 rules a bit more

track6 can test on its own and in this case the presence of the
plugin is also required for automatic configuration mode to work.
DeltaFile
+3-3src/etc/inc/filter.lib.inc
+3-31 files

OPNSense/core b580c68src/etc/inc filter.lib.inc

filter: DHCPv6 server rules for track mode should be excluded in "Identity association" mode, which uses the same field [track6-interface] to determine which interface to bind to. closes https://github.com/opnsense/core/issues/10316
DeltaFile
+1-1src/etc/inc/filter.lib.inc
+1-11 files

OPNSense/core 6c1b8f8src/opnsense/mvc/app/models/OPNsense/Routing Gateways.php

system: fix passing null into getRealInterface()

PR: https://forum.opnsense.org/index.php?topic=51930.0
(cherry picked from commit e80ad1a10630e45746785400807ff8164821b9dc)
DeltaFile
+2-1src/opnsense/mvc/app/models/OPNsense/Routing/Gateways.php
+2-11 files

OPNSense/core e80ad1asrc/opnsense/mvc/app/models/OPNsense/Routing Gateways.php

system: fix passing null into getRealInterface()

PR: https://forum.opnsense.org/index.php?topic=51930.0
DeltaFile
+2-1src/opnsense/mvc/app/models/OPNsense/Routing/Gateways.php
+2-11 files

OPNSense/core 1bd8814src/etc/inc filter.lib.inc

filter: DHCPv6 server rules only when legacy isc is installed, small cleeanup for https://github.com/opnsense/core/issues/10316
DeltaFile
+1-1src/etc/inc/filter.lib.inc
+1-11 files

OPNSense/core 05988fbsrc/opnsense/mvc/app/controllers/OPNsense/Routing GatewayGroupsController.php, src/opnsense/mvc/app/controllers/OPNsense/Routing/Api GroupSettingsController.php SettingsController.php

mvc: style sweep
DeltaFile
+4-3src/opnsense/mvc/app/controllers/OPNsense/Routing/Api/GroupSettingsController.php
+1-2src/opnsense/mvc/app/models/OPNsense/Routing/GatewayGroups.php
+1-1src/opnsense/mvc/app/controllers/OPNsense/Routing/Api/SettingsController.php
+1-1src/opnsense/mvc/app/controllers/OPNsense/Routing/GatewayGroupsController.php
+7-74 files

OPNSense/core f105051src/opnsense/mvc/app/controllers/OPNsense/Routing/Api GroupSettingsController.php, src/opnsense/mvc/app/models/OPNsense/Routing GatewayGroups.php Gateways.php

Gateway Groups: convert to MVC (#10205)

Code performs an inline migration and updates only some callers that directly depended on the old configuration bits. Some convenience functions have been added to GatewayGroups.php to allow for easy configuration access and to satisfy some of the caller demands.

In addition, this code Adjusts the gateway_watcher to now trigger based on Gateway Group trigger level as well, limiting the amount of times alarms/alerts are being generated (and thus potentially unnecessary fw reconfigurations).
DeltaFile
+309-0src/opnsense/mvc/app/models/OPNsense/Routing/GatewayGroups.php
+0-288src/www/system_gateway_groups_edit.php
+0-221src/www/system_gateway_groups.php
+146-0src/opnsense/mvc/app/controllers/OPNsense/Routing/Api/GroupSettingsController.php
+0-120src/opnsense/mvc/app/models/OPNsense/Routing/Gateways.php
+83-0src/opnsense/mvc/app/views/OPNsense/Routing/groups.volt
+538-62915 files not shown
+846-70721 files

OPNSense/core 9eb3158src/etc/inc interfaces.inc, src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api FilterController.php

Merge remote-tracking branch 'origin/master' into kea-dynamic-poc
DeltaFile
+30-11src/opnsense/www/js/opnsense_bootgrid.js
+8-1src/opnsense/mvc/app/views/OPNsense/Firewall/alias.volt
+2-6src/etc/inc/interfaces.inc
+3-2src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterController.php
+1-4src/opnsense/mvc/app/views/OPNsense/Diagnostics/routes.volt
+1-3src/opnsense/mvc/app/views/OPNsense/CaptivePortal/vouchers.volt
+45-279 files not shown
+46-3815 files

OPNSense/core be35c9fsrc/opnsense/www/js opnsense_bootgrid.js

bootgrid: adjust column persistence behavior to prevent horizontal dead space
DeltaFile
+15-0src/opnsense/www/js/opnsense_bootgrid.js
+15-01 files

OPNSense/core ce6728asrc/opnsense/mvc/app/views/OPNsense/Firewall alias.volt

Firewall: Aliases - add a formatter to show content fields as "dynamic" when populated by other components. closes https://github.com/opnsense/core/issues/10315
DeltaFile
+8-1src/opnsense/mvc/app/views/OPNsense/Firewall/alias.volt
+8-11 files

OPNSense/core 4016771src/opnsense/www/js opnsense_bootgrid.js

bootgrid: prevent NaN pagination values for non-ajax grids when row count is set to all
DeltaFile
+1-1src/opnsense/www/js/opnsense_bootgrid.js
+1-11 files

OPNSense/core e014b02src/etc/inc interfaces.inc

interfaces: dhclient.conf doesn't cope with multi-line request/require #10318

This was changed in 26.1.8 for security reasons since it appeared it would,
but the parser only reads the last statement.  Put them back on a single line.
DeltaFile
+2-6src/etc/inc/interfaces.inc
+2-61 files

OPNSense/core 94a084esrc/opnsense/mvc/app/controllers/OPNsense/Interfaces AssignmentController.php, src/opnsense/mvc/app/controllers/OPNsense/Interfaces/Api AssignmentController.php

Interfaces: Assignments - work in progress for https://github.com/opnsense/core/issues/9945

In order to migrate the interface assignments, we need to think of a way to use the differently named xml nodes for interfaces (wan, lan, ..) into something that closely resembles a standard model implementation.
Since we can't match these nodes in our statically defined model xmls, the main idea is to flush all via an in-memory model with a separate load [construct] and save hook.
DeltaFile
+79-0src/opnsense/scripts/interfaces/list_assign_options.php
+77-0src/opnsense/mvc/app/controllers/OPNsense/Interfaces/Api/AssignmentController.php
+50-0src/opnsense/mvc/app/models/OPNsense/Interfaces/Assignment.php
+45-0src/opnsense/mvc/app/views/OPNsense/Interface/assignment.volt
+40-0src/opnsense/mvc/app/controllers/OPNsense/Interfaces/AssignmentController.php
+20-0src/opnsense/mvc/app/controllers/OPNsense/Interfaces/forms/dialogAssignment.xml
+311-03 files not shown
+342-09 files

OPNSense/core 0364d3dsrc/opnsense/mvc/app/controllers/OPNsense/Interfaces AssignmentController.php, src/opnsense/mvc/app/controllers/OPNsense/Interfaces/Api AssignmentController.php

Interfaces: Assignments - work in progress for https://github.com/opnsense/core/issues/9945

In order to migrate the interface assignments, we need to think of a way to use the differently named xml nodes for interfaces (wan, lan, ..) into something that closely resembles a standard model implementation.
Since we can't match these nodes in our statically defined model xmls, the main idea is to flush all via an in-memory model with a separate load [construct] and save hook.
DeltaFile
+77-0src/opnsense/mvc/app/controllers/OPNsense/Interfaces/Api/AssignmentController.php
+48-0src/opnsense/mvc/app/models/OPNsense/Interfaces/Assignment.php
+45-0src/opnsense/mvc/app/views/OPNsense/Interface/assignment.volt
+40-0src/opnsense/mvc/app/controllers/OPNsense/Interfaces/AssignmentController.php
+10-0src/opnsense/mvc/app/models/OPNsense/Interfaces/Assignment.xml
+8-0src/opnsense/mvc/app/controllers/OPNsense/Interfaces/forms/dialogAssignment.xml
+228-01 files not shown
+234-07 files

OPNSense/core 49b54efsrc/opnsense/mvc/app/controllers/OPNsense/Firewall/Api FilterController.php

Firewall: Rules [new]: Fix automatically generated rules category not being displayed anymore (#10310)
DeltaFile
+3-2src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterController.php
+3-21 files

OPNSense/core 21fd3f4src/opnsense/www/js opnsense_bootgrid.js

bootgrid: remove unused getTotalRowCount method
DeltaFile
+0-4src/opnsense/www/js/opnsense_bootgrid.js
+0-41 files

OPNSense/core 5bf5e59src/opnsense/mvc/app/controllers/OPNsense/Kea/forms dialogSubnet6.xml, src/opnsense/mvc/app/views/OPNsense/Kea dhcpv6.volt

Attach a grid formatter to option_data_autocollect to show if options are dynamic
DeltaFile
+7-2src/opnsense/mvc/app/views/OPNsense/Kea/dhcpv6.volt
+2-1src/opnsense/mvc/app/controllers/OPNsense/Kea/forms/dialogSubnet6.xml
+9-32 files

OPNSense/core 00d6014src/opnsense/mvc/app/models/OPNsense/Kea KeaDhcpv6.php

Validate that domain_search and dns_servers is empty when option_data_autocollect is used.
DeltaFile
+10-0src/opnsense/mvc/app/models/OPNsense/Kea/KeaDhcpv6.php
+10-01 files