net/frr and security/tor: remove sessionClose from search action (#548)

This commit is contained in:
Fabian Franz BSc 2018-02-06 21:09:37 +01:00 committed by GitHub
parent 047b0c1c42
commit fd15f0d7c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 9 additions and 22 deletions

View file

@ -40,19 +40,18 @@ class BgpController extends ApiMutableModelControllerBase
public function searchNeighborAction()
{
$this->sessionClose();
return $this->searchBase(
'neighbors.neighbor',
array("enabled",
"address",
"remoteas",
"updatesource",
"nexthopself",
"defaultoriginate",
"linkedPrefixlistIn",
"linkedPrefixlistOut",
"linkedRoutemapIn",
"linkedRoutemapOut")
"address",
"remoteas",
"updatesource",
"nexthopself",
"defaultoriginate",
"linkedPrefixlistIn",
"linkedPrefixlistOut",
"linkedRoutemapIn",
"linkedRoutemapOut")
);
}
@ -79,7 +78,6 @@ class BgpController extends ApiMutableModelControllerBase
public function searchAspathAction()
{
$this->sessionClose();
return $this->searchBase(
'aspaths.aspath',
array("enabled", "number", "action", "as" )
@ -109,7 +107,6 @@ class BgpController extends ApiMutableModelControllerBase
public function searchPrefixlistAction()
{
$this->sessionClose();
return $this->searchBase(
'prefixlists.prefixlist',
array("enabled", "name", "seqnumber", "action", "network" )
@ -138,7 +135,6 @@ class BgpController extends ApiMutableModelControllerBase
public function searchRoutemapAction()
{
$this->sessionClose();
return $this->searchBase(
'routemaps.routemap',
array("enabled", "name", "action", "id", "match", "set")

View file

@ -42,7 +42,6 @@ class Ospf6settingsController extends ApiMutableModelControllerBase
static protected $internalModelClass = '\OPNsense\Quagga\OSPF6';
public function searchInterfaceAction()
{
$this->sessionClose();
return $this->searchBase('interfaces.interface', array("enabled", "interfacename", "area", "networktype"));
}
public function getInterfaceAction($uuid = null)

View file

@ -37,17 +37,14 @@ class OspfsettingsController extends ApiMutableModelControllerBase
public function searchNetworkAction()
{
$this->sessionClose();
return $this->searchBase('networks.network', array("enabled", "ipaddr", "netmask", "area"));
}
public function searchInterfaceAction()
{
$this->sessionClose();
return $this->searchBase('interfaces.interface', array("enabled", "interfacename", "networktype", "authtype", "area"));
}
public function searchPrefixlistAction()
{
$this->sessionClose();
return $this->searchBase('prefixlists.prefixlist', array("enabled", "name", "seqnumber", "action", "network" ));
}
public function getNetworkAction($uuid = null)

View file

@ -39,7 +39,6 @@ class ExitaclController extends ApiMutableModelControllerBase
static protected $internalModelClass = '\OPNsense\Tor\ACLExitPolicy';
public function searchaclAction()
{
$this->sessionClose();
return $this->searchBase('policy', array('enabled', 'type', 'network', 'action', 'startport', 'endport'));
}
public function getaclAction($uuid = null)

View file

@ -77,7 +77,6 @@ class GeneralController extends ApiMutableModelControllerBase
public function searchhidservauthAction()
{
$this->sessionClose();
return $this->searchBase('client_authentications.client_auth', array('enabled', 'onion_service', 'auth_cookie'));
}

View file

@ -36,7 +36,6 @@ class HiddenserviceController extends ApiMutableModelControllerBase
static protected $internalModelClass = '\OPNsense\Tor\HiddenService';
public function searchserviceAction()
{
$this->sessionClose();
return $this->searchBase('service', array('enabled', 'name'));
}
public function getserviceAction($uuid = null)

View file

@ -36,7 +36,6 @@ class HiddenserviceaclController extends ApiMutableModelControllerBase
static protected $internalModelClass = '\OPNsense\Tor\HiddenServiceACL';
public function searchaclAction()
{
$this->sessionClose();
return $this->searchBase('hiddenserviceacl', array('enabled', 'hiddenservice', 'port', 'target_host', 'target_port'));
}
public function getaclAction($uuid = null)

View file

@ -36,7 +36,6 @@ class SocksaclController extends ApiMutableModelControllerBase
static protected $internalModelClass = '\OPNsense\Tor\ACLSocksPolicy';
public function searchaclAction()
{
$this->sessionClose();
return $this->searchBase('policy', array('enabled', 'type', 'network', 'action'));
}
public function getaclAction($uuid = null)