From 4c9aba92942c4b9341c46a50aeaa31bea24a8b60 Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Tue, 9 Jan 2018 17:38:21 +0100
Subject: [exams] implemented permission system

---
 modules-available/rebootcontrol/page.inc.php | 66 ++++++++++++++++++++++++----
 1 file changed, 57 insertions(+), 9 deletions(-)

(limited to 'modules-available/rebootcontrol/page.inc.php')

diff --git a/modules-available/rebootcontrol/page.inc.php b/modules-available/rebootcontrol/page.inc.php
index fc3ded8f..fa34a05a 100644
--- a/modules-available/rebootcontrol/page.inc.php
+++ b/modules-available/rebootcontrol/page.inc.php
@@ -4,6 +4,9 @@ class Page_RebootControl extends Page
 {
 
 	private $action = false;
+	private $allowedShutdownLocs = [];
+	private $allowedRebootLocs = [];
+	private $allowedLocs = [];
 
 	/**
 	 * Called before any page rendering happens - early hook to check parameters etc.
@@ -17,21 +20,40 @@ class Page_RebootControl extends Page
 			Util::redirect('?do=Main'); // does not return
 		}
 
+		$this->allowedShutdownLocs = User::getAllowedLocations("shutdown");
+		$this->allowedRebootLocs = User::getAllowedLocations("reboot");
+		$this->allowedLocs = array_unique(array_merge($this->allowedShutdownLocs, $this->allowedRebootLocs));
+
 		$this->action = Request::any('action', 'show', 'string');
 
 
 		if ($this->action === 'startReboot' || $this->action === 'startShutdown') {
-			$clients = Request::post('clients');
-			if (!is_array($clients) || empty($clients)) {
-				Message::addError('no-clients-selected');
-				Util::redirect();
-			}
+
 			$locationId = Request::post('locationId', false, 'int');
 			if ($locationId === false) {
 				Message::addError('locations.invalid-location-id', $locationId);
 				Util::redirect();
 			}
+
 			$shutdown = $this->action === "startShutdown";
+			// Check user permission (if user has no permission, the getAllowed-list will be empty and the check will fail)
+			if ($shutdown) {
+				if (!in_array($locationId, $this->allowedShutdownLocs)) {
+					Message::addError('main.no-permission');
+					Util::redirect();
+				}
+			} else {
+				if (!in_array($locationId, $this->allowedRebootLocs)) {
+					Message::addError('main.no-permission');
+					Util::redirect();
+				}
+			}
+
+			$clients = Request::post('clients');
+			if (!is_array($clients) || empty($clients)) {
+				Message::addError('no-clients-selected');
+				Util::redirect();
+			}
 			$minutes = Request::post('minutes', 0, 'int');
 
 			$list = RebootQueries::getMachinesByUuid($clients);
@@ -72,12 +94,34 @@ class Page_RebootControl extends Page
 				//location you want to see, default are "not  assigned" clients
 				$requestedLocation = Request::get('location', 0, 'int');
 
-				$data['data'] = RebootQueries::getMachineTable($requestedLocation);
-				$data['locations'] = Location::getLocations($requestedLocation, 0, true);
+				// only fill table if user has at least one permission for the location
+				if (in_array($requestedLocation, $this->allowedLocs)) {
+					$data['data'] = RebootQueries::getMachineTable($requestedLocation);
+					$data['allowedToSelect'] = True;
+				}
 
+				$data['locations'] = Location::getLocations($requestedLocation, 0, true);
+				// Always show public key (it's public, isn't it?)
 				$data['pubKey'] = SSHKey::getPublicKey();
 
+				// disable each location user has no permission for
+				foreach ($data['locations'] as &$loc) {
+					if (!in_array($loc["locationid"], $this->allowedLocs)) {
+						$loc["disabled"] = "disabled";
+					}
+				}
+
+				// Only enable shutdown/reboot-button if user has permission for the location
+				if (in_array($requestedLocation, $this->allowedShutdownLocs)) {
+					$data['allowedToShutdown'] = True;
+				}
+				if (in_array($requestedLocation, $this->allowedRebootLocs)) {
+					$data['allowedToReboot'] = True;
+				}
+				$data['allowedToGenerateKey'] = User::hasPermission("newkeypair");
+
 				Render::addTemplate('_page', $data);
+
 			}
 		}
 	}
@@ -86,8 +130,12 @@ class Page_RebootControl extends Page
 	{
 		$this->action = Request::post('action', false, 'string');
 		if ($this->action === 'generateNewKeypair') {
-			Property::set("rebootcontrol-private-key", false);
-			echo SSHKey::getPublicKey();
+			if (User::hasPermission("newkeypair")) {
+				Property::set("rebootcontrol-private-key", false);
+				echo SSHKey::getPublicKey();
+			} else {
+				echo 'No permission.';
+			}
 		} else {
 			echo 'Invalid action.';
 		}
-- 
cgit v1.2.3-55-g7522


From 5309badac125114399ec2cf39b095e0d9efcd09f Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 15 Feb 2018 13:18:56 +0100
Subject: [rebootcontrol] Rewrite permission handling, simplify html/javascript

---
 .../rebootcontrol/lang/de/module.json              |   1 -
 .../rebootcontrol/lang/de/permissions.json         |   4 +-
 .../rebootcontrol/lang/de/template-tags.json       |   5 +-
 .../rebootcontrol/lang/en/module.json              |   1 -
 .../rebootcontrol/lang/en/permissions.json         |   4 +-
 .../rebootcontrol/lang/en/template-tags.json       |   5 +-
 modules-available/rebootcontrol/page.inc.php       | 107 ++++++--------
 .../rebootcontrol/permissions/permissions.json     |   4 +-
 modules-available/rebootcontrol/style.css          |  10 +-
 .../rebootcontrol/templates/_page.html             | 162 ++++++---------------
 .../rebootcontrol/templates/header.html            |  63 ++++++++
 11 files changed, 172 insertions(+), 194 deletions(-)
 create mode 100644 modules-available/rebootcontrol/templates/header.html

(limited to 'modules-available/rebootcontrol/page.inc.php')

diff --git a/modules-available/rebootcontrol/lang/de/module.json b/modules-available/rebootcontrol/lang/de/module.json
index 03196610..1f325354 100644
--- a/modules-available/rebootcontrol/lang/de/module.json
+++ b/modules-available/rebootcontrol/lang/de/module.json
@@ -1,5 +1,4 @@
 {
     "module_name": "Reboot Control",
-    "notAssigned": "Nicht zugewiesen",
     "page_title": "Reboot Control"
 }
\ No newline at end of file
diff --git a/modules-available/rebootcontrol/lang/de/permissions.json b/modules-available/rebootcontrol/lang/de/permissions.json
index 92eeb37e..12ec4c83 100644
--- a/modules-available/rebootcontrol/lang/de/permissions.json
+++ b/modules-available/rebootcontrol/lang/de/permissions.json
@@ -1,5 +1,5 @@
 {
-	"shutdown": "Client herunterfahren.",
-	"reboot": "Client neustarten.",
+	"action.shutdown": "Client herunterfahren.",
+	"action.reboot": "Client neustarten.",
 	"newkeypair": "Neues Schlüsselpaar generieren."
 }
\ No newline at end of file
diff --git a/modules-available/rebootcontrol/lang/de/template-tags.json b/modules-available/rebootcontrol/lang/de/template-tags.json
index c5bd1670..eccc8738 100644
--- a/modules-available/rebootcontrol/lang/de/template-tags.json
+++ b/modules-available/rebootcontrol/lang/de/template-tags.json
@@ -1,12 +1,14 @@
 {
     "lang_authFail": "Authentifizierung fehlgeschlagen",
     "lang_client": "Client",
+    "lang_confirmNewKeypair": "Wirklich neues Schl\u00fcsselpaar erzeugen?",
     "lang_connecting": "Verbinde...",
     "lang_error": "Nicht erreichbar",
     "lang_genNew": "Neues Schl\u00fcsselpaar generieren",
     "lang_ip": "IP",
     "lang_location": "Standort",
     "lang_minutes": " Minuten",
+    "lang_newKeypairExplanation": "Sie k\u00f6nnen ein neues Schl\u00fcsselpaar erzeugen lassen. In diesem Fall wird das alte Schl\u00fcsselpaar verworfen, sodass alle zum jetzigen Zeitpunkt bereits gestarteten Rechner nicht mehr aus der Ferne bedient werden k\u00f6nnen, bis diese manuell neugestartet wurden.",
     "lang_off": "Aus",
     "lang_on": "An",
     "lang_online": "Online",
@@ -27,6 +29,5 @@
     "lang_shutdownCheck": "Wollen Sie die ausgew\u00e4hlten Rechner wirklich herunterfahren?",
     "lang_shutdownIn": "Herunterfahren in: ",
     "lang_status": "Status",
-    "lang_unselectall": "Alle abw\u00e4hlen",
-    "lang_user": "Nutzer"
+    "lang_unselectall": "Alle abw\u00e4hlen"
 }
\ No newline at end of file
diff --git a/modules-available/rebootcontrol/lang/en/module.json b/modules-available/rebootcontrol/lang/en/module.json
index 129140dd..1f325354 100644
--- a/modules-available/rebootcontrol/lang/en/module.json
+++ b/modules-available/rebootcontrol/lang/en/module.json
@@ -1,5 +1,4 @@
 {
     "module_name": "Reboot Control",
-    "notAssigned": "Not assigned",
     "page_title": "Reboot Control"
 }
\ No newline at end of file
diff --git a/modules-available/rebootcontrol/lang/en/permissions.json b/modules-available/rebootcontrol/lang/en/permissions.json
index 077890fb..34badbaf 100644
--- a/modules-available/rebootcontrol/lang/en/permissions.json
+++ b/modules-available/rebootcontrol/lang/en/permissions.json
@@ -1,5 +1,5 @@
 {
-	"shutdown": "Shutdown Client.",
-	"reboot": "Reboot Client.",
+	"action.shutdown": "Shutdown Client.",
+	"action.reboot": "Reboot Client.",
 	"newkeypair": "Generate new Keypair."
 }
\ No newline at end of file
diff --git a/modules-available/rebootcontrol/lang/en/template-tags.json b/modules-available/rebootcontrol/lang/en/template-tags.json
index 63a5b4a8..c2346044 100644
--- a/modules-available/rebootcontrol/lang/en/template-tags.json
+++ b/modules-available/rebootcontrol/lang/en/template-tags.json
@@ -1,12 +1,14 @@
 {
     "lang_authFail": "Authentication failed",
     "lang_client": "Client",
+    "lang_confirmNewKeypair": "Really create new key pair?",
     "lang_connecting": "Connecting...",
     "lang_error": "Not available",
     "lang_genNew": "Generate new keypair",
     "lang_ip": "IP",
     "lang_location": "Location",
     "lang_minutes": " Minutes",
+    "lang_newKeypairExplanation": "You can create a new keypair, which will replace the old one. Please note that after doing so, you cannot poweroff or reboot clients that are already running, since they still use the old key. They have to be rebooted manually first.",
     "lang_off": "Off",
     "lang_on": "On",
     "lang_online": "Online",
@@ -27,6 +29,5 @@
     "lang_shutdownCheck": "Do you really want to shut down the selected clients?",
     "lang_shutdownIn": "Shutdown in: ",
     "lang_status": "Status",
-    "lang_unselectall": "Unselect all",
-    "lang_user": "User"
+    "lang_unselectall": "Unselect all"
 }
\ No newline at end of file
diff --git a/modules-available/rebootcontrol/page.inc.php b/modules-available/rebootcontrol/page.inc.php
index fa34a05a..fa7688d8 100644
--- a/modules-available/rebootcontrol/page.inc.php
+++ b/modules-available/rebootcontrol/page.inc.php
@@ -4,9 +4,6 @@ class Page_RebootControl extends Page
 {
 
 	private $action = false;
-	private $allowedShutdownLocs = [];
-	private $allowedRebootLocs = [];
-	private $allowedLocs = [];
 
 	/**
 	 * Called before any page rendering happens - early hook to check parameters etc.
@@ -20,54 +17,40 @@ class Page_RebootControl extends Page
 			Util::redirect('?do=Main'); // does not return
 		}
 
-		$this->allowedShutdownLocs = User::getAllowedLocations("shutdown");
-		$this->allowedRebootLocs = User::getAllowedLocations("reboot");
-		$this->allowedLocs = array_unique(array_merge($this->allowedShutdownLocs, $this->allowedRebootLocs));
-
 		$this->action = Request::any('action', 'show', 'string');
 
 
-		if ($this->action === 'startReboot' || $this->action === 'startShutdown') {
-
-			$locationId = Request::post('locationId', false, 'int');
-			if ($locationId === false) {
-				Message::addError('locations.invalid-location-id', $locationId);
-				Util::redirect();
-			}
-
-			$shutdown = $this->action === "startShutdown";
-			// Check user permission (if user has no permission, the getAllowed-list will be empty and the check will fail)
-			if ($shutdown) {
-				if (!in_array($locationId, $this->allowedShutdownLocs)) {
-					Message::addError('main.no-permission');
-					Util::redirect();
-				}
-			} else {
-				if (!in_array($locationId, $this->allowedRebootLocs)) {
-					Message::addError('main.no-permission');
-					Util::redirect();
-				}
-			}
+		if ($this->action === 'reboot' || $this->action === 'shutdown') {
 
-			$clients = Request::post('clients');
-			if (!is_array($clients) || empty($clients)) {
+			$requestedClients = Request::post('clients', false, 'array');
+			if (!is_array($requestedClients) || empty($requestedClients)) {
 				Message::addError('no-clients-selected');
 				Util::redirect();
 			}
 			$minutes = Request::post('minutes', 0, 'int');
 
-			$list = RebootQueries::getMachinesByUuid($clients);
-			if (count($list) !== count($clients)) {
+			$actualClients = RebootQueries::getMachinesByUuid($requestedClients);
+			if (count($actualClients) !== count($requestedClients)) {
 				// We could go ahead an see which ones were not found in DB but this should not happen anyways unless the
 				// user manipulated the request
 				Message::addWarning('some-machine-not-found');
 			}
-			// TODO: Iterate over list and check if a locationid is not in permissions
-			// TODO: we could also check if the locationid is equal or a sublocation of the $locationId from above
-			// (this would be more of a sanity check though, or does the UI allow selecting machines from different locations)
-
-			$task = RebootControl::execute($list, $shutdown, $minutes, $locationId);
+			// Filter ones with no permission
+			foreach (array_keys($actualClients) as $idx) {
+				if (!User::hasPermission('action.' . $this->action, $actualClients[$idx]['locationid'])) {
+					Message::addWarning('main.location-no-permission', $actualClients[$idx]['locationid']);
+					unset($actualClients[$idx]);
+				} else {
+					$locationId = $actualClients[$idx]['locationid'];
+				}
+			}
+			// See if anything is left
+			if (!is_array($actualClients) || empty($actualClients)) {
+				Message::addError('no-clients-selected');
+				Util::redirect();
+			}
 
+			$task = RebootControl::execute($actualClients, $this->action === 'shutdown', $minutes, $locationId);
 			Util::redirect("?do=rebootcontrol&taskid=".$task["id"]);
 		}
 
@@ -81,6 +64,7 @@ class Page_RebootControl extends Page
 	{
 		if ($this->action === 'show') {
 
+			$data = [];
 			$taskId = Request::get("taskid");
 
 			if ($taskId && Taskmanager::isTask($taskId)) {
@@ -91,36 +75,42 @@ class Page_RebootControl extends Page
 				$data['clients'] = $task['data']['clients'];
 				Render::addTemplate('status', $data);
 			} else {
-				//location you want to see, default are "not  assigned" clients
-				$requestedLocation = Request::get('location', 0, 'int');
 
-				// only fill table if user has at least one permission for the location
-				if (in_array($requestedLocation, $this->allowedLocs)) {
-					$data['data'] = RebootQueries::getMachineTable($requestedLocation);
-					$data['allowedToSelect'] = True;
+				//location you want to see, default are "not  assigned" clients
+				$requestedLocation = Request::get('location', false, 'int');
+				$allowedLocs = User::getAllowedLocations("action.*");
+
+				if ($requestedLocation === false) {
+					if (in_array(0, $allowedLocs)) {
+						$requestedLocation = 0;
+					} elseif (!empty($allowedLocs)) {
+						$requestedLocation = reset($allowedLocs);
+					}
 				}
 
 				$data['locations'] = Location::getLocations($requestedLocation, 0, true);
-				// Always show public key (it's public, isn't it?)
-				$data['pubKey'] = SSHKey::getPublicKey();
 
 				// disable each location user has no permission for
 				foreach ($data['locations'] as &$loc) {
-					if (!in_array($loc["locationid"], $this->allowedLocs)) {
+					if (!in_array($loc["locationid"], $allowedLocs)) {
 						$loc["disabled"] = "disabled";
 					}
 				}
+				// Always show public key (it's public, isn't it?)
+				$data['pubKey'] = SSHKey::getPublicKey();
 
 				// Only enable shutdown/reboot-button if user has permission for the location
-				if (in_array($requestedLocation, $this->allowedShutdownLocs)) {
-					$data['allowedToShutdown'] = True;
-				}
-				if (in_array($requestedLocation, $this->allowedRebootLocs)) {
-					$data['allowedToReboot'] = True;
-				}
-				$data['allowedToGenerateKey'] = User::hasPermission("newkeypair");
+				Permission::addGlobalTags($data['perms'], $requestedLocation, ['newkeypair', 'action.shutdown', 'action.reboot']);
+
+				Render::addTemplate('header', $data);
 
-				Render::addTemplate('_page', $data);
+				// only fill table if user has at least one permission for the location
+				if ($requestedLocation === false) {
+					Message::addError('main.no-permission');
+				} else {
+					$data['data'] = RebootQueries::getMachineTable($requestedLocation);
+					Render::addTemplate('_page', $data);
+				}
 
 			}
 		}
@@ -130,12 +120,9 @@ class Page_RebootControl extends Page
 	{
 		$this->action = Request::post('action', false, 'string');
 		if ($this->action === 'generateNewKeypair') {
-			if (User::hasPermission("newkeypair")) {
-				Property::set("rebootcontrol-private-key", false);
-				echo SSHKey::getPublicKey();
-			} else {
-				echo 'No permission.';
-			}
+			User::assertPermission("newkeypair");
+			Property::set("rebootcontrol-private-key", false);
+			echo SSHKey::getPublicKey();
 		} else {
 			echo 'Invalid action.';
 		}
diff --git a/modules-available/rebootcontrol/permissions/permissions.json b/modules-available/rebootcontrol/permissions/permissions.json
index 5de9b633..a058ffbf 100644
--- a/modules-available/rebootcontrol/permissions/permissions.json
+++ b/modules-available/rebootcontrol/permissions/permissions.json
@@ -2,10 +2,10 @@
     "newkeypair": {
         "location-aware": false
     },
-    "reboot": {
+    "action.reboot": {
         "location-aware": true
     },
-    "shutdown": {
+    "action.shutdown": {
         "location-aware": true
     }
 }
\ No newline at end of file
diff --git a/modules-available/rebootcontrol/style.css b/modules-available/rebootcontrol/style.css
index f10a6157..e35bce29 100644
--- a/modules-available/rebootcontrol/style.css
+++ b/modules-available/rebootcontrol/style.css
@@ -16,9 +16,8 @@
     margin-bottom: 0;
 }
 
-.controlButtons {
-    margin-left: 10px;
-    width: 140px;
+.select-button {
+    min-width: 150px;
 }
 
 #dataTable {
@@ -29,11 +28,6 @@
 #shutdownTimer {
     text-align: center;
 }
-#pubKeyTitle {
-    display: inline-block;
-    margin-top: 7px;
-    margin-bottom: 20px;
-}
 
 pre {
     white-space: pre-wrap;
diff --git a/modules-available/rebootcontrol/templates/_page.html b/modules-available/rebootcontrol/templates/_page.html
index e540cafb..82f82b02 100644
--- a/modules-available/rebootcontrol/templates/_page.html
+++ b/modules-available/rebootcontrol/templates/_page.html
@@ -1,26 +1,5 @@
-<div class="page-header">
-	<button type="button" id="settingsButton" class="btn btn-default pull-right" data-toggle="modal" data-target="#settingsModal"><span class="glyphicon glyphicon-cog"></span> {{lang_settings}}</button>
-	<h1>{{lang_rebootControl}}</h1>
-</div>
-
-
 <form id="tableDataForm" method="post" action="?do=rebootcontrol" class="form-inline">
 	<input type="hidden" name="token" value="{{token}}">
-	<div class="row">
-		<div class="col-md-12">
-			<label>{{lang_location}}:
-				<select id="locationDropdown" name="locationId" class="form-control" onchange="selectLocation()">
-					{{#locations}}
-					<option value="{{locationid}}" {{disabled}} {{#selected}}selected{{/selected}}>{{locationpad}} {{locationname}}</option>
-					{{/locations}}
-				</select>
-			</label>
-			<button type="button" id="selectAllButton" {{^allowedToSelect}}disabled{{/allowedToSelect}} class="btn btn-primary pull-right controlButtons" onclick="selectAllRows()"><span class="glyphicon glyphicon-check"></span> {{lang_selectall}}</button>
-			<button type="button" id="unselectAllButton" {{^allowedToSelect}}disabled{{/allowedToSelect}} class="btn btn-default pull-right controlButtons" onclick="unselectAllRows()" style="display: none;"><span class="glyphicon glyphicon-unchecked"></span> {{lang_unselectall}}</button>
-			<button type="button" {{#allowedToReboot}}id="rebootButton"{{/allowedToReboot}} class="btn btn-warning pull-right controlButtons" data-toggle="modal" data-target="#rebootModal" disabled><span class="glyphicon glyphicon-repeat"></span> {{lang_rebootButton}}</button>
-			<button type="button" {{#allowedToShutdown}}id="shutdownButton"{{/allowedToShutdown}} class="btn btn-danger pull-right controlButtons" data-toggle="modal" data-target="#shutdownModal" disabled><span class="glyphicon glyphicon-off"></span> {{lang_shutdownButton}}</button>
-		</div>
-	</div>
 	<div class="row">
 		<div class="col-md-12">
 			<table class="table table-condensed table-hover stupidtable" id="dataTable">
@@ -53,7 +32,7 @@
 					</td>
 					<td>{{#status}}{{currentsession}}{{/status}}</td>
 					<td>{{#status}}{{currentuser}}{{/status}}</td>
-					<td data-sort-value="0" class="checkboxColumn">
+					<td data-sort-value="0" class="checkboxColumn slx-smallcol">
 						<div class="checkbox">
 							<input id="m-{{machineuuid}}" type="checkbox" name="clients[]" value='{{machineuuid}}'>
 							<label for="m-{{machineuuid}}"></label>
@@ -69,25 +48,6 @@
 
 	<!-- Modals -->
 
-	<div id="settingsModal" class="modal fade" role="dialog">
-		<div class="modal-dialog">
-
-			<div class="modal-content">
-				<div class="modal-header">
-					<button type="button" class="close" data-dismiss="modal">&times;</button>
-					<h4 class="modal-title"><b>{{lang_settings}}</b></h4>
-				</div>
-				<div class="modal-body">
-					<span id="pubKeyTitle">{{lang_pubKey}}</span>
-					<button {{^allowedToGenerateKey}}disabled{{/allowedToGenerateKey}} class="btn btn-s btn-warning pull-right" onclick="generateNewKeypair()" type="button"><span class="glyphicon glyphicon-refresh"></span> {{lang_genNew}}</button>
-					<pre id="pubKey">{{pubKey}}</pre>
-				</div>
-				<div class="modal-footer">
-				</div>
-			</div>
-		</div>
-	</div>
-
 	<div class ="modal fade" id="rebootModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
 		<div class="modal-dialog" role="document">
 			<div class="modal-content">
@@ -100,7 +60,7 @@
 				</div>
 				<div class="modal-footer">
 					<button type="button" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button>
-					<button type="submit" {{^allowedToReboot}}disabled{{/allowedToReboot}} name="action" value="startReboot" class="btn btn-warning"><span class="glyphicon glyphicon-repeat"></span> {{lang_reboot}}</button>
+					<button type="submit" {{perms.action.reboot.disabled}} name="action" value="reboot" class="btn btn-warning"><span class="glyphicon glyphicon-repeat"></span> {{lang_reboot}}</button>
 				</div>
 			</div>
 		</div>
@@ -115,11 +75,11 @@
 				</div>
 				<div class="modal-body">
 					{{lang_shutdownCheck}}
-					{{lang_shutdownIn}} <input id="shutdownTimer" name="minutes" title="{{lang_shutdownIn}}" type="number" value="0" min="0" onkeypress="return isNumberKey(event)"> {{lang_minutes}}
+					{{lang_shutdownIn}} <input id="shutdownTimer" name="minutes" title="{{lang_shutdownIn}}" type="number" value="0" min="0" pattern="\d+"> {{lang_minutes}}
 				</div>
 				<div class="modal-footer">
 					<button type="button" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button>
-					<button type="submit" {{^allowedToShutdown}}disabled{{/allowedToShutdown}} name="action" value="startShutdown" class="btn btn-danger"><span class="glyphicon glyphicon-off"></span> {{lang_shutdownButton}}</button>
+					<button type="submit" {{perms.action.shutdown.disabled}} name="action" value="shutdown" class="btn btn-danger"><span class="glyphicon glyphicon-off"></span> {{lang_shutdownButton}}</button>
 				</div>
 			</div>
 		</div>
@@ -128,104 +88,76 @@
 
 
 <script type="application/javascript">
+	var $dataTable;
+
 	document.addEventListener("DOMContentLoaded", function() {
-		markCheckedRows();
 
-		$('input:checkbox').change(
-			function(){
+		$dataTable = $("#dataTable");
+		markCheckedRows();
+		// Handle change of checkboxes in table
+		$('input:checkbox').change(function() {
+				var $this = $(this);
 				//give each checkbox the function to mark the row (in green)
-				if ($(this).is(':checked')) {
-					markRows($(this).closest("tr"), true);
-					$(this).closest("td").data("sort-value", 1);
+				if ($this.is(':checked')) {
+					markRows($this.closest("tr"), true);
+					$this.closest("td").data("sort-value", 1);
 				} else {
-					markRows($(this).closest("tr"), false);
-					$(this).closest("td").data("sort-value", 0);
+					markRows($this.closest("tr"), false);
+					$this.closest("td").data("sort-value", 0);
 				}
 
 				//if all are checked, change the selectAll-Button to unselectAll. if one is not checked, change unselectAll to selectAll
-				var dataTable = $("#dataTable");
-				var unchecked = dataTable.find("input[type=checkbox]:not(:checked)").length;
-				if (unchecked == 0) {
+				var unchecked = $dataTable.find("input:checkbox:not(:checked)").length;
+				var checked = $dataTable.find("input:checkbox:checked").length;
+				if (unchecked === 0) {
 					$('#selectAllButton').hide();
 					$('#unselectAllButton').show();
-				} else if (unchecked == 1) {
+				} else if (checked === 0) {
 					$('#selectAllButton').show();
 					$('#unselectAllButton').hide();
 				}
 
 				//if no client is selected, disable the shutdown/reboot button, and enable them if a client is selected
-				var checked = dataTable.find("input[type=checkbox]:checked").length;
-				if (checked == 0) {
-					$('#rebootButton').prop('disabled', true);
-					$('#shutdownButton').prop('disabled', true);
-				} else {
-					$('#rebootButton').prop('disabled', false);
-					$('#shutdownButton').prop('disabled', false);
-				}
+				$('#rebootButton').prop('disabled', checked === 0 || '{{perms.action.reboot.disabled}}' === 'disabled');
+				$('#shutdownButton').prop('disabled', checked === 0 || '{{perms.action.shutdown.disabled}}' === 'disabled');
 			});
+		// Propagate click on column with checkbox to checkbox
 		$('.checkboxColumn').click(function(e) {
 			if (e.target === this) {
-				$(this).find('input[type="checkbox"]').click();
+				$(this).find('input:checkbox').click();
 			}
 		});
+		// Arm the (de)select all buttons
+		$('#selectAllButton').click(function() { selectAllRows(true); });
+		$('#unselectAllButton').click(function() { selectAllRows(false); });
 	});
 
-	// Change Location when selected in Dropdown Menu
-	function selectLocation() {
-		var dropdown = $("#locationDropdown");
-		var location = dropdown.val();
-		window.location.replace("?do=rebootcontrol&location="+location);
-	}
-
 	// Check all checkboxes, change selectAll button, make shutdown/reboot button enabled as clients will certainly be selected
-	function selectAllRows() {
-		var checked = $("tr input:checkbox:checked");
-
-		//change button
-		$('#selectAllButton').hide();
-		$('#unselectAllButton').show();
-
-		//check rows and mark them
-		$('input[type="checkbox"]', '#dataTable').prop('checked', true);
-		markRows($("tr:not(:first)"), true);
-		$(".checkboxColumn").data("sort-value", 1);
-
-		//enable shutdown/reboot button
-		$('#rebootButton').prop('disabled', false);
-		$('#shutdownButton').prop('disabled', false);
-	}
-
-	// Uncheck all checkboxes, change unselectAll Button, make shutdown/reboot button disabled as clients will certainly be not selected
-	function unselectAllRows() {
-		//change button
-		$('#selectAllButton').show();
-		$('#unselectAllButton').hide();
-
-		//uncheck rows and unmark them
-		$('input[type="checkbox"]', '#dataTable').prop('checked', false);
-		markRows($("tr"), false);
-		$(".checkboxColumn").data("sort-value", 0);
-
-		//disable shutdown/reboot button
-		$('#rebootButton').prop('disabled', true);
-		$('#shutdownButton').prop('disabled', true);
+	function selectAllRows(selected) {
+		var $box = $dataTable.find('input:checkbox');
+		if ($box.length === 0) return;
+		if (selected) {
+			$box = $box.filter(':not(:checked)');
+		} else {
+			$box = $box.filter(':checked');
+		}
+		if ($box.length === 0) return;
+		$box.prop('checked', !!selected).trigger('change');
 	}
 
-	// mark all previous checked rows (used when loading site)
+	// mark all previous checked rows (used when loading site), enable (de)select all if list is not empty
 	function markCheckedRows() {
-		var checked = $("tr input:checkbox:checked");
-		markRows(checked.closest("tr"), true);
-		var unchecked = $("#dataTable").find("input[type=checkbox]:not(:checked)").length;
-		if(unchecked == 0) {
+		var $checked = $dataTable.find("input:checkbox:checked");
+		markRows($checked.closest("tr"), true);
+		var $unchecked = $dataTable.find("input:checkbox:not(:checked)");
+		markRows($unchecked.closest("tr"), false);
+		if($unchecked.length === 0) {
 			$('#selectAllButton').hide();
 			$('#unselectAllButton').show();
 		}
-	}
-
-	// only allow numbers to get typed into the "shutdown in X Minutes" box.
-	function isNumberKey(evt){
-		var charCode = (evt.which) ? evt.which : event.keyCode;
-		return !(charCode > 31 && (charCode < 48 || charCode > 57));
+		if ($unchecked.length > 0 || $checked.length > 0) {
+			$('.select-button').prop('disabled', false);
+		}
 	}
 
 	function markRows($rows, marked) {
@@ -237,6 +169,8 @@
 	}
 
 	function generateNewKeypair() {
+		if (!confirm('{{lang_confirmNewKeypair}}'))
+			return;
 		$.ajax({
 			url: '?do=rebootcontrol',
 			type: 'POST',
diff --git a/modules-available/rebootcontrol/templates/header.html b/modules-available/rebootcontrol/templates/header.html
new file mode 100644
index 00000000..b84cb426
--- /dev/null
+++ b/modules-available/rebootcontrol/templates/header.html
@@ -0,0 +1,63 @@
+<div class="page-header">
+	<button type="button" id="settingsButton" class="btn btn-default pull-right" data-toggle="modal" data-target="#settingsModal"><span class="glyphicon glyphicon-cog"></span> {{lang_settings}}</button>
+	<h1>{{lang_rebootControl}}</h1>
+</div>
+
+<div>
+	<label>{{lang_location}}:
+		<select id="locationDropdown" class="form-control" onchange="selectLocation()">
+			{{#locations}}
+				<option value="{{locationid}}" {{disabled}} {{#selected}}selected{{/selected}}>{{locationpad}} {{locationname}}</option>
+			{{/locations}}
+		</select>
+	</label>
+	<div class="pull-right">
+		<button type="button" id="shutdownButton" class="btn btn-danger action-button" data-toggle="modal" data-target="#shutdownModal" disabled>
+			<span class="glyphicon glyphicon-off"></span>
+			{{lang_shutdownButton}}
+		</button>
+		<button type="button" id="rebootButton" class="btn btn-warning action-button" data-toggle="modal" data-target="#rebootModal" disabled>
+			<span class="glyphicon glyphicon-repeat"></span>
+			{{lang_rebootButton}}
+		</button>
+		<button type="button" id="selectAllButton" class="btn btn-primary select-button" disabled>
+			<span class="glyphicon glyphicon-check"></span>
+			{{lang_selectall}}
+		</button>
+		<button type="button" id="unselectAllButton" class="btn btn-default select-button collapse" disabled>
+			<span class="glyphicon glyphicon-unchecked"></span>
+			{{lang_unselectall}}
+		</button>
+	</div>
+</div>
+
+<div id="settingsModal" class="modal fade" role="dialog">
+	<div class="modal-dialog">
+
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal">&times;</button>
+				<h4 class="modal-title"><b>{{lang_settings}}</b></h4>
+			</div>
+			<div class="modal-body">
+				<p>{{lang_pubKey}}</p>
+				<pre>{{pubKey}}</pre>
+				<p>{{lang_newKeypairExplanation}}</p>
+			</div>
+			<div class="modal-footer">
+				<button {{perms.newkeypair.disabled}} class="btn btn-danger pull-right" onclick="generateNewKeypair()" type="button"><span class="glyphicon glyphicon-refresh"></span> {{lang_genNew}}</button>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script type="application/javascript">
+
+	// Change Location when selected in Dropdown Menu
+	function selectLocation() {
+		var dropdown = $("#locationDropdown");
+		var location = dropdown.val();
+		window.location.replace("?do=rebootcontrol&location="+location);
+	}
+
+</script>
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522


From d5166e77fbb1dc034a421da868f9539fc455e490 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 21 Mar 2018 11:30:29 +0100
Subject: Update translations

---
 modules-available/locations/lang/de/template-tags.json | 4 ++--
 modules-available/locations/lang/en/template-tags.json | 4 ++--
 modules-available/rebootcontrol/page.inc.php           | 2 +-
 modules-available/runmode/lang/de/messages.json        | 1 +
 modules-available/runmode/lang/de/template-tags.json   | 1 +
 modules-available/runmode/lang/en/messages.json        | 1 +
 modules-available/runmode/lang/en/template-tags.json   | 1 +
 modules-available/statistics/page.inc.php              | 2 +-
 8 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'modules-available/rebootcontrol/page.inc.php')

diff --git a/modules-available/locations/lang/de/template-tags.json b/modules-available/locations/lang/de/template-tags.json
index 04d10d06..43142555 100644
--- a/modules-available/locations/lang/de/template-tags.json
+++ b/modules-available/locations/lang/de/template-tags.json
@@ -6,7 +6,7 @@
     "lang_deleteChildLocations": "Untergeordnete Orte ebenfalls l\u00f6schen",
     "lang_deleteLocation": "Ort l\u00f6schen",
     "lang_deleteSubnet": "Bereich l\u00f6schen",
-    "lang_deleteSubnetWarning": "Alle zum L\u00f6schen markierten Subnetze werden gelöscht. Diese Aktion kann nicht r\u00fcckg\u00e4ngig gemacht werden.",
+    "lang_deleteSubnetWarning": "Alle zum L\u00f6schen markierten Subnetze werden gel\u00f6scht. Diese Aktion kann nicht r\u00fcckg\u00e4ngig gemacht werden.",
     "lang_editConfigVariables": "Konfig.-Variablen",
     "lang_editRoomplan": "Raumplan bearbeiten",
     "lang_endAddress": "Endadresse",
@@ -22,10 +22,10 @@
     "lang_machineLoad": "Besetzt",
     "lang_matchingMachines": "Enthaltene Rechner",
     "lang_name": "Name",
-    "lang_noParent": "Kein \u00fcbergeordneter Ort",
     "lang_overrideCount": "Angepasst",
     "lang_parentLocation": "\u00dcbergeordneter Ort",
     "lang_referencingLectures": "Veranstaltungen",
+    "lang_showRoomplan": "Raumplan anzeigen",
     "lang_startAddress": "Startadresse",
     "lang_subnet": "IP-Bereich",
     "lang_sysConfig": "Lokalisierung",
diff --git a/modules-available/locations/lang/en/template-tags.json b/modules-available/locations/lang/en/template-tags.json
index ddb90f83..41261726 100644
--- a/modules-available/locations/lang/en/template-tags.json
+++ b/modules-available/locations/lang/en/template-tags.json
@@ -22,14 +22,14 @@
     "lang_machineLoad": "In use",
     "lang_matchingMachines": "Matching clients",
     "lang_name": "Name",
-    "lang_noParent": "No parent",
     "lang_overrideCount": "Overridden",
     "lang_parentLocation": "Parent location",
     "lang_referencingLectures": "Assigned Lectures",
+    "lang_showRoomplan": "Show room plan",
     "lang_startAddress": "Start address",
     "lang_subnet": "IP range",
     "lang_sysConfig": "Localization\/Integration",
     "lang_thisListByLocation": "Locations",
     "lang_thisListBySubnet": "Subnets",
     "lang_unassignedMachines": "Machines not matching any location"
-}
+}
\ No newline at end of file
diff --git a/modules-available/rebootcontrol/page.inc.php b/modules-available/rebootcontrol/page.inc.php
index fa7688d8..abbdb2c3 100644
--- a/modules-available/rebootcontrol/page.inc.php
+++ b/modules-available/rebootcontrol/page.inc.php
@@ -38,7 +38,7 @@ class Page_RebootControl extends Page
 			// Filter ones with no permission
 			foreach (array_keys($actualClients) as $idx) {
 				if (!User::hasPermission('action.' . $this->action, $actualClients[$idx]['locationid'])) {
-					Message::addWarning('main.location-no-permission', $actualClients[$idx]['locationid']);
+					Message::addWarning('locations.no-permission-location', $actualClients[$idx]['locationid']);
 					unset($actualClients[$idx]);
 				} else {
 					$locationId = $actualClients[$idx]['locationid'];
diff --git a/modules-available/runmode/lang/de/messages.json b/modules-available/runmode/lang/de/messages.json
index 911d48d4..bca70019 100644
--- a/modules-available/runmode/lang/de/messages.json
+++ b/modules-available/runmode/lang/de/messages.json
@@ -2,6 +2,7 @@
     "cannot-edit-module": "Modul {{0}} kann nicht direkt editiert werden",
     "enabled-removed-save": "{{0}} Rechner gespeichert, {{1}} entfernt",
     "invalid-modeid": "{{1}} ist kein g\u00fcltiger Betriebsmodus f\u00fcr Modul {{0}}",
+    "machine-no-permission": "Keine Berechtigung f\u00fcr client {{0}}",
     "machine-not-found": "Rechner {{0}} nicht gefunden",
     "machine-not-runmode": "Rechner {{0}} hatte keinen speziellen Betriebsmodus aktiviert",
     "machine-removed": "Rechner {{0}} entfernt",
diff --git a/modules-available/runmode/lang/de/template-tags.json b/modules-available/runmode/lang/de/template-tags.json
index 6b45b82c..989e5b1d 100644
--- a/modules-available/runmode/lang/de/template-tags.json
+++ b/modules-available/runmode/lang/de/template-tags.json
@@ -3,6 +3,7 @@
     "lang_assignMachineIntroText": "Definieren Sie hier Clients, die in einem speziellen Betriebsmodus gestartet werden sollen. Sie k\u00f6nnen Rechner anhand der UUID, IP, Hostname oder MAC-Adresse suchen.",
     "lang_assignRunmodeToMachine": "Betriebsmodus",
     "lang_confirmDelete": "Wollen Sie den Betriebsmodus f\u00fcr diesen Client entfernen?",
+    "lang_existingClients": "Vorhandene Clients mit diesem Betriebsmodus",
     "lang_isclient": "Pool-Client",
     "lang_machine": "Client",
     "lang_mode": "Modus",
diff --git a/modules-available/runmode/lang/en/messages.json b/modules-available/runmode/lang/en/messages.json
index 6d890428..1ca1567a 100644
--- a/modules-available/runmode/lang/en/messages.json
+++ b/modules-available/runmode/lang/en/messages.json
@@ -2,6 +2,7 @@
     "cannot-edit-module": "Module {{0}} cannot be edited directly",
     "enabled-removed-save": "Saved {{0}} clients, deleted {{1}}",
     "invalid-modeid": "Module {{0}} doesn't provide mode {{1}}",
+    "machine-no-permission": "No permission for client {{0}}",
     "machine-not-found": "Client {{0}} not found",
     "machine-not-runmode": "No special mode of operation configured for client {{0}}",
     "machine-removed": "Removed client {{0}}",
diff --git a/modules-available/runmode/lang/en/template-tags.json b/modules-available/runmode/lang/en/template-tags.json
index 43fd3da5..89cf6b15 100644
--- a/modules-available/runmode/lang/en/template-tags.json
+++ b/modules-available/runmode/lang/en/template-tags.json
@@ -3,6 +3,7 @@
     "lang_assignMachineIntroText": "Define the clients which should start a special runmode configuration. You can search for clients by UUID, IP address, host name or MAC address.",
     "lang_assignRunmodeToMachine": "Runmode",
     "lang_confirmDelete": "Do you want to delete the runmode for this client?",
+    "lang_existingClients": "Existing clients with this run mode",
     "lang_isclient": "Pool-Client",
     "lang_machine": "Client",
     "lang_mode": "Mode",
diff --git a/modules-available/statistics/page.inc.php b/modules-available/statistics/page.inc.php
index 3baac190..60743fb6 100644
--- a/modules-available/statistics/page.inc.php
+++ b/modules-available/statistics/page.inc.php
@@ -227,7 +227,7 @@ class Page_Statistics extends Page
 			if (in_array($row['locationid'], $allowedLocations)) {
 				$delete[] = $row['machineuuid'];
 			} else {
-				Message::addError('no-permission-location', $row['locationid']);
+				Message::addError('locations.no-permission-location', $row['locationid']);
 			}
 		}
 		if (!empty($delete)) {
-- 
cgit v1.2.3-55-g7522


From 24815e16087b4b1b64e9f380d45d411af32daf42 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 9 Apr 2018 16:56:04 +0200
Subject: Permissions: Consistency: Make all pages require at least one
 permission to be accessible

Closes #3340
---
 modules-available/backup/page.inc.php                 |  1 +
 modules-available/exams/page.inc.php                  |  9 +--------
 modules-available/locations/page.inc.php              | 19 +++++++++++++++----
 modules-available/news/page.inc.php                   | 10 ++--------
 modules-available/news/permissions/permissions.json   |  3 +++
 modules-available/rebootcontrol/page.inc.php          |  9 ++++++---
 modules-available/serversetup-bwlp/page.inc.php       |  6 ++++++
 .../serversetup-bwlp/permissions/permissions.json     |  3 +++
 modules-available/statistics_reporting/page.inc.php   |  1 +
 modules-available/sysconfig/page.inc.php              |  2 +-
 modules-available/syslog/page.inc.php                 |  1 +
 modules-available/systemstatus/page.inc.php           |  1 +
 modules-available/webinterface/page.inc.php           |  4 ++++
 .../webinterface/permissions/permissions.json         |  3 +++
 14 files changed, 48 insertions(+), 24 deletions(-)

(limited to 'modules-available/rebootcontrol/page.inc.php')

diff --git a/modules-available/backup/page.inc.php b/modules-available/backup/page.inc.php
index 14522734..985f39ee 100644
--- a/modules-available/backup/page.inc.php
+++ b/modules-available/backup/page.inc.php
@@ -23,6 +23,7 @@ class Page_Backup extends Page
 			User::assertPermission("restore");
 			$this->restore();
 		}
+		User::assertPermission('*');
 	}
 
 	protected function doRender()
diff --git a/modules-available/exams/page.inc.php b/modules-available/exams/page.inc.php
index 51975052..15640a73 100644
--- a/modules-available/exams/page.inc.php
+++ b/modules-available/exams/page.inc.php
@@ -441,16 +441,9 @@ class Page_Exams extends Page
 
 	protected function doRender()
 	{
-		if (Request::isPost()) {
-			$examid = Request::post('examid', 0, 'int');
-		} else if (Request::isGet()) {
-			$examid = Request::get('examid', 0, 'int');
-		} else {
-			die('Neither Post nor Get Request send.');
-		}
-
 		if ($this->action === "show") {
 
+			User::assertPermission('exams.view');
 			// General title and description
 			Render::addTemplate('page-main-heading');
 			// List of defined exam periods
diff --git a/modules-available/locations/page.inc.php b/modules-available/locations/page.inc.php
index 80a8076b..4d5c6628 100644
--- a/modules-available/locations/page.inc.php
+++ b/modules-available/locations/page.inc.php
@@ -24,6 +24,9 @@ class Page_Locations extends Page
 		} elseif ($this->action === 'updatesubnets') {
 			$this->updateSubnets();
 		}
+		if (Request::isPost()) {
+			Util::redirect('?do=locations');
+		}
 	}
 
 	private function updateSubnets()
@@ -306,10 +309,16 @@ class Page_Locations extends Page
 
 	protected function doRender()
 	{
-		$getAction = Request::get('action');
-		if (empty($getAction)) {
-			// Until we have a main landing page?
-			Util::redirect('?do=Locations&action=showlocations');
+		$getAction = Request::get('action', false, 'string');
+		if ($getAction === false) {
+			if (User::hasPermission('location.view')) {
+				Util::redirect('?do=locations&action=showlocations');
+			} elseif (User::hasPermission('subnets.edit')) {
+				Util::redirect('?do=locations&action=showsubnets');
+			} else {
+				// Trigger permission denied by asserting non-existent permission
+				User::assertPermission('location.view');
+			}
 		}
 		if ($getAction === 'showsubnets') {
 			User::assertPermission('subnets.edit', NULL, '?do=locations');
@@ -324,6 +333,8 @@ class Page_Locations extends Page
 			Render::addTemplate('subnets', array('list' => $rows));
 		} elseif ($getAction === 'showlocations') {
 			$this->showLocationList();
+		} else {
+			Util::redirect('?do=locations');
 		}
 	}
 
diff --git a/modules-available/news/page.inc.php b/modules-available/news/page.inc.php
index e7b70c0f..1e2e3eef 100644
--- a/modules-available/news/page.inc.php
+++ b/modules-available/news/page.inc.php
@@ -46,14 +46,8 @@ class Page_News extends Page
 
 		// check which action we need to do
 		$action = Request::any('action', 'show');
-		if ($action === 'clear') {
-			// clear news input fields
-			// TODO: is this the right way?
-			$this->newsId = false;
-			$this->newsTitle = false;
-			$this->newsContent = false;
-			$this->newsDate = false;
-		} elseif ($action === 'show') {
+		if ($action === 'show') {
+			User::assertPermission('access-page');
 			/* load latest things */
 			$this->loadLatest('help');
 			$this->loadLatest('news');
diff --git a/modules-available/news/permissions/permissions.json b/modules-available/news/permissions/permissions.json
index 0d9435d7..953599df 100644
--- a/modules-available/news/permissions/permissions.json
+++ b/modules-available/news/permissions/permissions.json
@@ -1,4 +1,7 @@
 {
+    "access-page": {
+        "location-aware": false
+    },
     "help.delete": {
         "location-aware": false
     },
diff --git a/modules-available/rebootcontrol/page.inc.php b/modules-available/rebootcontrol/page.inc.php
index abbdb2c3..041ae74f 100644
--- a/modules-available/rebootcontrol/page.inc.php
+++ b/modules-available/rebootcontrol/page.inc.php
@@ -79,11 +79,14 @@ class Page_RebootControl extends Page
 				//location you want to see, default are "not  assigned" clients
 				$requestedLocation = Request::get('location', false, 'int');
 				$allowedLocs = User::getAllowedLocations("action.*");
+				if (empty($allowedLocs)) {
+					User::assertPermission('action.*');
+				}
 
 				if ($requestedLocation === false) {
 					if (in_array(0, $allowedLocs)) {
 						$requestedLocation = 0;
-					} elseif (!empty($allowedLocs)) {
+					} else {
 						$requestedLocation = reset($allowedLocs);
 					}
 				}
@@ -105,8 +108,8 @@ class Page_RebootControl extends Page
 				Render::addTemplate('header', $data);
 
 				// only fill table if user has at least one permission for the location
-				if ($requestedLocation === false) {
-					Message::addError('main.no-permission');
+				if (!in_array($requestedLocation, $allowedLocs)) {
+					Message::addError('locations.no-permission-location', $requestedLocation);
 				} else {
 					$data['data'] = RebootQueries::getMachineTable($requestedLocation);
 					Render::addTemplate('_page', $data);
diff --git a/modules-available/serversetup-bwlp/page.inc.php b/modules-available/serversetup-bwlp/page.inc.php
index ae709da7..78096d7b 100644
--- a/modules-available/serversetup-bwlp/page.inc.php
+++ b/modules-available/serversetup-bwlp/page.inc.php
@@ -43,6 +43,12 @@ class Page_ServerSetup extends Page
 			// iPXE stuff changes
 			$this->updatePxeMenu();
 		}
+
+		if (Request::isPost()) {
+			Util::redirect('?do=serversetup');
+		}
+
+		User::assertPermission('access-page');
 	}
 
 	protected function doRender()
diff --git a/modules-available/serversetup-bwlp/permissions/permissions.json b/modules-available/serversetup-bwlp/permissions/permissions.json
index 6bae5422..44927506 100644
--- a/modules-available/serversetup-bwlp/permissions/permissions.json
+++ b/modules-available/serversetup-bwlp/permissions/permissions.json
@@ -1,4 +1,7 @@
 {
+    "access-page": {
+        "location-aware": false
+    },
     "download": {
         "location-aware": false
     },
diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index af4b2b12..cc03e4d8 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -84,6 +84,7 @@ class Page_Statistics_Reporting extends Page
 				die(json_encode($report));
 			}
 		}
+		User::assertPermission('*');
 	}
 
 	/**
diff --git a/modules-available/sysconfig/page.inc.php b/modules-available/sysconfig/page.inc.php
index 7bb3e599..8d1799af 100644
--- a/modules-available/sysconfig/page.inc.php
+++ b/modules-available/sysconfig/page.inc.php
@@ -160,7 +160,7 @@ class Page_SysConfig extends Page
 			$pMods = User::hasPermission('module.view-list');
 			$pConfs = User::hasPermission('config.view-list');
 			if (!($pMods || $pConfs)) {
-				Message::addError('main.no-permission');
+				User::assertPermission('config.view-list');
 			}
 			Render::openTag('div', array('class' => 'row'));
 			if ($pConfs) {
diff --git a/modules-available/syslog/page.inc.php b/modules-available/syslog/page.inc.php
index 3a7513b5..00c55a3f 100644
--- a/modules-available/syslog/page.inc.php
+++ b/modules-available/syslog/page.inc.php
@@ -25,6 +25,7 @@ class Page_SysLog extends Page
 			}
 			Util::redirect('?do=syslog');
 		}
+		User::assertPermission('*');
 	}
 
 	protected function doRender()
diff --git a/modules-available/systemstatus/page.inc.php b/modules-available/systemstatus/page.inc.php
index 816caa05..66b30bcf 100644
--- a/modules-available/systemstatus/page.inc.php
+++ b/modules-available/systemstatus/page.inc.php
@@ -18,6 +18,7 @@ class Page_SystemStatus extends Page
 			User::assertPermission("serverreboot");
 			$this->rebootTask = Taskmanager::submit('Reboot');
 		}
+		User::assertPermission('*');
 	}
 
 	protected function doRender()
diff --git a/modules-available/webinterface/page.inc.php b/modules-available/webinterface/page.inc.php
index 806ffd59..ca52c2ab 100644
--- a/modules-available/webinterface/page.inc.php
+++ b/modules-available/webinterface/page.inc.php
@@ -28,6 +28,10 @@ class Page_WebInterface extends Page
 				$this->actionCustomization();
 				break;
 		}
+		if (Request::isPost()) {
+			Util::redirect('?do=webinterface');
+		}
+		User::assertPermission('access-page');
 	}
 
 	private function actionConfigureHttps()
diff --git a/modules-available/webinterface/permissions/permissions.json b/modules-available/webinterface/permissions/permissions.json
index fa6f493f..ed81602a 100644
--- a/modules-available/webinterface/permissions/permissions.json
+++ b/modules-available/webinterface/permissions/permissions.json
@@ -1,4 +1,7 @@
 {
+    "access-page": {
+        "location-aware": false
+    },
     "edit.design": {
         "location-aware": false
     },
-- 
cgit v1.2.3-55-g7522


From b48e755affc865547ab148340f586ae9a297c8f5 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 24 Apr 2018 15:54:00 +0200
Subject: [rebootcontrol] Try clients first that are known to be online

This prevents long delays if a large amount of clients is
selected where the majority is offline.
---
 modules-available/rebootcontrol/inc/rebootqueries.inc.php | 4 ++--
 modules-available/rebootcontrol/page.inc.php              | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'modules-available/rebootcontrol/page.inc.php')

diff --git a/modules-available/rebootcontrol/inc/rebootqueries.inc.php b/modules-available/rebootcontrol/inc/rebootqueries.inc.php
index 3dc3183f..525a9e58 100644
--- a/modules-available/rebootcontrol/inc/rebootqueries.inc.php
+++ b/modules-available/rebootcontrol/inc/rebootqueries.inc.php
@@ -44,13 +44,13 @@ class RebootQueries
 	/**
 	 * Get machines by list of UUIDs
 	 * @param string[] $list list of system UUIDs
-	 * @return array list of machines with machineuuid, clientip and locationid
+	 * @return array list of machines with machineuuid, clientip, state and locationid
 	 */
 	public static function getMachinesByUuid($list)
 	{
 		if (empty($list))
 			return array();
-		$res = Database::simpleQuery("SELECT machineuuid, clientip, locationid FROM machine
+		$res = Database::simpleQuery("SELECT machineuuid, clientip, state, locationid FROM machine
 				WHERE machineuuid IN (:list)", compact('list'));
 		return $res->fetchAll(PDO::FETCH_ASSOC);
 	}
diff --git a/modules-available/rebootcontrol/page.inc.php b/modules-available/rebootcontrol/page.inc.php
index 041ae74f..675c94f8 100644
--- a/modules-available/rebootcontrol/page.inc.php
+++ b/modules-available/rebootcontrol/page.inc.php
@@ -49,7 +49,13 @@ class Page_RebootControl extends Page
 				Message::addError('no-clients-selected');
 				Util::redirect();
 			}
-
+			usort($actualClients, function($a, $b) {
+				$a = ($a['state'] === 'IDLE' || $a['state'] === 'OCCUPIED');
+				$b = ($b['state'] === 'IDLE' || $b['state'] === 'OCCUPIED');
+				if ($a === $b)
+					return 0;
+				return $a ? -1 : 1;
+			});
 			$task = RebootControl::execute($actualClients, $this->action === 'shutdown', $minutes, $locationId);
 			Util::redirect("?do=rebootcontrol&taskid=".$task["id"]);
 		}
