Add ability for SKA administrators to revoke / delete keys of other users

Author: Msprg

templates/user.php

@@ -43,6 +43,10 @@
 		<?php if(count($this->get('active_user_keys')) == 0) { ?>
 		<p><?php out($this->get('user')->name)?> has no active public keys.</p>
 		<?php } else { ?>
+		<?php if($this->get('admin')) { ?>
+		<form method="post" action="<?php outurl($this->data->relative_request_url) ?>">
+			<?php out($this->get('active_user')->get_csrf_field(), ESC_NONE) ?>
+		<?php } ?>
 		<div class="ska-scroll-container">
 			<table class="table">
 				<thead>
@@ -53,6 +57,9 @@
 						<th>Creation Date</th>
 						<th>Size</th>
 						<th>Comment</th>
+						<?php if($this->get('admin')) { ?>
+							<th>Actions</th>
+						<?php } ?>
 					</tr>
 				</thead>
 				<tbody>
@@ -72,12 +79,20 @@
 						<td><?php out($key->format_creation_date()) ?></td>
 						<td><?php out($key->keysize) ?></td>
 						<td><?php out($key->comment) ?></td>
+						<?php if($this->get('admin')) { ?>
+						<td>
+							<button type="submit" name="delete_public_key" value="<?php out($key->id) ?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-trash"></span> Delete public key</button>
+						</td>
+						<?php } ?>
 					</tr>
 					<?php } ?>
 				</tbody>
 			</table>
 		</div>
+		<?php if($this->get('admin')) { ?>
+			</form>
 		<?php } ?>
+	<?php } ?>
 		<?php
 			$num_deleted = $this->get('user')->count_deleted_public_keys();
 			if ($num_deleted > 0) {

views/user.php

@@ -26,6 +26,7 @@
 $admined_servers = $user->list_admined_servers(array('pending_requests'));
 $admined_groups = $user->list_admined_groups(array('members', 'admins'));
 $groups = $user->list_group_memberships(array('members', 'admins'));
+$active_user_keys = $user->list_public_keys(null, null, false);
 usort($admined_servers, function($a, $b) {return strnatcasecmp($a->hostname, $b->hostname);});
 
 if(isset($_POST['reassign_servers']) && is_array($_POST['servers']) && $active_user && $active_user->admin) {
@@ -47,6 +48,21 @@
 		}
 		redirect('#details');
 	}
+} elseif(isset($_POST['delete_public_key']) && $active_user && $active_user->admin) {
+	$delete_key_raw = trim($_POST['delete_public_key']);
+	$delete_key_id = filter_var($delete_key_raw, FILTER_VALIDATE_INT);
+	
+	if($delete_key_id !== false) {
+		$delete_key_id = (int)$delete_key_id;
+		foreach($active_user_keys as $public_key) {
+			if((int)$public_key->id === $delete_key_id) {
+				$user->delete_public_key($public_key);
+				break;
+			}
+		}
+	}
+
+	redirect('#details');
 } elseif(isset($_POST['edit_user']) && $active_user && $active_user->admin) {
 	$user->force_disable = $_POST['force_disable'];
 	$user->get_details_from_ldap();
@@ -59,8 +75,8 @@
 	$content->set('user_admined_servers', $admined_servers);
 	$content->set('user_admined_groups', $admined_groups);
 	$content->set('user_groups', $groups);
-	$content->set('active_user_keys', $user->list_public_keys(null, null, false));
-    $content->set('admin', ($active_user && $active_user->admin));
+	$content->set('active_user_keys', $active_user_keys);
+	$content->set('admin', ($active_user && $active_user->admin));
 }
 
 $page = new PageSection('base');

views/user_pubkeys.php

@@ -47,6 +47,10 @@
 		} else {
 			$content->set('message', "The public key you submitted doesn't look valid.");
 		}
+	} catch(BadMethodCallException $e) {
+		global $config;
+		$content = new PageSection('key_upload_fail');
+		$content->set('message', "Unable to add public key: " . $e->getMessage());
 	}
 }