OPNSense/core 8591377src/opnsense/mvc/app/models/OPNsense/Core/ACL ACL.xml, src/opnsense/mvc/app/models/OPNsense/Firewall/ACL ACL.xml

Firewall: NAT: NPTv6 - add MVC migration and cleanup old legacy pages.
DeltaFile
+0-308src/www/firewall_nat_npt.php
+0-286src/www/firewall_nat_npt_edit.php
+85-0src/opnsense/mvc/app/models/OPNsense/Firewall/Migrations/MFP1_0_3.php
+0-12src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml
+5-3src/opnsense/mvc/app/models/OPNsense/Firewall/Menu/Menu.xml
+7-0src/opnsense/mvc/app/models/OPNsense/Firewall/ACL/ACL.xml
+97-6095 files not shown
+102-62411 files

OPNSense/core ba952b8src/opnsense/mvc/app/library/OPNsense/Firewall NptRule.php, src/www firewall_nat_npt_edit.php

firewall: redirect interface seelctor for #6158

(cherry picked from commit 600b5bf84ec405c69faea23c3157c38f39796870)
(cherry picked from commit cd3fa5a26812905f66a62498cafe2d84c9e83b6c)
DeltaFile
+23-11src/www/firewall_nat_npt_edit.php
+8-3src/opnsense/mvc/app/library/OPNsense/Firewall/NptRule.php
+31-142 files

OPNSense/core cd3fa5asrc/opnsense/mvc/app/library/OPNsense/Firewall NptRule.php, src/www firewall_nat_npt_edit.php

firewall: redirect interface seelctor for #6158
DeltaFile
+21-9src/www/firewall_nat_npt_edit.php
+8-3src/opnsense/mvc/app/library/OPNsense/Firewall/NptRule.php
+29-122 files

OPNSense/core b28820dsrc/opnsense/mvc/app/library/OPNsense/Firewall NptRule.php, src/www firewall_nat_npt_edit.php

firwall: POC for #6158
DeltaFile
+21-9src/www/firewall_nat_npt_edit.php
+8-3src/opnsense/mvc/app/library/OPNsense/Firewall/NptRule.php
+29-122 files

OPNSense/core 600b5bfsrc/www firewall_nat_npt_edit.php

firewall: binat never supported redirect target alias #6158

There were error(s) loading the rules: /tmp/rules.debug:109: invalid use
of table <__lan_network> as the redirect address of a binat rule - The line
in question reads [109]: binat on igb1 inet6 from ff00:: -> $__lan_network

That also means aliases are useless here and we need to have an interface
selector anyway.

Also pconfig_to_addr() doesn't store /128 which may cause an error in the
prefix translation at the moment.
DeltaFile
+2-2src/www/firewall_nat_npt_edit.php
+2-21 files

OPNSense/core 9fda7c0src/opnsense/mvc/app/library/OPNsense/Firewall NptRule.php, src/www firewall_nat_npt_edit.php

firwall: POC for #6158
DeltaFile
+21-9src/www/firewall_nat_npt_edit.php
+5-2src/opnsense/mvc/app/library/OPNsense/Firewall/NptRule.php
+26-112 files

OPNSense/core 6be4d6esrc/opnsense/www/css bootstrap-select.css, src/opnsense/www/js bootstrap-select.js

core/css - upgrade bootstrap-select to v1.13.18, remove the version number from the css file as well (needs changes in the plugins as well).

(cherry picked from commit dd9854f111c3a801f2db5e14c2fbfdc9b36f3785)
(cherry picked from commit 6fbe6ca189495343112b1bb78f4947c898822273)
(cherry picked from commit 445a81d73ba1026b2e445c87183afdd34f271ca9)
(cherry picked from commit fd2e872e0fd2c28ddc527877980ed7110928293b)
(cherry picked from commit 020cac564bb01150514274dfde0163092bda9203)
(cherry picked from commit ac0dc0ff89df099d8d74f2f2cbaf9f4de6762dc7)
(cherry picked from commit 99fcbaf93345b8c08bd60a67c9aa9014c3fbf89c)
(cherry picked from commit 8b378cd4e7ae7f3075d8945dcdaf29dff6047657)
(cherry picked from commit 10458747e244c5b4c758cbdeaf90bf4b724664c7)
DeltaFile
+1,417-941src/opnsense/www/js/bootstrap-select.js
+85-29src/opnsense/www/css/bootstrap-select.css
+43-43src/www/firewall_nat_out_edit.php
+26-28src/www/firewall_scrub_edit.php
+24-26src/www/firewall_nat_edit.php
+21-19src/www/firewall_nat_1to1_edit.php
+1,616-1,08611 files not shown
+1,672-1,13817 files