-- 
cgit v1.2.3-55-g7522


From 7d4b41dc7e85b4f5f249c61db11ae27d53144c9c Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 25 Apr 2018 16:46:18 +0200
Subject: [rebootcontrol] Nicer status list; list of all running jobs

---
 .../rebootcontrol/inc/rebootcontrol.inc.php        | 65 ++++++++++++++++++++--
 .../rebootcontrol/inc/rebootqueries.inc.php        |  4 +-
 .../rebootcontrol/lang/de/template-tags.json       |  6 ++
 .../rebootcontrol/lang/en/template-tags.json       |  6 ++
 modules-available/rebootcontrol/page.inc.php       | 48 +++++++++++++---
 .../rebootcontrol/templates/_page.html             | 44 +++++++--------
 .../rebootcontrol/templates/status.html            | 26 ++++++---
 .../rebootcontrol/templates/task-list.html         | 33 +++++++++++
 8 files changed, 186 insertions(+), 46 deletions(-)
 create mode 100644 modules-available/rebootcontrol/templates/task-list.html

(limited to 'modules-available/rebootcontrol/page.inc.php')

diff --git a/modules-available/rebootcontrol/inc/rebootcontrol.inc.php b/modules-available/rebootcontrol/inc/rebootcontrol.inc.php
index 789552cd..1024b036 100644
--- a/modules-available/rebootcontrol/inc/rebootcontrol.inc.php
+++ b/modules-available/rebootcontrol/inc/rebootcontrol.inc.php
@@ -3,28 +3,83 @@
 class RebootControl
 {
 
+	const KEY_TASKLIST = 'rebootcontrol.tasklist';
+
+	const REBOOT = 'REBOOT';
+	const KEXEC_REBOOT = 'KEXEC_REBOOT';
+	const SHUTDOWN = 'SHUTDOWN';
+
 	/**
 	 * @param string[] $uuids List of machineuuids to reboot
+	 * @param bool $kexec whether to trigger kexec-reboot instead of full BIOS cycle
 	 * @return false|array task struct for the reboot job
 	 */
-	public static function reboot($uuids)
+	public static function reboot($uuids, $kexec = false)
 	{
 		$list = RebootQueries::getMachinesByUuid($uuids);
 		if (empty($list))
 			return false;
-		return self::execute($list, false, 0, 0);
+		return self::execute($list, $kexec ? RebootControl::KEXEC_REBOOT : RebootControl::REBOOT, 0, 0);
 	}
 
-	public static function execute($list, $shutdown, $minutes, $locationId)
+	/**
+	 * @param array $list list of clients containing each keys 'machineuuid' and 'clientip'
+	 * @param string $mode reboot mode: RebootControl::REBOOT ::KEXEC_REBOOT or ::SHUTDOWN
+	 * @param int $minutes delay in minutes for action
+	 * @param int $locationId meta data only: locationId of clients
+	 * @return array|false the task, or false if it could not be started
+	 */
+	public static function execute($list, $mode, $minutes, $locationId)
 	{
-		return Taskmanager::submit("RemoteReboot", array(
+		$task = Taskmanager::submit("RemoteReboot", array(
 			"clients" => $list,
-			"shutdown" => $shutdown,
+			"mode" => $mode,
 			"minutes" => $minutes,
 			"locationId" => $locationId,
 			"sshkey" => SSHKey::getPrivateKey(),
 			"port" => 9922, // Hard-coded, must match mgmt-sshd module
 		));
+		if (!Taskmanager::isFailed($task)) {
+			Property::addToList(RebootControl::KEY_TASKLIST, $locationId . '/' . $task["id"], 60 * 24);
+		}
+		return $task;
+	}
+
+	/**
+	 * @param int[]|null $locations filter by these locations
+	 * @return array list of active tasks for reboots/shutdowns.
+	 */
+	public static function getActiveTasks($locations = null)
+	{
+		if (is_array($locations) && in_array(0,$locations)) {
+			$locations = null;
+		}
+		$list = Property::getList(RebootControl::KEY_TASKLIST);
+		$return = [];
+		foreach ($list as $entry) {
+			$p = explode('/', $entry, 2);
+			if (count($p) !== 2) {
+				Property::removeFromList(RebootControl::KEY_TASKLIST, $entry);
+				continue;
+			}
+			if (is_array($locations) && !in_array($p[0], $locations)) // Ignore
+				continue;
+			$id = $p[1];
+			$task = Taskmanager::status($id);
+			if ($task === false) {
+				Property::removeFromList(RebootControl::KEY_TASKLIST, $entry);
+				continue;
+			}
+			$return[] = [
+				'taskId' => $task['id'],
+				'locationId' => $task['data']['locationId'],
+				'time' => $task['data']['time'],
+				'mode' => $task['data']['mode'],
+				'clientCount' => count($task['data']['clients']),
+				'status' => $task['statusCode'],
+			];
+		}
+		return $return;
 	}
 
 }
\ No newline at end of file
diff --git a/modules-available/rebootcontrol/inc/rebootqueries.inc.php b/modules-available/rebootcontrol/inc/rebootqueries.inc.php
index 525a9e58..063b36e4 100644
--- a/modules-available/rebootcontrol/inc/rebootqueries.inc.php
+++ b/modules-available/rebootcontrol/inc/rebootqueries.inc.php
@@ -44,13 +44,13 @@ class RebootQueries
 	/**
 	 * Get machines by list of UUIDs
 	 * @param string[] $list list of system UUIDs
-	 * @return array list of machines with machineuuid, clientip, state and locationid
+	 * @return array list of machines with machineuuid, hostname, clientip, state and locationid
 	 */
 	public static function getMachinesByUuid($list)
 	{
 		if (empty($list))
 			return array();
-		$res = Database::simpleQuery("SELECT machineuuid, clientip, state, locationid FROM machine
+		$res = Database::simpleQuery("SELECT machineuuid, hostname, clientip, state, locationid FROM machine
 				WHERE machineuuid IN (:list)", compact('list'));
 		return $res->fetchAll(PDO::FETCH_ASSOC);
 	}
diff --git a/modules-available/rebootcontrol/lang/de/template-tags.json b/modules-available/rebootcontrol/lang/de/template-tags.json
index eccc8738..c678ef88 100644
--- a/modules-available/rebootcontrol/lang/de/template-tags.json
+++ b/modules-available/rebootcontrol/lang/de/template-tags.json
@@ -1,13 +1,17 @@
 {
+    "lang_activeTasks": "Laufende Jobs",
     "lang_authFail": "Authentifizierung fehlgeschlagen",
     "lang_client": "Client",
+    "lang_clientCount": "# Clients",
     "lang_confirmNewKeypair": "Wirklich neues Schl\u00fcsselpaar erzeugen?",
     "lang_connecting": "Verbinde...",
     "lang_error": "Nicht erreichbar",
     "lang_genNew": "Neues Schl\u00fcsselpaar generieren",
     "lang_ip": "IP",
+    "lang_kexecRebootCheck": "Schneller Reboot direkt in bwLehrpool",
     "lang_location": "Standort",
     "lang_minutes": " Minuten",
+    "lang_mode": "Modus",
     "lang_newKeypairExplanation": "Sie k\u00f6nnen ein neues Schl\u00fcsselpaar erzeugen lassen. In diesem Fall wird das alte Schl\u00fcsselpaar verworfen, sodass alle zum jetzigen Zeitpunkt bereits gestarteten Rechner nicht mehr aus der Ferne bedient werden k\u00f6nnen, bis diese manuell neugestartet wurden.",
     "lang_off": "Aus",
     "lang_on": "An",
@@ -18,6 +22,7 @@
     "lang_rebootButton": "Neustarten",
     "lang_rebootCheck": "Wollen Sie die ausgew\u00e4hlten Rechner wirklich neustarten?",
     "lang_rebootControl": "Reboot Control",
+    "lang_rebootIn": "Neustart in:",
     "lang_rebooting": "Neustart...",
     "lang_selectall": "Alle ausw\u00e4hlen",
     "lang_selected": "Ausgew\u00e4hlt",
@@ -29,5 +34,6 @@
     "lang_shutdownCheck": "Wollen Sie die ausgew\u00e4hlten Rechner wirklich herunterfahren?",
     "lang_shutdownIn": "Herunterfahren in: ",
     "lang_status": "Status",
+    "lang_time": "Zeit",
     "lang_unselectall": "Alle abw\u00e4hlen"
 }
\ No newline at end of file
diff --git a/modules-available/rebootcontrol/lang/en/template-tags.json b/modules-available/rebootcontrol/lang/en/template-tags.json
index c2346044..c64014ff 100644
--- a/modules-available/rebootcontrol/lang/en/template-tags.json
+++ b/modules-available/rebootcontrol/lang/en/template-tags.json
@@ -1,13 +1,17 @@
 {
+    "lang_activeTasks": "Active tasks",
     "lang_authFail": "Authentication failed",
     "lang_client": "Client",
+    "lang_clientCount": "# clients",
     "lang_confirmNewKeypair": "Really create new key pair?",
     "lang_connecting": "Connecting...",
     "lang_error": "Not available",
     "lang_genNew": "Generate new keypair",
     "lang_ip": "IP",
+    "lang_kexecRebootCheck": "Quick reboot straight to bwLehrpool (kexec)",
     "lang_location": "Location",
     "lang_minutes": " Minutes",
+    "lang_mode": "Mode",
     "lang_newKeypairExplanation": "You can create a new keypair, which will replace the old one. Please note that after doing so, you cannot poweroff or reboot clients that are already running, since they still use the old key. They have to be rebooted manually first.",
     "lang_off": "Off",
     "lang_on": "On",
@@ -18,6 +22,7 @@
     "lang_rebootButton": "Reboot",
     "lang_rebootCheck": "Do you really want to reboot the selected clients?",
     "lang_rebootControl": "Reboot Control",
+    "lang_rebootIn": "Reboot in:",
     "lang_rebooting": "Rebooting...",
     "lang_selectall": "Select all",
     "lang_selected": "Selected",
@@ -29,5 +34,6 @@
     "lang_shutdownCheck": "Do you really want to shut down the selected clients?",
     "lang_shutdownIn": "Shutdown in: ",
     "lang_status": "Status",
+    "lang_time": "Time",
     "lang_unselectall": "Unselect all"
 }
\ No newline at end of file
diff --git a/modules-available/rebootcontrol/page.inc.php b/modules-available/rebootcontrol/page.inc.php
index 675c94f8..3a438504 100644
--- a/modules-available/rebootcontrol/page.inc.php
+++ b/modules-available/rebootcontrol/page.inc.php
@@ -27,7 +27,6 @@ class Page_RebootControl extends Page
 				Message::addError('no-clients-selected');
 				Util::redirect();
 			}
-			$minutes = Request::post('minutes', 0, 'int');
 
 			$actualClients = RebootQueries::getMachinesByUuid($requestedClients);
 			if (count($actualClients) !== count($requestedClients)) {
@@ -56,8 +55,22 @@ class Page_RebootControl extends Page
 					return 0;
 				return $a ? -1 : 1;
 			});
-			$task = RebootControl::execute($actualClients, $this->action === 'shutdown', $minutes, $locationId);
-			Util::redirect("?do=rebootcontrol&taskid=".$task["id"]);
+			if ($this->action === 'shutdown') {
+				$mode = 'SHUTDOWN';
+				$minutes = Request::post('s-minutes', 0, 'int');
+			} elseif (Request::any('quick', false, 'string') === 'on') {
+				$mode = 'KEXEC_REBOOT';
+				$minutes = Request::post('r-minutes', 0, 'int');
+			} else {
+				$mode = 'REBOOT';
+				$minutes = Request::post('r-minutes', 0, 'int');
+			}
+			$task = RebootControl::execute($actualClients, $mode, $minutes, $locationId);
+			if (Taskmanager::isTask($task)) {
+				Util::redirect("?do=rebootcontrol&taskid=" . $task["id"]);
+			} else {
+				Util::redirect("?do=rebootcontrol");
+			}
 		}
 
 	}
