Skip to content

Commit

Permalink
os-firewall: move mountpoint for opnsense#1749
Browse files Browse the repository at this point in the history
It's probably better to keep (filter)rules and source nat rules combined, so we can stick to the same rollback pattern and guarantee a consistent set when performing a rollback.
  • Loading branch information
AdSchellevis committed Mar 25, 2020
1 parent f9e8a16 commit 1c952b3
Showing 2 changed files with 60 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<model>
<mount>//OPNsense/Firewall/FilterRule</mount>
<mount>//OPNsense/Firewall/Filter</mount>
<version>1.0.0</version>
<migration_prefix>MFP</migration_prefix>
<description>
OPNsense firewall filter rules
</description>
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<?php

/**
* Copyright (C) 2020 Deciso B.V.
*
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
* OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
*/

namespace OPNsense\Firewall\Migrations;

use OPNsense\Core\Config;
use OPNsense\Base\BaseModelMigration;

class MFP1_0_0 extends BaseModelMigration
{
public function post($model)
{
// Move OPNsense->Firewall->FilterRule ---> OPNsense->Firewall->Filter
$cfgObj = Config::getInstance()->object();
if (!empty($cfgObj->OPNsense) && !empty($cfgObj->OPNsense->Firewall)
&& !empty($cfgObj->OPNsense->Firewall->FilterRule)) {
// model migration created a new, empty rules section
if (empty($cfgObj->OPNsense->Firewall->Filter->rules)) {
unset($cfgObj->OPNsense->Firewall->Filter->rules);
$targetdom = dom_import_simplexml($cfgObj->OPNsense->Firewall->Filter);
foreach ($cfgObj->OPNsense->Firewall->FilterRule->children() as $child) {
$sourcedom = dom_import_simplexml($child);
$targetdom->appendChild($sourcedom);
}
unset($cfgObj->OPNsense->Firewall->FilterRule);
Config::getInstance()->save();
}
}
}
}

0 comments on commit 1c952b3

Please sign in to comment.