OPNSense/core ac0dc0fsrc/www firewall_nat_out_edit.php firewall_scrub_edit.php

firewall: fix bootstrap-select update fallout

data-width="auto" use is probably still broken in a few places
but better fix these per user report.
DeltaFile
+42-42src/www/firewall_nat_out_edit.php
+26-28src/www/firewall_scrub_edit.php
+23-25src/www/firewall_nat_edit.php
+20-18src/www/firewall_nat_1to1_edit.php
+14-14src/www/firewall_rules_edit.php
+4-6src/www/firewall_nat_npt_edit.php
+129-1336 files

OPNSense/core 8b378cdsrc/opnsense/mvc/app/views/OPNsense/Firewall alias.volt, src/opnsense/mvc/app/views/layout_partials form_input_tr.volt

ui: unify dropdown width

Fix a nasty scroll bar bug with alias proto selector, style
and adjust all manual widths accordingly.  For a strange reason
the text inputs are 2px shorter in the base forms than the modals
and the static pages so adjust the width to 346 in that case.
DeltaFile
+10-4src/opnsense/mvc/app/views/OPNsense/Firewall/alias.volt
+1-1src/www/firewall_nat_edit.php
+1-1src/www/firewall_nat_npt_edit.php
+1-1src/www/firewall_rules_edit.php
+1-1src/www/firewall_nat_out_edit.php
+1-1src/opnsense/mvc/app/views/layout_partials/form_input_tr.volt
+15-91 files not shown
+16-107 files

OPNSense/core a3683b0src/opnsense/mvc/app/library/OPNsense/Firewall NptRule.php, src/www firewall_nat_npt_edit.php

firewall: allow external dynamic address in NPT #5284

(cherry picked from commit 32c783ca32048b2f03076cd9f8722be0c28d2879)
(cherry picked from commit b7a9d0b41f14d0d6880706c6d8b0970c98bedd4b)
(cherry picked from commit f7e64baa5c540ef1ccae01d017768f585ec492bf)
(cherry picked from commit 17ec3264a4f0a86c49d031cb320febce9c051c0f)
DeltaFile
+45-45src/www/firewall_nat_npt_edit.php
+6-1src/opnsense/mvc/app/library/OPNsense/Firewall/NptRule.php
+51-462 files

OPNSense/core b7a9d0bsrc/opnsense/mvc/app/library/OPNsense/Firewall NptRule.php, src/www firewall_nat_npt_edit.php

firewall: allow external dynamic address in NPT #5284
DeltaFile
+45-45src/www/firewall_nat_npt_edit.php
+4-0src/opnsense/mvc/app/library/OPNsense/Firewall/NptRule.php
+49-452 files

OPNSense/core d4a6bddsrc/etc/inc interfaces.inc, src/opnsense/scripts/dhcp unbound_watcher.py

Merge branch 'master' into system_status
DeltaFile
+0-388src/opnsense/scripts/ipsec/vici/session.py
+227-45src/www/interfaces.php
+141-109src/etc/inc/interfaces.inc
+0-246src/www/diag_ipsec.php
+0-237src/opnsense/scripts/dns/unbound_dhcpd.py
+237-0src/opnsense/scripts/dhcp/unbound_watcher.py
+605-1,025239 files not shown
+3,722-3,359245 files

OPNSense/core d8553a0src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api FirewallController.php, src/opnsense/mvc/app/library/OPNsense/Firewall NptRule.php

firewall: allow NPT logging; closes #5228