@@ -71,15 +84,22 @@ class Page_RebootControl extends Page
 		if ($this->action === 'show') {
 
 			$data = [];
-			$taskId = Request::get("taskid");
+			$task = Request::get("taskid", false, 'string');
+			if ($task !== false) {
+				$task = Taskmanager::status($task);
+			}
 
-			if ($taskId && Taskmanager::isTask($taskId)) {
-				$task = Taskmanager::status($taskId);
-				$data['taskId'] = $taskId;
+			if (Taskmanager::isTask($task)) {
+
+				$data['taskId'] = $task['id'];
 				$data['locationId'] = $task['data']['locationId'];
 				$data['locationName'] = Location::getName($task['data']['locationId']);
-				$data['clients'] = $task['data']['clients'];
+				$uuids = array_map(function($entry) {
+					return $entry['machineuuid'];
+				}, $task['data']['clients']);
+				$data['clients'] = RebootQueries::getMachinesByUuid($uuids);
 				Render::addTemplate('status', $data);
+
 			} else {
 
 				//location you want to see, default are "not  assigned" clients
@@ -103,6 +123,8 @@ class Page_RebootControl extends Page
 				foreach ($data['locations'] as &$loc) {
 					if (!in_array($loc["locationid"], $allowedLocs)) {
 						$loc["disabled"] = "disabled";
+					} elseif ($loc["locationid"] == $requestedLocation) {
+						$data['location'] = $loc['locationname'];
 					}
 				}
 				// Always show public key (it's public, isn't it?)
@@ -121,6 +143,16 @@ class Page_RebootControl extends Page
 					Render::addTemplate('_page', $data);
 				}
 
+				// Append list of active reboot/shutdown tasks
+				$active = RebootControl::getActiveTasks($allowedLocs);
+				if (!empty($active)) {
+					foreach ($active as &$entry) {
+						$entry['locationName'] = Location::getName($entry['locationId']);
+					}
+					unset($entry);
+					Render::addTemplate('task-list', ['list' => $active]);
+				}
+
 			}
 		}
 	}
