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

dns/bind: more style updates

Browse Source
This commit is contained in:
Franco Fichtner
2023-01-11 10:07:27 +01:00
parent 0b5c9a98ef
commit b67a1d49bf
2 changed files with 55 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/DomainController.php
+24 -24
View File
@@ -1,32 +1,30 @@
<?php
/**
* Copyright (C) 2019 Michael Muenz <m.muenz@gmail.com>
* Copyright (C) 2019 Deciso B.V.
/*
* Copyright (C) 2019 Michael Muenz <m.muenz@gmail.com>
* Copyright (C) 2019 Deciso B.V.
* All rights reserved.
*
* All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 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.
*
* 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.
* 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\Bind\Api;
@@ -39,11 +37,13 @@ class DomainController extends ApiMutableModelControllerBase
protected static $internalModelName = 'domain';
protected static $internalModelClass = '\OPNsense\Bind\Domain';
# These are here for backwards compatability, should be removed after a bit.
/* XXX backwards-compatibility for 22.7 and below */
public function searchMasterDomainAction()
{
return seachPrimaryDomainAction();
}
/* XXX backwards-compatibility for 22.7 and below */
public function searchSlaveDomainAction()
{
return seachSecondaryDomainAction();
dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Migrations/M1_1_0.php
+31 -32
View File
@@ -1,31 +1,29 @@
<?php
/**
* Copyright (C) 2022 Robbert Rijkse
/*
* Copyright (C) 2022 Robbert Rijkse
* All rights reserved.
*
* All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 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.
*
* 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.
* 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\Bind\Migrations;
@@ -45,29 +43,30 @@ class M1_1_0 extends BaseModelMigration
if ($model instanceof Domain) {
$config = Config::getInstance()->object();
# Checks to see if there is a bind config section, otherwise skips the rest of the migration
/* checks to see if there is a bind config section, otherwise skips the rest of the migration */
if (empty($config->OPNsense->bind)) {
return;
}
$bindConfig = $config->OPNsense->bind;
# Loops through the domains in the config
foreach ($bindConfig->domain->domains->domain as $domain) {
$domainModel = $model->getNodeByReference('domains.domain.' . $domain->attributes()["uuid"]);
# Migrates the domain type
if ($domain->type == "master") {
$domainModel->type->setValue("primary");
/* loops through the domains in the config */
foreach ($bindConfig->domain->domains->domain as $domain) {
$domainModel = $model->getNodeByReference('domains.domain.' . $domain->attributes()['uuid']);
/* migrates the domain type */
if ($domain->type == 'master') {
$domainModel->type->setValue('primary');
} else {
$domainModel->type->setValue("secondary");
$domainModel->type->setValue('secondary');
}
# Migrates the Master IP to Primary IP field
/* migrates the Master IP to Primary IP field */
if (!empty($domain->masterip)) {
$domainModel->primaryip->setValue($domain->masterip);
}
# Migrates the AllowNotify Slave to AllowNotify Secondary field
/* migrates the AllowNotify Slave to AllowNotify Secondary field */
if (!empty($domain->allownotifyslave)) {
$domainModel->allownotifysecondary->setValue($domain->allownotifyslave);
}