We will be adding NPT logging support because the infrastructure
already supports it.  1:1 is a bit harder to deal with so hands
off for now and see how this works out.
DeltaFile
+39-32src/www/firewall_nat_npt_edit.php
+12-14src/opnsense/mvc/app/library/OPNsense/Firewall/NptRule.php
+8-3src/opnsense/mvc/app/views/OPNsense/Diagnostics/fw_log.volt
+1-1src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/FirewallController.php
+60-504 files

OPNSense/core c415e20src/www firewall_nat_1to1_edit.php firewall_nat_npt_edit.php

src: more cleanups on static pages
DeltaFile
+27-28src/www/firewall_nat_1to1_edit.php
+27-27src/www/firewall_nat_npt_edit.php
+4-4src/www/system_usermanager.php
+3-3src/www/system_certmanager.php
+2-2src/www/firewall_nat_edit.php
+2-2src/www/firewall_nat_out_edit.php
+65-6613 files not shown
+80-8419 files

OPNSense/core 125f0b6src/etc/inc/plugins.inc.d unbound.inc, src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api LvtemplateController.php

Merge tag '21.1.6' into stable/21.4

stable release
DeltaFile
+4,534-3,042src/opnsense/www/js/chart.js
+675-254src/opnsense/www/js/chartjs-plugin-streaming.js
+256-6src/opnsense/mvc/app/views/OPNsense/Diagnostics/fw_log.volt
+73-0src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/LvtemplateController.php
+16-55src/etc/inc/plugins.inc.d/unbound.inc
+14-51src/www/firewall_nat_npt_edit.php
+5,568-3,40844 files not shown
+5,819-3,68350 files

OPNSense/core 57b3cffsrc/www firewall_nat_1to1_edit.php firewall_nat_npt_edit.php

src: more cleanups on static pages
DeltaFile
+27-28src/www/firewall_nat_1to1_edit.php
+27-27src/www/firewall_nat_npt_edit.php
+4-4src/www/system_usermanager.php
+3-3src/www/system_certmanager.php
+2-2src/www/firewall_nat_out_edit.php
+2-2src/www/system_crlmanager.php
+65-6613 files not shown
+80-8419 files

OPNSense/core 17a2c80src/www firewall_nat_npt_edit.php firewall_nat_npt.php