diff --git a/modules-available/rebootcontrol/templates/_page.html b/modules-available/rebootcontrol/templates/_page.html
index 82f82b02..a124e165 100644
--- a/modules-available/rebootcontrol/templates/_page.html
+++ b/modules-available/rebootcontrol/templates/_page.html
@@ -1,4 +1,6 @@
-<form id="tableDataForm" method="post" action="?do=rebootcontrol" class="form-inline">
+<h3>{{location}}</h3>
+
+<form method="post" action="?do=rebootcontrol" class="form-inline">
 	<input type="hidden" name="token" value="{{token}}">
 	<div class="row">
 		<div class="col-md-12">
@@ -45,9 +47,7 @@
 		</div>
 	</div>
 
-
 	<!-- Modals -->
-
 	<div class ="modal fade" id="rebootModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
 		<div class="modal-dialog" role="document">
 			<div class="modal-content">
@@ -56,17 +56,27 @@
 					<h4 class="modal-title" id="myModalLabel">{{lang_rebootButton}}</h4>
 				</div>
 				<div class="modal-body">
-					{{lang_rebootCheck}}
+					<div>{{lang_rebootCheck}}</div>
+					<div>{{lang_rebootIn}} <input name="r-minutes" title="{{lang_shutdownIn}}" type="number" value="0" min="0" pattern="\d+"> {{lang_minutes}}</div>
+					<div>
+						<div class="checkbox checkbox-inline">
+							<input name="quick" type="checkbox" value="on" id="rb-quick">
+							<label for="rb-quick">{{lang_kexecRebootCheck}}</label>
+						</div>
+					</div>
 				</div>
 				<div class="modal-footer">
 					<button type="button" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button>
