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: remove sessionClose, some cleanups

Browse Source
This commit is contained in:
Franco Fichtner
2024-12-10 08:24:29 +01:00
parent bb2ec32b0e
commit a6d1d54f4f
5 changed files with 50 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dns/bind/Makefile
+1
View File
@@ -1,5 +1,6 @@
PLUGIN_NAME= bind
PLUGIN_VERSION= 1.33
PLUGIN_REVISION= 1
PLUGIN_COMMENT= BIND domain name service
PLUGIN_DEPENDS= bind920
PLUGIN_MAINTAINER= m.muenz@gmail.com
dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/AclController.php
+26 -24
View File
@@ -1,31 +1,29 @@
<?php
/**
* Copyright (C) 2018 Michael Muenz <m.muenz@gmail.com>
/*
* Copyright (C) 2018 Michael Muenz <m.muenz@gmail.com>
* 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,25 +37,29 @@ class AclController extends ApiMutableModelControllerBase
public function searchAclAction()
{
return $this->searchBase('acls.acl', array("enabled", "name", "networks"));
return $this->searchBase('acls.acl', ['enabled', 'name', 'networks']);
}
public function getAclAction($uuid = null)
{
$this->sessionClose();
return $this->getBase('acl', 'acls.acl', $uuid);
}
public function addAclAction()
{
return $this->addBase('acl', 'acls.acl');
}
public function delAclAction($uuid)
{
return $this->delBase('acls.acl', $uuid);
}
public function setAclAction($uuid)
{
return $this->setBase('acl', 'acls.acl', $uuid);
}
public function toggleAclAction($uuid)
{
return $this->toggleBase('acls.acl', $uuid);
dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/DomainController.php
-1
View File
@@ -75,7 +75,6 @@ class DomainController extends ApiMutableModelControllerBase
public function getDomainAction($uuid = null)
{
$this->sessionClose();
return $this->getBase('domain', 'domains.domain', $uuid);
}
dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/RecordController.php
+21 -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;
@@ -77,7 +75,6 @@ class RecordController extends ApiMutableModelControllerBase
public function getRecordAction($uuid = null)
{
$this->sessionClose();
$domain = $this->request->get('domain');
$result = $this->getBase('record', 'records.record', $uuid);
if ($uuid == null && !empty($result['record']['domain'])) {
dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/ServiceController.php
+2 -3
View File
@@ -48,10 +48,9 @@ class ServiceController extends ApiMutableServiceControllerBase
public function dnsblAction()
{
$this->sessionClose();
$mdl = new Dnsbl();
$backend = new Backend();
$response = $backend->configdpRun('bind dnsbl', array((string)$mdl->type));
return array("response" => $response);
$response = $backend->configdpRun('bind dnsbl', [(string)$mdl->type]);
return ['response' => $response];
}
}