NPTv6 configuration clean-up (#4894)

* NPTv6 rule edit clean-up
Internal and external prefix length must be the same. Remove dstmask input and use srcmsk for source and destination.
"Invert" doesn't work for NPTv6. Remove.
Rephrase text to avoid confusion and match terminology used in firewall_nat_npt.php (Internal / External vs. Source / Destination).
* NPTv6 rule overview style fix
Uppercase for consistency.

(cherry picked from commit 0b9a77806902ca28f4c4080fb62d4e7f2c5643b2)
DeltaFile
+14-51src/www/firewall_nat_npt_edit.php
+1-1src/www/firewall_nat_npt.php
+15-522 files

OPNSense/core bf07d89src/etc/inc interfaces.inc, src/opnsense/mvc/app/controllers/OPNsense/Core/Api FirmwareController.php

Merge branch 'master' into enhance-openvpn-config-tlscrypt
DeltaFile
+1,183-0src/opnsense/www/js/pick-a-color-1.2.3.js
+388-349src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt
+283-298src/opnsense/scripts/firmware/check.sh
+253-226src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php
+220-148src/www/widgets/widgets/traffic_graphs.widget.php
+116-125src/etc/inc/interfaces.inc
+2,443-1,146228 files not shown
+6,572-3,179234 files

OPNSense/core 0b9a778src/www firewall_nat_npt_edit.php firewall_nat_npt.php

NPTv6 configuration clean-up (#4894)

* NPTv6 rule edit clean-up
Internal and external prefix length must be the same. Remove dstmask input and use srcmsk for source and destination.
"Invert" doesn't work for NPTv6. Remove.
Rephrase text to avoid confusion and match terminology used in firewall_nat_npt.php (Internal / External vs. Source / Destination).
* NPTv6 rule overview style fix
Uppercase for consistency.
DeltaFile
+14-51src/www/firewall_nat_npt_edit.php
+1-1src/www/firewall_nat_npt.php
+15-522 files

OPNSense/core 1ed095bsrc/www firewall_nat_npt_edit.php firewall_rules_edit.php

firewall / categories: minor regression, when returning fromt POST type isn't guaranteed.

(cherry picked from commit bf42e6efce1b240fd3c2a18409a3a19fad33e53e)
DeltaFile
+1-1src/www/firewall_nat_npt_edit.php
+1-1src/www/firewall_rules_edit.php
+1-1src/www/firewall_nat_out_edit.php
+1-1src/www/firewall_nat_edit.php
+1-1src/www/firewall_nat_1to1_edit.php
+5-55 files

OPNSense/core 2557350src/www firewall_nat_edit.php firewall_nat_1to1_edit.php

Firewall / categories: fix missing POST arrays, closes https://github.com/opnsense/core/issues/4655

(cherry picked from commit 34698ef09c781919aa151ed72a31804d7a0d9819)
DeltaFile
+2-2src/www/firewall_nat_edit.php
+1-1src/www/firewall_nat_1to1_edit.php
+1-1src/www/firewall_nat_out_edit.php
+1-1src/www/firewall_nat_npt_edit.php
+5-54 files

OPNSense/core 34698efsrc/www firewall_nat_edit.php firewall_nat_1to1_edit.php

Firewall / categories: fix missing POST arrays, closes https://github.com/opnsense/core/issues/4655
DeltaFile
+2-2src/www/firewall_nat_edit.php
+1-1src/www/firewall_nat_1to1_edit.php
+1-1src/www/firewall_nat_npt_edit.php
+1-1src/www/firewall_nat_out_edit.php
+5-54 files

OPNSense/core bf42e6esrc/www firewall_nat_1to1_edit.php firewall_nat_edit.php

firewall / categories: minor regression, when returning fromt POST type isn't guaranteed.
DeltaFile
+1-1src/www/firewall_nat_1to1_edit.php
+1-1src/www/firewall_nat_edit.php
+1-1src/www/firewall_nat_npt_edit.php
+1-1src/www/firewall_nat_out_edit.php
+1-1src/www/firewall_rules_edit.php
+5-55 files

OPNSense/core e8a4e90src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api CategoryController.php, src/opnsense/mvc/app/models/OPNsense/Firewall Category.php

Firewall / NAT: support category filters #4587

Move the categories into a separate module to be used in other firewall
sections as well and refactor the current legacy pages for outbound nat
rules and port forwards to include categories. In a future version there's
also a wish to support multiple category tags on a single rule, in which
case we would replace the current type ahead input for the same tokeniser
used in other components.

Sponsored by: Modirum (https://www.modirum.com/)

(cherry picked from commit 9550a9072aa03593842381001f9ff4ac560eddc9)
(cherry picked from commit 416fc37ee96f75a600f6ca5fc777bbf7ec6cafcc)
(cherry picked from commit 224dfb0a36d6e35a31efa9ce5b11ffab78106c53)
(cherry picked from commit 3b1c3eb3d322ae878d399e08b02f3b2d61c2a77a)
(cherry picked from commit fab8222aea3b11515491b988399ceb8f549b9e2c)
(cherry picked from commit bdc443096370efd38e5833eb11858d6dcdb16e5d)
(cherry picked from commit b00902e46cf3aea889e245d1ce0dfede62203dbc)
(cherry picked from commit 5d173f52cf302bae33ef8ebe80bc62c2c2e55ca0)

    [8 lines not shown]
DeltaFile
+1,183-0src/opnsense/www/js/pick-a-color-1.2.3.js
+152-0src/opnsense/mvc/app/models/OPNsense/Firewall/Category.php
+120-0src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/CategoryController.php
+120-0src/opnsense/mvc/app/views/OPNsense/Firewall/category.volt
+52-44src/opnsense/mvc/app/models/OPNsense/Firewall/Migrations/M1_0_0.php
+18-74src/www/firewall_rules_edit.php
+1,645-11820 files not shown
+2,224-21126 files

OPNSense/core dc164b3src/www firewall_nat_npt_edit.php firewall_nat_out.php

Firewall: add model for categories. work in progress for https://github.com/opnsense/core/issues/4587

Add category option in all nat pages, condense layout while ther so the pages are more consistent with the firewall rules

Next steps:

- reformat category selection a bit so it's more clear results are filtered and maybe count the number of items per catagory for clarity.
- add category ui to manage the model
DeltaFile
+32-7src/www/firewall_nat_npt_edit.php
+34-4src/www/firewall_nat_out.php
+34-2src/www/firewall_nat_1to1.php
+33-2src/www/firewall_nat_npt.php
+28-1src/www/firewall_nat_out_edit.php
+28-1src/www/firewall_nat_1to1_edit.php
+189-172 files not shown
+197-198 files

OPNSense/core fc1a2f8src/www interfaces_gre_edit.php interfaces_lagg_edit.php

fix some gettext() + html_safe, discussed https://github.com/opnsense/core/commit/c4c7f8d732a9e3e7ab4bef8573379cf5721ae9d8

(cherry picked from commit 4a8e737ced67ebb89368f92086c8a4ea282a1468)
DeltaFile
+2-2src/www/interfaces_gre_edit.php
+2-2src/www/interfaces_lagg_edit.php
+2-2src/www/interfaces_ppps_edit.php
+2-2src/www/interfaces_vlan_edit.php
+2-2src/www/interfaces_wireless_edit.php
+2-2src/www/services_dhcp_edit.php
+12-1258 files not shown
+91-9164 files

OPNSense/core 4a8e737src/www firewall_nat_1to1_edit.php firewall_nat_edit.php

fix some gettext() + html_safe, discussed https://github.com/opnsense/core/commit/c4c7f8d732a9e3e7ab4bef8573379cf5721ae9d8
DeltaFile
+2-2src/www/firewall_nat_1to1_edit.php
+2-2src/www/firewall_nat_edit.php
+2-2src/www/firewall_nat_npt_edit.php
+2-2src/www/firewall_nat_out_edit.php
+2-2src/www/firewall_rules_edit.php
+2-2src/www/firewall_schedule_edit.php
+12-1259 files not shown
+92-9265 files

OPNSense/core 7203857src/www system_advanced_firewall.php firewall_rules_edit.php

www: fixes from master
DeltaFile
+33-28src/www/system_advanced_firewall.php
+4-3src/www/firewall_rules_edit.php
+4-2src/www/services_ntpd_pps.php
+2-2src/www/firewall_scrub_edit.php
+2-2src/www/firewall_nat_npt_edit.php
+2-2src/www/system_hasync.php
+47-396 files not shown
+55-4312 files

OPNSense/core 9824737src/www firewall_rules_edit.php firewall_scrub_edit.php

Remove nonexistant CSS properties

The table attributes 'cellspacing' and 'cellpadding' were moved inside the style attribute via a script. However, they are not valid CSS properties, so browsers should (and do) ignore them.
This commit removes them. The 'table' class, set on most tables, should take care of proper formatting anyway.
DeltaFile
+3-3src/www/firewall_rules_edit.php
+2-2src/www/firewall_scrub_edit.php
+2-2src/www/firewall_nat_npt_edit.php
+1-1src/www/system_camanager.php
+1-1src/www/firewall_nat.php
+1-1src/www/firewall_rules.php
+10-107 files not shown
+17-1713 files

OPNSense/core a8f8cefScripts license, src/etc rc.openvpn

src: remove trailing dot workaround by removing trailing dots

(cherry picked from commit 574bd308be8a54fc43bd2b815c8d34a79df2080d)
DeltaFile
+2-2src/www/firewall_virtual_ip.php
+2-2src/www/system_groupmanager.php
+1-3Scripts/license
+2-2src/etc/inc/auth.inc
+2-2src/etc/rc.openvpn
+2-2src/www/firewall_virtual_ip_edit.php
+11-1332 files not shown
+44-4638 files