-					<button type="submit" {{perms.action.reboot.disabled}} name="action" value="reboot" class="btn btn-warning"><span class="glyphicon glyphicon-repeat"></span> {{lang_reboot}}</button>
+					<button type="submit" {{perms.action.reboot.disabled}} name="action" value="reboot" class="btn btn-warning">
+						<span class="glyphicon glyphicon-repeat"></span>
+						{{lang_reboot}}
+					</button>
 				</div>
 			</div>
 		</div>
 	</div>
 
-	<div class ="modal fade" id="shutdownModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+	<div class ="modal fade" id="shutdownModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel2">
 		<div class="modal-dialog" role="document">
 			<div class="modal-content">
 				<div class="modal-header">
@@ -74,12 +84,15 @@
 					<h4 class="modal-title" id="myModalLabel2">{{lang_shutdownButton}}</h4>
 				</div>
 				<div class="modal-body">
-					{{lang_shutdownCheck}}
-					{{lang_shutdownIn}} <input id="shutdownTimer" name="minutes" title="{{lang_shutdownIn}}" type="number" value="0" min="0" pattern="\d+"> {{lang_minutes}}
+					<div>{{lang_shutdownCheck}}</div>
+					{{lang_shutdownIn}} <input name="s-minutes" title="{{lang_shutdownIn}}" type="number" value="0" min="0" pattern="\d+"> {{lang_minutes}}
 				</div>
 				<div class="modal-footer">
 					<button type="button" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button>
