From 0041e188f7ef4c936eb08f26e08f229e7ce1b550 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 10 Oct 2017 17:40:51 +0200 Subject: [dnbd3] More progress, manage location restrictions for proxies --- modules-available/dnbd3/config.json | 2 +- modules-available/dnbd3/hooks/cron.inc.php | 3 + modules-available/dnbd3/hooks/runmode/config.json | 6 + modules-available/dnbd3/inc/dnbd3rpc.inc.php | 4 + modules-available/dnbd3/inc/dnbd3util.inc.php | 96 +++++++++++- modules-available/dnbd3/page.inc.php | 153 +++++++++++++++++--- .../dnbd3/templates/page-client-loclist.html | 27 ++++ .../dnbd3/templates/page-clientlist.html | 28 ++-- .../dnbd3/templates/page-header-servername.html | 1 + .../dnbd3/templates/page-server-locations.html | 96 ++++++++++++ .../dnbd3/templates/page-serverlist.html | 161 +++++++++++++++------ 11 files changed, 497 insertions(+), 80 deletions(-) create mode 100644 modules-available/dnbd3/hooks/cron.inc.php create mode 100644 modules-available/dnbd3/hooks/runmode/config.json create mode 100644 modules-available/dnbd3/templates/page-client-loclist.html create mode 100644 modules-available/dnbd3/templates/page-header-servername.html create mode 100644 modules-available/dnbd3/templates/page-server-locations.html (limited to 'modules-available') diff --git a/modules-available/dnbd3/config.json b/modules-available/dnbd3/config.json index f06dda5c..f84a4170 100644 --- a/modules-available/dnbd3/config.json +++ b/modules-available/dnbd3/config.json @@ -1,4 +1,4 @@ { "category":"main.settings-server", - "dependencies":["runmode"] + "dependencies":["locations","runmode"] } diff --git a/modules-available/dnbd3/hooks/cron.inc.php b/modules-available/dnbd3/hooks/cron.inc.php new file mode 100644 index 00000000..3da4cae4 --- /dev/null +++ b/modules-available/dnbd3/hooks/cron.inc.php @@ -0,0 +1,3 @@ +') { + $server = '127.0.0.1'; + } $url = 'http://' . $server . ':' . $port . '/query?'; if ($stats) { $url .= 'q=stats&'; diff --git a/modules-available/dnbd3/inc/dnbd3util.inc.php b/modules-available/dnbd3/inc/dnbd3util.inc.php index b04583b8..48e887b3 100644 --- a/modules-available/dnbd3/inc/dnbd3util.inc.php +++ b/modules-available/dnbd3/inc/dnbd3util.inc.php @@ -5,6 +5,7 @@ class Dnbd3Util { public static function updateServerStatus() { $dynClients = RunMode::getForMode('dnbd3', 'proxy', false, true); + $satServerIp = Property::getServerIp(); $servers = array(); $res = Database::simpleQuery('SELECT s.serverid, s.machineuuid, s.fixedip, s.lastup, s.lastdown, m.clientip FROM dnbd3_server s @@ -17,7 +18,7 @@ class Dnbd3Util { } else { continue; // Huh? } - if (!is_null($row['machineuuid'])) { + if (!is_null($row['machineuuid']) || $row['clientip'] === $satServerIp) { unset($dynClients[$row['machineuuid']]); } $server = array( @@ -32,6 +33,10 @@ class Dnbd3Util { array('machineuuid' => $client['machineuuid'])); // Missing from $servers now but we'll handle them in the next run, so don't bother } + // Same for this server - we use the special fixedip '' for it and need to prevent we don't have the + // IP address of the server itself in the list. + Database::exec('DELETE FROM dnbd3_server WHERE fixedip = :serverip', array('serverip' => $satServerIp)); + Database::exec("INSERT IGNORE INTO dnbd3_server (fixedip) VALUES ('')"); // Now query them all $NOW = time(); foreach ($servers as $server) { @@ -59,4 +64,93 @@ class Dnbd3Util { } } + /** + * A client is booting that has runmode dnbd3 proxy - set config vars accordingly. + * + * @param string $machineUuid + * @param string $mode always 'proxy' + * @param string $modeData + */ + public static function runmodeConfigHook($machineUuid, $mode, $modeData) + { + // Get all directly assigned locations + $res = Database::simpleQuery('SELECT locationid FROM dnbd3_server + INNER JOIN dnbd3_server_x_location USING (serverid) + WHERE machineuuid = :uuid', + array('uuid' => $machineUuid)); + $assignedLocs = $res->fetchAll(PDO::FETCH_ASSOC); + if (!empty($assignedLocs)) { + // Get all sub-locations too + $recursiveLocs = $assignedLocs; + $locations = Location::getLocationsAssoc(); + foreach ($assignedLocs as $l) { + if (isset($locations[$l])) { + $recursiveLocs = array_merge($recursiveLocs, $locations[$l]['children']); + } + } + $res = Database::simpleQuery('SELECT startaddr, endaddr FROM subnet WHERE locationid IN (:locs)', + array('locs' => $recursiveLocs)); + // Got subnets, build whitelist + $opt = ''; + while ($row = $res->fetch(PDO::FETCH_ASSOC)) { + $opt .= ' ' . self::range2Cidr($row['startaddr'], $row['endaddr']); + } + if (!empty($opt)) { + ConfigHolder::add('SLX_DNBD3_WHITELIST', $opt, 1000); + } + } + // Send list of other proxy servers + $res = Database::simpleQuery('SELECT s.fixedip, m.clientip, sxl.locationid FROM dnbd3_server s + LEFT JOIN machine m USING (machineuuid) + LEFT JOIN dnbd3_server_x_location sxl USING (serverid) + WHERE s.machineuuid <> :uuid OR s.machineuuid IS NULL', array('uuid' => $machineUuid)); + $public = array(); + $private = array(); + while ($row = $res->fetch(PDO::FETCH_ASSOC)) { + $ip = $row['clientip'] ? $row['clientip'] : $row['fixedip']; + if ($ip === '') { + continue; + } + if (is_null($row['locationid'])) { + if (!array_key_exists($ip, $private)) { + $public[$ip] = $ip; + } + } else { + $private[$ip] = $ip; + } + } + if (!empty($public)) { + ConfigHolder::add('SLX_DNBD3_PUBLIC', implode(' ', $public)); + } + if (!empty($private)) { + ConfigHolder::add('SLX_DNBD3_PRIVATE', implode(' ', $private)); + } + ConfigHolder::add('SLX_ADDONS', '', 1000); + } + + /** + * Get smallest subnet in CIDR notation that covers the given range. + * The subnet denoted by the CIDR notation might actually be larger + * than the range described by $start and $end. + * + * @param int $start start address + * @param int $end end address + * @return string CIDR notation + */ + private static function range2Cidr($start, $end) + { + $bin = decbin($start ^ $end); + if ($bin === '0') + return $start; + $mask = 32 - strlen($bin); + return $start . '/' . $mask; + } + +} + +class Dnbd3ProxyConfig +{ + + public $a; + } \ No newline at end of file diff --git a/modules-available/dnbd3/page.inc.php b/modules-available/dnbd3/page.inc.php index 309680a6..213afa03 100644 --- a/modules-available/dnbd3/page.inc.php +++ b/modules-available/dnbd3/page.inc.php @@ -11,17 +11,47 @@ class Page_Dnbd3 extends Page Message::addError('main.no-permission'); Util::redirect('?do=Main'); } - if (Request::post('re')) { + $action = Request::post('action', false, 'string'); + if ($action === 'refresh') { Dnbd3Util::updateServerStatus(); + } elseif ($action === 'delserver') { + $this->deleteServer(); + } elseif ($action === 'savelocations') { + $this->saveServerLocations(); + } + if (Request::isPost()) { Util::redirect('?do=dnbd3'); } } + private function saveServerLocations() + { + $server = $this->getServerById(); + $locids = Request::post('location', [], 'array'); + if (empty($locids)) { + Database::exec('DELETE FROM dnbd3_server_x_location WHERE serverid = :serverid', + array('serverid' => $server['serverid'])); + } else { + Database::exec('DELETE FROM dnbd3_server_x_location WHERE serverid = :serverid AND locationid NOT IN (:lids)', + array('serverid' => $server['serverid'], 'lids' => $locids)); + foreach ($locids as $lid) { + Database::exec('INSERT IGNORE INTO dnbd3_server_x_location (serverid, locationid) VALUES (:serverid, :lid)', + array('serverid' => $server['serverid'], 'lid' => $lid)); + } + } + } + + /* + * RENDER + */ + protected function doRender() { $show = Request::get('show', false, 'string'); if ($show === 'clients') { $this->showClientList(); + } elseif ($show === 'locations') { + $this->showServerLocationEdit(); } elseif ($show === false) { $this->showServerList(); } else { @@ -32,7 +62,11 @@ class Page_Dnbd3 extends Page private function showServerList() { $dynClients = RunMode::getForMode(Page::getModule(), 'proxy', true, true); - $res = Database::simpleQuery('SELECT serverid, machineuuid, fixedip, lastseen, uptime, totalup, totaldown, clientcount FROM dnbd3_server'); + $res = Database::simpleQuery('SELECT s.serverid, s.machineuuid, s.fixedip, s.lastseen, + s.uptime, s.totalup, s.totaldown, s.clientcount, Count(sxl.locationid) AS locations + FROM dnbd3_server s + LEFT JOIN dnbd3_server_x_location sxl USING (serverid) + GROUP BY s.serverid'); $servers = array(); $sort = array(); $NOW = time(); @@ -48,12 +82,17 @@ class Page_Dnbd3 extends Page $server['uptime_s'] = $server['uptime'] ? floor($server['uptime'] / 86400) . 'd ' . gmdate('H:i', $server['uptime']) : '-'; $server['totalup_s'] = Util::readableFileSize($server['totalup']); $server['totaldown_s'] = Util::readableFileSize($server['totaldown']); + $server['self'] = ($server['fixedip'] === ''); $servers[] = $server; - $sort[] = $server['fixedip'] . '.' . $server['machineuuid']; + if ($server['self']) { + $sort[] = '---'; + } else { + $sort[] = $server['fixedip'] . '.' . $server['machineuuid']; + } } foreach ($dynClients as $server) { $servers[] = $server; - $sort[] = 'A' . $server['machineuuid']; + $sort[] = '-' . $server['machineuuid']; } array_multisort($sort, SORT_ASC, $servers); Render::addTemplate('page-serverlist', array('list' => $servers)); @@ -61,11 +100,94 @@ class Page_Dnbd3 extends Page private function showClientList() { - $serverId = Request::get('server', false, 'int'); + $server = $this->getServerById(); + Render::addTemplate('page-header-servername', $server); + $data = Dnbd3Rpc::query(false, true, false, $server['ip']); + if ($data === false || !isset($data['clients'])) { + Message::addError('server-unreachable'); + return; + } + $ips = array(); + $sort = array(); + foreach ($data['clients'] as &$c) { + $c['bytesSent_s'] = Util::readableFileSize($c['bytesSent']); + $sort[] = $c['bytesSent']; + $ips[] = preg_replace('/:\d+$/', '', $c['address']); + } + array_multisort($sort, SORT_DESC, $data['clients']); + Render::openTag('div', ['class' => 'row']); + // Count locations + $res = Database::simpleQuery('SELECT locationid, Count(*) AS cnt FROM machine WHERE clientip IN (:ips) GROUP BY locationid', compact('ips')); + $locCount = Location::getLocationsAssoc(); + $locCount[0] = array( + 'locationname' => '/', + 'depth' => 0, + 'recCount' => 0, + ); + foreach ($locCount as &$loc) { + $loc['recCount'] = 0; + } + $showLocs = false; + while ($row = $res->fetch(PDO::FETCH_ASSOC)) { + settype($row['locationid'], 'int'); + $loc =& $locCount[$row['locationid']]; + $loc['clientCount'] = $row['cnt']; + $loc['recCount'] += $row['cnt']; + if ($row['locationid'] !== 0) { + $showLocs = true; + } + $loc['keep'] = true; + if (isset($loc['parents'])) { + foreach ($loc['parents'] as $p) { + $locCount[$p]['keep'] = true; + $locCount[$p]['recCount'] += $row['cnt']; + } + } + } + if ($showLocs) { + $locCount = array_filter($locCount, function ($v) { return isset($v['keep']); }); + Render::addTemplate('page-client-loclist', array('list' => array_values($locCount))); + } + Render::addTemplate('page-clientlist', $data); + Render::closeTag('div'); + } + + private function showServerLocationEdit() + { + $server = $this->getServerById(); + // Get selected ones + $res = Database::simpleQuery('SELECT locationid FROM dnbd3_server_x_location WHERE serverid = :serverid', + array('serverid' => $server['serverid'])); + $selectedLocations = array(); + while ($loc = $res->fetchColumn(0)) { + $selectedLocations[$loc] = true; + } + // Build location list + $server['locations'] = array_values(Location::getSubnetsByLocation()); + $filtered = array(); + foreach ($server['locations'] as &$loc) { + $filtered['l'.$loc['locationid']] = array( + 'children' => $loc['children'], + 'subnets' => $loc['subnets'] + ); + if (isset($selectedLocations[$loc['locationid']])) { + $loc['checked_s'] = 'checked'; + } + } + unset($loc); + $server['jsonLocations'] = json_encode($filtered); + Render::addTemplate('page-server-locations', $server); + } + + private function getServerById($serverId = false) + { + if ($serverId === false) { + $serverId = Request::any('server', false, 'int'); + } if ($serverId === false) { // TODO: Missing param } - $server = Database::queryFirst('SELECT s.machineuuid, s.fixedip, m.clientip, m.hostname + $server = Database::queryFirst('SELECT s.serverid, s.machineuuid, s.fixedip, m.clientip, m.hostname FROM dnbd3_server s LEFT JOIN machine m USING (machineuuid) WHERE s.serverid = :serverId', compact('serverId')); @@ -73,24 +195,13 @@ class Page_Dnbd3 extends Page // TODO: Not found } if (!is_null($server['clientip'])) { - $ip = $server['clientip']; + $server['ip'] = $server['clientip']; } elseif (!is_null($server['fixedip'])) { - $ip = $server['fixedip']; + $server['ip'] = $server['fixedip']; } else { - $ip = '127.0.0.1'; - } - $data = Dnbd3Rpc::query(false, true, false, $ip); - if ($data === false || !isset($data['clients'])) { - Message::addError('server-unreachable'); - } else { - $sort = array(); - foreach ($data['clients'] as &$c) { - $c['bytesSent_s'] = Util::readableFileSize($c['bytesSent']); - $sort[] = $c['bytesSent']; - } - array_multisort($sort, SORT_DESC, $data['clients']); - Render::addTemplate('page-clientlist', $data); + $server['ip'] = '127.0.0.1'; } + return $server; } } diff --git a/modules-available/dnbd3/templates/page-client-loclist.html b/modules-available/dnbd3/templates/page-client-loclist.html new file mode 100644 index 00000000..67c90683 --- /dev/null +++ b/modules-available/dnbd3/templates/page-client-loclist.html @@ -0,0 +1,27 @@ +
+

