lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 08:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

src: style sweep and plist fix

Browse Source
This commit is contained in:
Franco Fichtner 2024-01-07 21:03:04 +01:00
parent 490efb1e97
commit dfc834dabb
5 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
plist
View File

@ -292,11 +292,21 @@
/usr/local/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/AliasController.php
/usr/local/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/AliasUtilController.php
/usr/local/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/CategoryController.php
/usr/local/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterBaseController.php
/usr/local/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterController.php
/usr/local/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterUtilController.php
/usr/local/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/GroupController.php
/usr/local/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/NptController.php
/usr/local/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/SourceNatController.php
/usr/local/opnsense/mvc/app/controllers/OPNsense/Firewall/CategoryController.php
/usr/local/opnsense/mvc/app/controllers/OPNsense/Firewall/FilterController.php
/usr/local/opnsense/mvc/app/controllers/OPNsense/Firewall/GroupController.php
/usr/local/opnsense/mvc/app/controllers/OPNsense/Firewall/NptController.php
/usr/local/opnsense/mvc/app/controllers/OPNsense/Firewall/SourceNatController.php
/usr/local/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/categoryEdit.xml
/usr/local/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogFilterRule.xml
/usr/local/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogNptRule.xml
/usr/local/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogSNatRule.xml
/usr/local/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/geoIPSettings.xml
/usr/local/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/groupEdit.xml
/usr/local/opnsense/mvc/app/controllers/OPNsense/IDS/Api/ServiceController.php
@ -589,6 +599,7 @@
/usr/local/opnsense/mvc/app/models/OPNsense/Diagnostics/Traceroute.xml
/usr/local/opnsense/mvc/app/models/OPNsense/Dnsmasq/ACL/ACL.xml
/usr/local/opnsense/mvc/app/models/OPNsense/Dnsmasq/Menu/Menu.xml
/usr/local/opnsense/mvc/app/models/OPNsense/Firewall/ACL/ACL.xml
/usr/local/opnsense/mvc/app/models/OPNsense/Firewall/Alias.php
/usr/local/opnsense/mvc/app/models/OPNsense/Firewall/Alias.xml
/usr/local/opnsense/mvc/app/models/OPNsense/Firewall/Category.php
@ -596,12 +607,19 @@
/usr/local/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/AliasContentField.php
/usr/local/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/AliasField.php
/usr/local/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/AliasNameField.php
/usr/local/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/FilterRuleField.php
/usr/local/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/GroupField.php
/usr/local/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/GroupNameField.php
/usr/local/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/InterfaceField.php
/usr/local/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/SourceNatRuleField.php
/usr/local/opnsense/mvc/app/models/OPNsense/Firewall/Filter.php
/usr/local/opnsense/mvc/app/models/OPNsense/Firewall/Filter.xml
/usr/local/opnsense/mvc/app/models/OPNsense/Firewall/Group.php
/usr/local/opnsense/mvc/app/models/OPNsense/Firewall/Group.xml
/usr/local/opnsense/mvc/app/models/OPNsense/Firewall/Menu/Menu.xml
/usr/local/opnsense/mvc/app/models/OPNsense/Firewall/Migrations/M1_0_0.php
/usr/local/opnsense/mvc/app/models/OPNsense/Firewall/Migrations/MFP1_0_0.php
/usr/local/opnsense/mvc/app/models/OPNsense/Firewall/Migrations/MFP1_0_3.php
/usr/local/opnsense/mvc/app/models/OPNsense/Firewall/static_aliases/core.json
/usr/local/opnsense/mvc/app/models/OPNsense/IDS/ACL/ACL.xml
/usr/local/opnsense/mvc/app/models/OPNsense/IDS/FieldTypes/PolicyContentField.php
@ -748,6 +766,7 @@
/usr/local/opnsense/mvc/app/views/OPNsense/Firewall/alias.volt
/usr/local/opnsense/mvc/app/views/OPNsense/Firewall/alias_util.volt
/usr/local/opnsense/mvc/app/views/OPNsense/Firewall/category.volt
/usr/local/opnsense/mvc/app/views/OPNsense/Firewall/filter.volt
/usr/local/opnsense/mvc/app/views/OPNsense/Firewall/group.volt
/usr/local/opnsense/mvc/app/views/OPNsense/IDS/index.volt
/usr/local/opnsense/mvc/app/views/OPNsense/IDS/policy.volt
@ -1015,6 +1034,8 @@
/usr/local/opnsense/scripts/openvpn/ovpn_status.py
/usr/local/opnsense/scripts/openvpn/tls_verify.php
/usr/local/opnsense/scripts/openvpn/user_pass_verify.php
/usr/local/opnsense/scripts/pfplugin/rollback_cancel
/usr/local/opnsense/scripts/pfplugin/rollback_timer
/usr/local/opnsense/scripts/routes/del_route.py
/usr/local/opnsense/scripts/routes/gateway_status.php
/usr/local/opnsense/scripts/routes/gateway_watcher.php
@ -1098,6 +1119,7 @@
/usr/local/opnsense/service/conf/actions.d/actions_netflow.conf
/usr/local/opnsense/service/conf/actions.d/actions_openssh.conf
/usr/local/opnsense/service/conf/actions.d/actions_openvpn.conf
/usr/local/opnsense/service/conf/actions.d/actions_pfplugin.conf
/usr/local/opnsense/service/conf/actions.d/actions_syslog.conf
/usr/local/opnsense/service/conf/actions.d/actions_system.conf
/usr/local/opnsense/service/conf/actions.d/actions_template.conf
@ -1983,8 +2005,6 @@
/usr/local/www/firewall_nat_1to1.php
/usr/local/www/firewall_nat_1to1_edit.php
/usr/local/www/firewall_nat_edit.php
/usr/local/www/firewall_nat_npt.php
/usr/local/www/firewall_nat_npt_edit.php
/usr/local/www/firewall_nat_out.php
/usr/local/www/firewall_nat_out_edit.php
/usr/local/www/firewall_rule_lookup.php