-					<button type="submit" {{perms.action.shutdown.disabled}} name="action" value="shutdown" class="btn btn-danger"><span class="glyphicon glyphicon-off"></span> {{lang_shutdownButton}}</button>
+					<button type="submit" {{perms.action.shutdown.disabled}} name="action" value="shutdown" class="btn btn-danger">
+						<span class="glyphicon glyphicon-off"></span>
+						{{lang_shutdownButton}}
+					</button>
 				</div>
 			</div>
 		</div>
@@ -168,17 +181,4 @@
 		}
 	}
 
-	function generateNewKeypair() {
-		if (!confirm('{{lang_confirmNewKeypair}}'))
-			return;
-		$.ajax({
-			url: '?do=rebootcontrol',
-			type: 'POST',
-			data: { action: "generateNewKeypair", token: TOKEN },
-			success: function(value) {
-				$('#pubKey').text(value);
-			}
-		});
-	}
-
 </script>
\ No newline at end of file
diff --git a/modules-available/rebootcontrol/templates/status.html b/modules-available/rebootcontrol/templates/status.html
index c2fdab46..c05b2fad 100644
--- a/modules-available/rebootcontrol/templates/status.html
+++ b/modules-available/rebootcontrol/templates/status.html
@@ -7,8 +7,6 @@
 	</form>
 </div>
 
