mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BGP API: fix search by ipv6 when using compressed addresses (#11394)

Browse Source 
* BGP API: fix search by ipv6
* BGP API: Add error when giving a wrong IP as parameter
This commit is contained in:
Mathieu Poussin
2020-04-12 01:11:57 +02:00
committed by GitHub
parent ce4ad2a09f
commit 909035b180
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
includes/html/api_functions.inc.php
View File

@ -24,6 +24,7 @@ use LibreNMS\Config;
use LibreNMS\Data\Store\Datastore;
use LibreNMS\Exceptions\InvalidIpException;
use LibreNMS\Util\IPv4;
use LibreNMS\Util\IP;
function api_success($result, $result_name, $message = null, $code = 200, $count = null, $extra = null)
{
@ -517,11 +518,19 @@ function list_bgp(\Illuminate\Http\Request $request)
}
if (!empty($local_address)) {
$sql .= ' AND `bgpPeers`.`bgpLocalAddr` = ?';
$sql_params[] = $local_address;
try {
$sql_params[] = IP::parse($local_address)->uncompressed();
} catch (InvalidIpException $e) {
return api_error(400, "Invalid local address");
}
}
if (!empty($remote_address)) {
$sql .= ' AND `bgpPeers`.`bgpPeerIdentifier` = ?';
$sql_params[] = $remote_address;
try {
$sql_params[] = IP::parse($remote_address)->uncompressed();
} catch (InvalidIpException $e) {
return api_error(400, "Invalid remote address");
}
}
$bgp_sessions = dbFetchRows("SELECT `bgpPeers`.* FROM `bgpPeers` LEFT JOIN `devices` ON `bgpPeers`.`device_id` = `devices`.`device_id` WHERE `bgpPeerState` IS NOT NULL AND `bgpPeerState` != '' $sql", $sql_params);