OPNSense/core 5219572src/opnsense/mvc/app/models/OPNsense/Radvd Radvd.xml Radvd.php

Fix some typos in validation messages of Radvd.xml and Radvd.php
DeltaFile
+5-5src/opnsense/mvc/app/models/OPNsense/Radvd/Radvd.xml
+1-1src/opnsense/mvc/app/models/OPNsense/Radvd/Radvd.php
+6-62 files

OPNSense/core d3e46b8src/opnsense/mvc/app/library/OPNsense/OpenVPN ArchiveOpenVPN.php, src/opnsense/mvc/app/models/OPNsense/Firewall Filter.php

Merge branch 'master' into radvd_8351
DeltaFile
+0-17src/www/guiconfig.inc
+0-6src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.php
+3-0src/opnsense/scripts/suricata/setup.sh
+1-1src/opnsense/mvc/app/models/OPNsense/Interfaces/ACL/ACL.xml
+1-1src/opnsense/mvc/app/library/OPNsense/OpenVPN/ArchiveOpenVPN.php
+1-1src/opnsense/mvc/app/models/OPNsense/IDS/IDS.php
+6-261 files not shown
+7-277 files

OPNSense/core 66f32cbsrc/opnsense/mvc/app/models/OPNsense/Interfaces Vip.php

radvd: style on previous
DeltaFile
+12-12src/opnsense/mvc/app/models/OPNsense/Interfaces/Vip.php
+12-121 files

OPNSense/core c34d7f0src/opnsense/mvc/app/models/OPNsense/Radvd Radvd.php

radvd: put this back
DeltaFile
+1-1src/opnsense/mvc/app/models/OPNsense/Radvd/Radvd.php
+1-11 files

OPNSense/core 861ffbdsrc/etc/inc legacy_bindings.inc, src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api FilterBaseController.php

firewall: simplify port alias check loosely refs #8806

(cherry picked from commit 7e0600ab02dac48965eb741308d2f61875445013)
(cherry picked from commit a09d2b7019a3b361a448f7e58690f72216a53c7b)
(cherry picked from commit f0da2b63a39c7b632edfb40d09fd174af654f205)
DeltaFile
+2-2src/opnsense/mvc/app/library/OPNsense/Firewall/Util.php
+2-2src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/PortField.php
+2-2src/etc/inc/legacy_bindings.inc
+2-2src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterBaseController.php
+1-1src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/NetworkAliasField.php
+1-1src/opnsense/mvc/app/library/OPNsense/Firewall/Rule.php
+10-106 files

OPNSense/core 0f5c34dsrc/opnsense/mvc/app/models/OPNsense/IDS IDS.php

suricata: style update
DeltaFile
+2-2src/opnsense/mvc/app/models/OPNsense/IDS/IDS.php
+2-21 files

OPNSense/core 8582c7dsrc/opnsense/scripts/filter/lib/alias arpcache.py

Firewall: Aliases - use new hostdiscovery (with arp/ndp fallback) in mac type aliases.

While here, cleanup some redundant code, if a mac address is in the local cache, the local cache should be complete at anytime.
Technically, for legacy ndp, this might be a bit worse than before, but as hostdiscovery is more complete, that should be a small price to pay.

Eventually, when hostdiscoverty is the standard, we should be able to ditch the /tmp/alias_filter_arp.cache construction as hostdiscovery has its own database.

(cherry picked from commit b2a30fc5606ce2d6c781ae9b7282b83e8ec35ac3)
DeltaFile
+17-32src/opnsense/scripts/filter/lib/alias/arpcache.py
+17-321 files

OPNSense/core bf91b63src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api AccessController.php, src/opnsense/service/conf/actions.d actions_hostwatch.conf

Services: Captive Portal - use new hostwatch service introduced in https://github.com/opnsense/core/pull/9354 to collect mac addresses for 26.1

(cherry picked from commit dad25b534f8470a0552ea96b91908d9b5e8fd05c)
DeltaFile
+7-5src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/AccessController.php
+8-0src/opnsense/service/conf/actions.d/actions_hostwatch.conf
+15-52 files

OPNSense/core 8f9309esrc/etc/inc/plugins.inc.d hostwatch.inc, src/opnsense/mvc/app/controllers/OPNsense/Hostdiscovery SettingsController.php

