netbird/plugins
0
0
Fork 0
mirror of https://github.com/netbirdio/plugins.git synced 2026-05-22 18:44:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

net: style sweep

Browse Source
This commit is contained in:
Franco Fichtner
2020-03-13 08:27:10 +01:00
parent b4cb311bdb
commit b749701193
5 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/firewall/src/etc/inc/plugins.inc.d/pfplugin.inc
+9 -9
View File
@@ -30,12 +30,12 @@
/**
* @param $fw
*/
function pfplugin_firewall($fw)
{
$mdlFilter = new OPNsense\Firewall\Filter();
foreach ($mdlFilter->rules->rule->sortedBy(["sequence"]) as $key => $rule) {
$content = $rule->serialize();
$content["#ref"] = "ui/firewall/filter#" . (string)$rule->getAttributes()['uuid'];
$fw->registerFilterRule($rule->getPriority(), $content);
}
}
function pfplugin_firewall($fw)
{
$mdlFilter = new OPNsense\Firewall\Filter();
foreach ($mdlFilter->rules->rule->sortedBy(["sequence"]) as $key => $rule) {
$content = $rule->serialize();
$content["#ref"] = "ui/firewall/filter#" . (string)$rule->getAttributes()['uuid'];
$fw->registerFilterRule($rule->getPriority(), $content);
}
}
net/firewall/src/opnsense/mvc/app/controllers/OPNsense/Firewall/FilterController.php
-1
View File
@@ -27,7 +27,6 @@
*/
namespace OPNsense\Firewall;
class FilterController extends \OPNsense\Base\IndexController
{
public function indexAction()
net/firewall/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/FilterRuleField.php
+4 -2
View File
@@ -106,10 +106,12 @@ class FilterRuleContainerField extends ContainerField
if (strpos($interface, ",") !== false) {
// floating (multiple interfaces involved)
return 1000;
} elseif (!empty($configObj->interfaces) &&
} elseif (
!empty($configObj->interfaces) &&
!empty($configObj->interfaces->$interface) &&
!empty($configObj->interfaces->$interface->type) &&
$configObj->interfaces->$interface->type == 'group') {
$configObj->interfaces->$interface->type == 'group'
) {
// group type
return 2000;
} else {
net/firewall/src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.php
+4 -4
View File
@@ -45,18 +45,18 @@ class Filter extends BaseModel
foreach ($this->rules->rule->iterateItems() as $rule) {
// validate changed rules
$rule_changed = false;
foreach($rule->iterateItems() as $field) {
foreach ($rule->iterateItems() as $field) {
$rule_changed = $rule_changed ? $rule_changed : $field->isFieldChanged();
}
if ($validateFullModel || $rule_changed) {
// port / protocol validation
if (!empty((string)$rule->source_port) && !in_array( $rule->protocol, ['TCP', 'UDP'])) {
if (!empty((string)$rule->source_port) && !in_array($rule->protocol, ['TCP', 'UDP'])) {
$messages->appendMessage(new Message(
gettext("Source ports are only valid for tcp or udp type rules."),
$rule->source_port->__reference
));
}
if (!empty((string)$rule->destination_port) && !in_array( $rule->protocol, ['TCP', 'UDP'])) {
if (!empty((string)$rule->destination_port) && !in_array($rule->protocol, ['TCP', 'UDP'])) {
$messages->appendMessage(new Message(
gettext("Destination ports are only valid for tcp or udp type rules."),
$rule->destination_port->__reference
@@ -100,7 +100,7 @@ class Filter extends BaseModel
$sourcedom = dom_import_simplexml($sourcexml->OPNsense->Firewall->FilterRule);
$targetxml = Config::getInstance()->object();
$targetdom = dom_import_simplexml($targetxml->OPNsense->Firewall->FilterRule);
$node = $targetdom->ownerDocument->importNode($sourcedom, TRUE);
$node = $targetdom->ownerDocument->importNode($sourcedom, true);
$targetdom->parentNode->replaceChild($node, $targetdom);
Config::getInstance()->save();
return true;
net/tayga/src/opnsense/mvc/app/models/OPNsense/Tayga/General.xml
+1 -1
View File
@@ -21,7 +21,7 @@
<v6destination type="NetworkField">
<default>2001:db8:1:ffff::1</default>
<Required>Y</Required>
</v6destination>
</v6destination>
<v6prefix type="NetworkField">
<default>2001:db8:1:ffff::/96</default>
<Required>Y</Required>