From fd15f0d7c59e91e314400dbc51666f9d7d4b8838 Mon Sep 17 00:00:00 2001 From: Fabian Franz BSc Date: Tue, 6 Feb 2018 21:09:37 +0100 Subject: [PATCH] net/frr and security/tor: remove sessionClose from search action (#548) --- .../OPNsense/Quagga/Api/BgpController.php | 22 ++++++++----------- .../Quagga/Api/Ospf6settingsController.php | 1 - .../Quagga/Api/OspfsettingsController.php | 3 --- .../OPNsense/Tor/Api/ExitaclController.php | 1 - .../OPNsense/Tor/Api/GeneralController.php | 1 - .../Tor/Api/HiddenserviceController.php | 1 - .../Tor/Api/HiddenserviceaclController.php | 1 - .../OPNsense/Tor/Api/SocksaclController.php | 1 - 8 files changed, 9 insertions(+), 22 deletions(-) diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/BgpController.php b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/BgpController.php index 921c9088d..d8e4f5a03 100644 --- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/BgpController.php +++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/BgpController.php @@ -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") diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/Ospf6settingsController.php b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/Ospf6settingsController.php index 90db5b629..067e0642b 100644 --- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/Ospf6settingsController.php +++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/Ospf6settingsController.php @@ -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) diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/OspfsettingsController.php b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/OspfsettingsController.php index 2909104cb..fef38db19 100644 --- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/OspfsettingsController.php +++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/OspfsettingsController.php @@ -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) diff --git a/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/ExitaclController.php b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/ExitaclController.php index d0409e6eb..924af9914 100644 --- a/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/ExitaclController.php +++ b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/ExitaclController.php @@ -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) diff --git a/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/GeneralController.php b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/GeneralController.php index d4487ebf3..a155dd36d 100644 --- a/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/GeneralController.php +++ b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/GeneralController.php @@ -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')); } diff --git a/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/HiddenserviceController.php b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/HiddenserviceController.php index 3b68a2b32..b2febecb9 100644 --- a/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/HiddenserviceController.php +++ b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/HiddenserviceController.php @@ -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) diff --git a/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/HiddenserviceaclController.php b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/HiddenserviceaclController.php index 1f73308c3..8cfefb66d 100644 --- a/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/HiddenserviceaclController.php +++ b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/HiddenserviceaclController.php @@ -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) diff --git a/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/SocksaclController.php b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/SocksaclController.php index 22add3924..3183b43c1 100644 --- a/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/SocksaclController.php +++ b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/SocksaclController.php @@ -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)