show server and memory

Author: Moritz Walter

pages/webinterface/index.php

@@ -1,3 +1,14 @@
+<?= $nodes = \webinterface\main::buildRequest("cluster", $_SESSION['cn3-wi-access_token'], "GET"); ?>
+<?php
+$services = 0;
+$memory_min = 0;
+$memory_max = 0;
+foreach($nodes['nodes'] as $node){
+    $services += $node['nodeInfoSnapshot']['currentServicesCount'];
+    $memory_max += $node['nodeInfoSnapshot']['maxMemory'];
+    $memory_min += $node['nodeInfoSnapshot']['usedMemory'];
+}
+?>
 <main class="w-full flex-grow p-6">
     <div class="py-1">
         <main class="h-full overflow-y-auto">
@@ -20,7 +31,7 @@
                         </div>
                         <div>
                             <p class="mb-2 text-base font-medium text-gray-400">Servers</p>
-                            <p class="text-xl font-semibold dark:text-white text-gray-900">10</p>
+                            <p class="text-xl font-semibold dark:text-white text-gray-900"><?= $services; ?></p>
                         </div>
                     </div>
                     <!-- CPU -->
@@ -40,7 +51,7 @@
                         </div>
                         <div>
                             <p class="mb-2 text-base font-medium text-gray-400">Ram</p>
-                            <p class="text-xl font-semibold dark:text-white text-gray-900">100MB/500MB</p>
+                            <p class="text-xl font-semibold dark:text-white text-gray-900"><?= $memory_min ?>MB/<?= $memory_max; ?>MB</p>
                         </div>
                     </div>
                 </div>

public/index.php

@@ -35,6 +35,8 @@
     die('<h1><span style="color: #FF0000">Ein Fehler ist aufgetreten.</span></h1><h3>Die Datei "/config/message.json" konnte nicht gefunden werden</h3><h3>Führe das Setup mit "wisetup" im Master erneut aus!</h3>');
 }
 
+if(!isset($_SESSION['cn3-wi-csrf'])) $_SESSION['cn3-wi-csrf'] = uniqid('', true);
+
 $main = new webinterface\main($config, $version);
 
 $app = System\App::instance();
@@ -44,6 +46,14 @@
 $route = $app->route;
 
 if(isset($_SESSION['cn3-wi-access_token'])){
+    $user = main::buildRequest("auth", $_SESSION['cn3-wi-access_token'], "POST");
+    if(!$user['success']){
+        unset($_SESSION['cn3-wi-access_token']);
+        header('Location: '.main::getUrl());
+        die();
+    }
+
+
     $route->any('/', function () {
         if(isset($_POST['action'])){
             if (isset($_POST['csrf'])) {
@@ -75,8 +85,8 @@
 } else {
     $route->any('/', function () {
         if(isset($_POST['action'])){
-            if (isset($_POST['csrf'])) {
-                if ($_POST['csrf'] != $_SESSION['csrf']) {
+            if (isset($_POST['cn3-wi-csrf'])) {
+                if ($_POST['cn3-wi-csrf'] != $_SESSION['cn3-wi-csrf']) {
                     header('Location: ' . main::getUrl() . "/?action&success=false&message=csrfFailed");
                     die();
                 }