Interfaces: Neighbors: Automatic Discovery - add new hostdiscovery feature (#9354)

(cherry picked from commit 61663d08583b4afc20d80016183e73b595bd5923)
(cherry picked from commit 94b786c4e83a5f277e3f034f67e994f134625908)
(cherry picked from commit 5909ccc0b22cc7fdbf7daadc3bb77c375668ea7b)
(cherry picked from commit 6c325c94a8b08def236edd7cf8110f0698220da8)
(cherry picked from commit 1894c6133bd3f503c6298a823ff624c97a8ee735)
(cherry picked from commit 8d6439a61132807132f8c6f246f4c522211934ed)
(cherry picked from commit 650b5ab17a2cd98efe67bbce5bcaf0100df57a7b)
(cherry picked from commit e3714d3f4373030120d2905c6c3396b0119d3271)
(cherry picked from commit de09b458f55c63d07726638dcbafe6d9d3d38e58)
(cherry picked from commit 1c1c494f93d1fc65e5f6b7aad4a8021c8d51e534)
DeltaFile
+114-0src/opnsense/mvc/app/views/OPNsense/Hostdiscovery/settings.volt
+99-0src/opnsense/scripts/interfaces/list_hosts.py
+56-0src/opnsense/mvc/app/controllers/OPNsense/Hostdiscovery/Api/ServiceController.php
+52-0src/etc/inc/plugins.inc.d/hostwatch.inc
+38-0src/opnsense/mvc/app/controllers/OPNsense/Hostdiscovery/SettingsController.php
+37-0src/opnsense/mvc/app/controllers/OPNsense/Hostdiscovery/Api/SettingsController.php
+396-013 files not shown
+608-119 files

OPNSense/core 024a78dsrc/opnsense/mvc/app/models/OPNsense/Interfaces/ACL ACL.xml

interfaces: update ACL
DeltaFile
+1-1src/opnsense/mvc/app/models/OPNsense/Interfaces/ACL/ACL.xml
+1-11 files

OPNSense/core ea955f4src/opnsense/mvc/app/models/OPNsense/IDS IDS.php

suricata: for two small changes this isn't needed
DeltaFile
+1-1src/opnsense/mvc/app/models/OPNsense/IDS/IDS.php
+1-11 files

OPNSense/core 43eaa70src/opnsense/mvc/app/models/OPNsense/IDS IDS.xml

suricata: uppercase
DeltaFile
+1-1src/opnsense/mvc/app/models/OPNsense/IDS/IDS.xml
+1-11 files

OPNSense/core 8f918f5src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes BaseField.php, src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes TextFieldTest.php

mvc: BaseField: add isSet() and shift tests

Keeps isEmptyAndRequired() plus avoids other code changes for now.
DeltaFile
+18-9src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php
+8-5src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/TextFieldTest.php
+26-142 files

OPNSense/core 1c9a2a1src/opnsense/scripts/suricata setup.sh

suricata: mask "error" on loaded module
DeltaFile
+1-1src/opnsense/scripts/suricata/setup.sh
+1-11 files

OPNSense/core f52c58csrc/opnsense/mvc/app/library/OPNsense/OpenVPN ArchiveOpenVPN.php

openvpn: fix archive export

(cherry picked from commit 00687dbeb5489ad2708ef7924c34186a38db2168)
DeltaFile
+1-1src/opnsense/mvc/app/library/OPNsense/OpenVPN/ArchiveOpenVPN.php
+1-11 files

OPNSense/core 00687dbsrc/opnsense/mvc/app/library/OPNsense/OpenVPN ArchiveOpenVPN.php

openvpn: fix archive export
DeltaFile
+1-1src/opnsense/mvc/app/library/OPNsense/OpenVPN/ArchiveOpenVPN.php
+1-11 files

OPNSense/core 632d5bbsrc/opnsense/mvc/app/views/OPNsense/Kea dhcpv4.volt, src/opnsense/www/js opnsense_bootgrid.js

bootgrid: allow conditional command rendering through a filter function

(cherry picked from commit 3fe0cc4a28c37b874a53807abdb3a605db41d46e)
(cherry picked from commit 3736489db27e0f5a1406ba5d0bad0c4bf71153d7)
(cherry picked from commit 1356068da4043874475f6ed0a20b611d05ca6a70)
(cherry picked from commit d25a8acd8ed5f17c6cad005525af2245cf623ed9)
DeltaFile
+183-121src/opnsense/www/js/opnsense_bootgrid.js
+35-39src/opnsense/mvc/app/views/OPNsense/Kea/dhcpv4.volt
+218-1602 files

OPNSense/core 88e6e05src/www guiconfig.inc

firewall: remove unused function pprint_address()
DeltaFile
+0-17src/www/guiconfig.inc
+0-171 files

OPNSense/core 7abbca5src/opnsense/mvc/app/models/OPNsense/Radvd Radvd.php Radvd.xml

Add MinRtrAdvInterval and AdvDefaultLifetime validations to Radvd.php as the require calculations
DeltaFile
+57-1src/opnsense/mvc/app/models/OPNsense/Radvd/Radvd.php
+1-2src/opnsense/mvc/app/models/OPNsense/Radvd/Radvd.xml
+58-32 files

OPNSense/core daefd8asrc/opnsense/scripts/suricata setup.sh

Services: Intrusion Detection - load ipdivert for new inline mode (missing in https://github.com/opnsense/core/pull/9561)
DeltaFile
+3-0src/opnsense/scripts/suricata/setup.sh
+3-01 files

OPNSense/core 8499115src/opnsense/mvc/app/models/OPNsense/Radvd Radvd.xml

Add some missing validations to model
DeltaFile
+36-6src/opnsense/mvc/app/models/OPNsense/Radvd/Radvd.xml
+36-61 files

OPNSense/core 3bca07asrc/opnsense/mvc/app/controllers/OPNsense/Radvd/forms dialogEntry.xml

Add missing help texts to dialog
DeltaFile
+11-1src/opnsense/mvc/app/controllers/OPNsense/Radvd/forms/dialogEntry.xml
+11-11 files

OPNSense/core a225c72src/etc/inc/plugins.inc.d radvd.inc, src/opnsense/mvc/app/models/OPNsense/Radvd/ACL ACL.xml

radvd: remove log file and increase default level
DeltaFile
+0-9src/opnsense/mvc/app/models/OPNsense/Radvd/ACL/ACL.xml
+1-5src/opnsense/mvc/app/models/OPNsense/Radvd/Menu/Menu.xml
+1-1src/etc/inc/plugins.inc.d/radvd.inc
+2-153 files

OPNSense/core 3269960src/opnsense/mvc/app/models/OPNsense/Interfaces Vip.php, src/opnsense/mvc/app/models/OPNsense/Radvd/FieldTypes VipLinkLocalField.php

radvd: migrate and validate subnet through VIP model
DeltaFile
+41-1src/opnsense/mvc/app/models/OPNsense/Interfaces/Vip.php
+14-2src/opnsense/mvc/app/models/OPNsense/Radvd/Migrations/M1_0_0.php
+2-12src/opnsense/mvc/app/models/OPNsense/Radvd/FieldTypes/VipLinkLocalField.php
+57-153 files

OPNSense/core e3ed492src/opnsense/mvc/app/controllers/OPNsense/Firewall MigrationController.php, src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api MigrationController.php

Firewall: Rules:  Migration assistant - add export option and guidance for migrations to the new mvc system.

Add new "Firewall: Rules: Migration assistant" to help people moving to our new mvc based firewall system by offering a couple of simple steps for exporting the old rules into a csv file and importing them into the new system. When all rules are migrated the user may drop all old ones using the ConfigMaintenance module used in "defaults".

There's one small issue remaining in fbegin.inc as it doesn't render the icon correctly due to VisibleName being escaped currently (which isn't the case in our mvc template).

closes https://github.com/opnsense/core/issues/9579
DeltaFile
+142-0src/opnsense/scripts/filter/list_legacy_rules.php
+98-0src/opnsense/mvc/app/views/OPNsense/Firewall/firewall_migration.volt
+55-0src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/MigrationController.php
+36-0src/opnsense/mvc/app/controllers/OPNsense/Firewall/MigrationController.php
+6-1src/opnsense/mvc/app/models/OPNsense/Base/Menu/MenuSystem.php
+7-0src/opnsense/service/conf/actions.d/actions_filter.conf
+344-11 files not shown
+348-17 files

OPNSense/core 0096f03src/opnsense/mvc/app/controllers/OPNsense/Firewall MigrationController.php, src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api MigrationController.php

Firewall: Rules:  Migration assistant - add export option and guidance for migrations to the new mvc system.
DeltaFile
+142-0src/opnsense/scripts/filter/list_legacy_rules.php
+98-0src/opnsense/mvc/app/views/OPNsense/Firewall/firewall_migration.volt
+55-0src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/MigrationController.php
+36-0src/opnsense/mvc/app/controllers/OPNsense/Firewall/MigrationController.php
+7-0src/opnsense/service/conf/actions.d/actions_filter.conf
+6-1src/opnsense/mvc/app/models/OPNsense/Base/Menu/MenuSystem.php
+344-16 files

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

Services: Intrusion Detection - remove IPv4 requirement for divert rules. ref https://github.com/opnsense/core/pull/9561
DeltaFile
+0-6src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.php
+0-61 files

OPNSense/core cb8bf6csrc/opnsense/mvc/app/controllers/OPNsense/Firewall/Api FilterController.php, src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes BaseField.php ArrayField.php

Merge branch 'master' into radvd_8351
DeltaFile
+11-13src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php
+8-5src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/TextFieldTest.php
+6-4src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterController.php
+4-3src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ArrayField.php
+2-3src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseListField.php
+2-1src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.xml
+33-291 files not shown
+34-307 files

OPNSense/core f05d26bsrc/opnsense/mvc/app/models/OPNsense/Base/FieldTypes ArrayField.php BaseField.php

mvc: style sweep
DeltaFile
+1-1src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ArrayField.php
+1-1src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php
+2-22 files

OPNSense/core 1e20554src/opnsense/mvc/app/controllers/OPNsense/Firewall MigrationController.php, src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api MigrationController.php

Firewall: Rules:  Migration assistant - add export option and guidance for migrations to the new mvc system.
DeltaFile
+142-0src/opnsense/scripts/filter/list_legacy_rules.php
+64-0src/opnsense/mvc/app/views/OPNsense/Firewall/firewall_migration.volt
+42-0src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/MigrationController.php
+36-0src/opnsense/mvc/app/controllers/OPNsense/Firewall/MigrationController.php
+6-1src/opnsense/mvc/app/models/OPNsense/Base/Menu/MenuSystem.php
+7-0src/opnsense/service/conf/actions.d/actions_filter.conf
+297-16 files