-<div data-tm-id="{{taskId}}" data-tm-log="error" data-tm-callback="updateStatus"></div>
-
 <div>
 	<table class="table table-hover stupidtable" id="dataTable">
 		<thead>
@@ -24,7 +22,7 @@
 		<tbody>
 		{{#clients}}
 			<tr>
-				<td>{{machineuuid}}</td>
+				<td>{{hostname}}{{^hostname}}{{machineuuid}}{{/hostname}}</td>
 				<td>{{clientip}}</td>
 				<td id="status-{{machineuuid}}"></td>
 			</tr>
@@ -33,6 +31,8 @@
 	</table>
 </div>
 
+<div data-tm-id="{{taskId}}" data-tm-log="error" data-tm-callback="updateStatus"></div>
+
 <script type="application/javascript">
 	statusStrings = {
 		"CONNECTING" : "{{lang_connecting}}",
@@ -50,12 +50,20 @@
 			return;
 		var clientStatus = task.data.clientStatus;
 		for (var uuid in clientStatus) {
-			if (clientStatus.hasOwnProperty(uuid)) {
-				var shutdownTime = ' ';
-				if (clientStatus[uuid] === 'SHUTDOWN_AT' || clientStatus[uuid] === 'REBOOT_AT') {
-					shutdownTime += task.data.time;
-				}
-				$("#status-" + uuid).text(statusStrings[clientStatus[uuid]] + shutdownTime);
+			if (!clientStatus.hasOwnProperty(uuid))
+				continue;
+			var $s = $("#status-" + uuid);
+			var status = clientStatus[uuid];
+			if ($s.data('state') === status)
+				continue;
+			$s.data('state', status);
+			var text = statusStrings[status];
+			if (status === 'SHUTDOWN_AT' || status === 'REBOOT_AT') {
+				text += ' ' + task.data.time;
+			}
+			$s.text(text);
+			if (status === 'CONNECTING' || status === 'REBOOTING') {
+				$s.append('<span class="glyphicon glyphicon-hourglass"></span>');
 			}
 		}
 	}
diff --git a/modules-available/rebootcontrol/templates/task-list.html b/modules-available/rebootcontrol/templates/task-list.html
new file mode 100644
index 00000000..063ba949
--- /dev/null
+++ b/modules-available/rebootcontrol/templates/task-list.html
@@ -0,0 +1,33 @@
+<h3>{{lang_activeTasks}}</h3>
+<table class="table">
+	<thead>
+		<tr>
+			<th>{{lang_mode}}</th>
+			<th>{{lang_location}}</th>
+			<th>{{lang_time}}</th>
+			<th>{{lang_clientCount}}</th>
+			<th>{{lang_status}}</th>
+		</tr>
+	</thead>
+	<tbody>
+	{{#list}}
+		<tr>
+			<td>
+				<a href="?do=rebootcontrol&amp;taskid={{taskId}}">{{mode}}</a>
+			</td>
+			<td>
+				{{locationName}}
+			</td>
+			<td>
+				{{time}}
+			</td>
+			<td>
+				{{clientCount}}
+			</td>
+			<td>
+				{{status}}
+			</td>
+		</tr>
+	{{/list}}
+	</tbody>
+</table>
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522