{{lang_clientsByLocation}}

+ + + + + + + + {{#list}} + + + + + + {{/list}} +
{{lang_location}}{{lang_count}}{{lang_recursiveCount}}
+ {{#depth}} +
+ {{/depth}} + {{locationname}} + 		+ {{clientCount}} + + {{recCount}} +
+
\ No newline at end of file diff --git a/modules-available/dnbd3/templates/page-clientlist.html b/modules-available/dnbd3/templates/page-clientlist.html index 3fd4442c..9e7cec4c 100644 --- a/modules-available/dnbd3/templates/page-clientlist.html +++ b/modules-available/dnbd3/templates/page-clientlist.html @@ -1,12 +1,20 @@ - - {{#clients}} +
+

{{lang_clientList}}

+ +
- - + + - {{/clients}} -
- {{address}} - - {{bytesSent_s}} - {{lang_client}}{{lang_bytesSent}}
\ No newline at end of file + {{#clients}} + + + {{address}} + + + {{bytesSent_s}} + + + {{/clients}} + + \ No newline at end of file diff --git a/modules-available/dnbd3/templates/page-header-servername.html b/modules-available/dnbd3/templates/page-header-servername.html new file mode 100644 index 00000000..6f3f1b7f --- /dev/null +++ b/modules-available/dnbd3/templates/page-header-servername.html @@ -0,0 +1 @@ +

{{ip}}

\ No newline at end of file diff --git a/modules-available/dnbd3/templates/page-server-locations.html b/modules-available/dnbd3/templates/page-server-locations.html new file mode 100644 index 00000000..8e76a68d --- /dev/null +++ b/modules-available/dnbd3/templates/page-server-locations.html @@ -0,0 +1,96 @@ +

{{lang_manageAccessTo}} {{ip}}

+ +

{{lang_proxyLocationText}}

+ +
+ + + +
+ +
+ +
+
+

{{lang_allowedSubnets}}

+
+ +
+
+
+

{{lang_locations}}

+ {{#locations}} +
+ {{#depth}} +
+ {{/depth}} + + +
+ {{/locations}} +
+
+ +
+ +
+
+ + \ No newline at end of file diff --git a/modules-available/dnbd3/templates/page-serverlist.html b/modules-available/dnbd3/templates/page-serverlist.html index b7fe9038..e50c6bcb 100644 --- a/modules-available/dnbd3/templates/page-serverlist.html +++ b/modules-available/dnbd3/templates/page-serverlist.html @@ -1,51 +1,118 @@ +

{{lang_dnbd3Management}}

+

{{lang_dnbd3IntroText}}

+
- +

+ {{lang_serverList}} + +

+
+
+ + + + + + + + + + + + + + {{#list}} + + + + + + + + + + + {{/list}} +
{{lang_proxyServerTHead}}{{lang_clientCount}}{{lang_lastSeen}}{{lang_uptime}}{{lang_txTotal}}{{lang_rxTotal}}{{lang_locations}} 
+ {{#uptime}} + + {{/uptime}} + {{^uptime}} + + {{/uptime}} + {{fixedip}} + {{#machineuuid}} + {{clientip}} +
{{hostname}}
+ {{/machineuuid}} + 		+ {{#uptime}} + {{clientcount}} + {{/uptime}} + {{^uptime}} + - + {{/uptime}} + + {{lastseen_s}} + + {{uptime_s}} + + {{totalup_s}} + + {{totaldown_s}} + + {{^self}} + {{^locations}} + {{lang_global}} + {{/locations}} + {{#locations}} + {{locations}} + {{/locations}} + + + + {{/self}} + + {{^self}} + + {{/self}} +
- - - - - - - - - - {{#list}} - - - - - - - - - {{/list}} -
{{lang_proxyServerTHead}}{{lang_lastSeen}}{{lang_uptime}}{{lang_txTotal}}{{lang_rxTotal}}{{lang_clientCount}}
- {{#uptime}} - - {{/uptime}} - {{^uptime}} - - {{/uptime}} - {{fixedip}} - {{#machineuuid}} - {{hostname}} ({{clientip}}) - {{/machineuuid}} - - {{lastseen_s}} - - {{uptime_s}} - - {{totalup_s}} - - {{totaldown_s}} - - {{#uptime}} - {{clientcount}} - {{/uptime}} - {{^uptime}} - - - {{/uptime}} -
\ No newline at end of file +
+ + + + {{lang_addManagedProxy}} + +
+ + + +
\ No newline at end of file -- cgit v1.2.3-55-g7522