2
src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseListField.php
View File

@ -28,7 +28,7 @@
namespace OPNsense\Base\FieldTypes;
use \Phalcon\Filter\Validation\Validator\InclusionIn;
use Phalcon\Filter\Validation\Validator\InclusionIn;
use OPNsense\Base\Validators\CsvListValidator;
/**

16
src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.xml
View File

@ -33,7 +33,6 @@
<Required>Y</Required>
</quick>
<interface type="InterfaceField">
<Required>N</Required>
<Multiple>Y</Multiple>
<AllowDynamic>Y</AllowDynamic>
</interface>
@ -67,7 +66,6 @@
<Required>Y</Required>
</source_not>
<source_port type="PortField">
<Required>N</Required>
<EnableWellKnown>Y</EnableWellKnown>
<EnableRanges>Y</EnableRanges>
<EnableAlias>Y</EnableAlias>
@ -83,14 +81,12 @@
<Required>Y</Required>
</destination_not>
<destination_port type="PortField">
<Required>N</Required>
<EnableWellKnown>Y</EnableWellKnown>
<EnableRanges>Y</EnableRanges>
<EnableAlias>Y</EnableAlias>
<ValidationMessage>Please specify a valid portnumber, name, alias or range</ValidationMessage>
</destination_port>
<gateway type="JsonKeyValueStoreField">
<Required>N</Required>
<ConfigdPopulateAct>interface gateways list</ConfigdPopulateAct>
<SourceFile>/tmp/gateway_list.json</SourceFile>
<ConfigdPopulateTTL>20</ConfigdPopulateTTL>
@ -112,8 +108,7 @@
<ValidationMessage>Related category not found.</ValidationMessage>
</categories>
<description type="TextField">
<Required>N</Required>
<mask>/^([\t\n\v\f\r 0-9a-zA-Z.\-,_\x{00A0}-\x{FFFF}]){0,255}$/u</mask>
<Mask>/^([\t\n\v\f\r 0-9a-zA-Z.\-,_\x{00A0}-\x{FFFF}]){0,255}$/u</Mask>
<ValidationMessage>Description should be a string between 1 and 255 characters</ValidationMessage>
</description>
</rule>
@ -161,7 +156,6 @@
<Required>Y</Required>
</source_not>
<source_port type="PortField">
<Required>N</Required>
<EnableWellKnown>Y</EnableWellKnown>
<EnableRanges>Y</EnableRanges>
<EnableAlias>Y</EnableAlias>
@ -176,7 +170,6 @@
<Required>Y</Required>
</destination_not>
<destination_port type="PortField">
<Required>N</Required>
<EnableWellKnown>Y</EnableWellKnown>
<EnableRanges>Y</EnableRanges>
<EnableAlias>Y</EnableAlias>
@ -187,7 +180,6 @@
<Required>Y</Required>
</target>
<target_port type="PortField">
<Required>N</Required>
<EnableWellKnown>Y</EnableWellKnown>
<EnableRanges>Y</EnableRanges>
</target_port>
@ -207,8 +199,7 @@
<ValidationMessage>Related category not found.</ValidationMessage>
</categories>
<description type="TextField">
<Required>N</Required>
<mask>/^([\t\n\v\f\r 0-9a-zA-Z.\-,_\x{00A0}-\x{FFFF}]){0,255}$/u</mask>
<Mask>/^([\t\n\v\f\r 0-9a-zA-Z.\-,_\x{00A0}-\x{FFFF}]){0,255}$/u</Mask>
<ValidationMessage>Description should be a string between 1 and 255 characters</ValidationMessage>
</description>
</rule>
@ -260,8 +251,7 @@
<ValidationMessage>Related category not found.</ValidationMessage>
</categories>
<description type="TextField">
<Required>N</Required>
<mask>/^([\t\n\v\f\r 0-9a-zA-Z.\-,_\x{00A0}-\x{FFFF}]){0,255}$/u</mask>
<Mask>/^([\t\n\v\f\r 0-9a-zA-Z.\-,_\x{00A0}-\x{FFFF}]){0,255}$/u</Mask>
<ValidationMessage>Description should be a string between 1 and 255 characters</ValidationMessage>
</description>
</rule>

3
src/opnsense/mvc/app/models/OPNsense/Firewall/Migrations/MFP1_0_3.php
View File

@ -45,7 +45,8 @@ class MFP1_0_3 extends BaseModelMigration
$catmdl = new Category();
foreach ((Config::getInstance()->object())->nat->children() as $child) {
if ($child->getName() == 'npt') {
if (Util::isSubnet((string)$child->source->address) && (
if (
Util::isSubnet((string)$child->source->address) && (
empty((string)$child->destination->address) ||
Util::isSubnet((string)$child->destination->address))
) {

1
src/opnsense/mvc/app/models/OPNsense/IDS/FieldTypes/PolicyRulesField.php
View File

@ -34,7 +34,6 @@ use OPNsense\Base\FieldTypes\ArrayField;
use OPNsense\Base\FieldTypes\TextField;
use OPNsense\Core\Backend;
class PolicyRulesField extends ArrayField
{
protected static $internalRuleData = null;