Merge pull request #169 from pdsinterop/feature/blocking

Feature: allow blocking clients from the admin panel

Author: ylebre

solid/css/settings-admin.css

@@ -3,9 +3,6 @@
 	vertical-align: top;
 	display: block;
 }
-#solid-admin input {
-	width: 500px;
-}
 #solid-admin textarea {
 	width: 500px;
 	height: 240px;

solid/js/settings-admin.js

@@ -1,11 +1,22 @@
 $(document).ready(function() {
-
 	$('#solid-private-key').change(function(el) {
-		OCP.AppConfig.setValue('solid','privateKey',this.value);
+		OCP.AppConfig.setValue('solid', 'privateKey', this.value);
 	});
 
 	$('#solid-encryption-key').change(function(el) {
-		OCP.AppConfig.setValue('solid','encryptionKey',this.value);
+		OCP.AppConfig.setValue('solid', 'encryptionKey', this.value);
+	});
+	
+	$('.solid-client-block').change(function(el) {
+		let blocked = this.checked ? true : false;
+		let keyName = 'client-' + this.getAttribute("data-client");
+		let clientConfig = OCP.AppConfig.getValue('solid', keyName, "{}", {
+			"success" : function(xmlData) {
+				let clientJson = xmlData.querySelector('data > data').textContent;
+				let clientConfig = JSON.parse(clientJson);
+				clientConfig.blocked = blocked;
+				OCP.AppConfig.setValue('solid', keyName, JSON.stringify(clientConfig));
+			}
+		});
 	});
-
 });

solid/lib/BaseServerConfig.php

@@ -90,7 +90,8 @@ public function getClients() {
 					$clientRegistration = json_decode($this->config->getAppValue('solid', $key, '{}'), true);
 					$clients[] = [
 						"clientId" => $matches[1],
-						"clientName" => $clientRegistration['client_name']
+						"clientName" => $clientRegistration['client_name'],
+						"clientBlocked" => $clientRegistration['blocked']
 					];
 				}
 			}
@@ -159,6 +160,9 @@ public function saveClientRegistration($origin, $clientData) {
 					$clientData['redirect_uris'][] = $uri;
 				}
 				$clientData['redirect_uris'] = array_unique($clientData['redirect_uris']);
+				if (isset($existingRegistration['blocked'])) {
+					$clientData['blocked'] = $existingRegistration['blocked'];
+				}
 			}
 
 			$clientData['client_id'] = $originHash;

solid/lib/Controller/ServerController.php

@@ -196,14 +196,21 @@ public function authorize() {
 					$getVars['redirect_uri']
 				)
 			);
-			$clientId = $this->config->saveClientRegistration($origin, $clientData);
-			$clientId = $this->config->saveClientRegistration($getVars['client_id'], $clientData);
+			$clientId = $this->config->saveClientRegistration($origin, $clientData)['client_id'];
+			$clientId = $this->config->saveClientRegistration($getVars['client_id'], $clientData)['client_id'];
 			$returnUrl = $getVars['redirect_uri'];
 		} else {
 			$clientId = $getVars['client_id'];
 			$returnUrl = $_SERVER['REQUEST_URI'];
 		}
 
+		$clientRegistration = $this->config->getClientRegistration($clientId);
+		if (isset($clientRegistration['blocked']) && ($clientRegistration['blocked'] === true)) {
+			$result = new JSONResponse('Unauthorized client');
+			$result->setStatus(403);
+			return $result;
+		}
+
 		$approval = $this->checkApproval($clientId);
 		if (!$approval) {
 			$result = new JSONResponse('Approval required');

solid/templates/admin.php

@@ -1,4 +1,6 @@
 <?php
+	// phpcs:ignoreFile
+	// Let codesniffer ignore this file, as we are heavily mixing php and HTML together.
 	script('solid', 'settings-admin');
 	style('solid', 'settings-admin');
 ?>
@@ -22,13 +24,15 @@
 			<tr>
 				<th>Client ID</th>
 				<th>Client name</th>
+				<th>Block</th>
 			</tr>
 		</thead>
 		<tbody>
 			<?php foreach ($_['clients'] as $client => $registration) { ?>
 				<tr>
 					<td><?php p($registration['clientId']); ?></td>
 					<td><?php p($registration['clientName']); ?></td>
+					<td><input type="checkbox" class="solid-client-block" data-client="<?php p($registration['clientId']); ?>"<?php if ($registration['clientBlocked']) { echo " checked";} ?> value=1></td>
 				</tr>
 			<?php } ?>
 		</tbody>