Merge branch 'main' into fix/CLN-001

Author: ylebre

README.md

@@ -23,6 +23,21 @@ Please follow the [install instructions](https://github.com/pdsinterop/solid-nex
 
 <!-- @TODO: ## Usage --> 
 
+## Acknowledgements
+
+There is [a list of all contributors on GitHub][contributors-page].
+
+<p>
+  This project was funded through the <a href="https://nlnet.nl/core">NGI0 Core</a> and <a href="https://nlnet.nl/discovery">NGI0 Discovery</a> Funds, established by <a href="https://nlnet.nl">NLnet</a> with financial support from the European Commission's <a href="https://ngi.eu">Next Generation Internet</a> programme. 
+  Learn more at the NLnet project pages: <a href="https://nlnet.nl/project/Solid-NextCloud/">Solid-NextCloud</a> and <a href="https://nlnet.nl/project/Solid-NC/">Solid NC 2024</a>
+</p>
+<p>
+  <a href="https://nlnet.nl"><img height="64" alt="NLNet logo" src="https://nlnet.nl/logo/banner.svg"></a>
+  <a href="https://nlnet.nl/core"><img height="64" alt="NGI0 Core logo" src="https://nlnet.nl/image/logos/NGI0Core_tag.svg"></a>
+  <a href="https://nlnet.nl/discovery"><img height="64" alt="NGI Zero Discovery logo" src="https://nlnet.nl/image/logos/NGI0Discovery_tag.svg"></a>
+  <a href="https://ec.europa.eu/"><img height="64" alt="European Commision logo" src="https://nlnet.nl/image/logos/EC.svg"></a>
+</p>
+
 ## Contributing
 
 Questions or feedback can be given by [opening an issue on GitHub][issues-link].
@@ -34,8 +49,6 @@ For more details read the [contribution guidelines][contributing-link].
 All PDS Interop projects adhere to [the Code Manifesto](http://codemanifesto.com)
 as its [code-of-conduct][code-of-conduct]. Contributors are expected to abide by its terms.
 
-There is [a list of all contributors on GitHub][contributors-page].
-
 For a list of changes see the [CHANGELOG][changelog] or [the GitHub releases page][releases-page].
 
 ### Development

init.sh

@@ -6,4 +6,6 @@ php console.php app:enable solid
 php console.php config:system:set trusted_domains 1 --value=server
 php console.php config:system:set trusted_domains 2 --value=nextcloud.local
 php console.php config:system:set trusted_domains 3 --value=thirdparty
+# set 'tester' and 'https://tester' as allowed clients for the test suite to run
+php console.php user:setting alice solid allowedClients '["f5d1278e8109edd94e1e4197e04873b9", "2e5cddcf0f663544e98982931e6cc5a6"]'
 echo configured

solid/lib/Controller/ServerController.php

@@ -255,12 +255,6 @@ public function authorize() {
 
 	private function checkApproval($clientId) {
 		$allowedClients = $this->config->getAllowedClients($this->userId);
-		if ($clientId == md5("tester")) { // FIXME: Double check that this is not a security issue; It is only here to help the test suite;
-			return \Pdsinterop\Solid\Auth\Enum\Authorization::APPROVED;
-		}
-		if ($clientId == md5("https://tester")) { // FIXME: Double check that this is not a security issue; It is only here to help the test suite;
-			return \Pdsinterop\Solid\Auth\Enum\Authorization::APPROVED;
-		}
 		if (in_array($clientId, $allowedClients)) {
 			return \Pdsinterop\Solid\Auth\Enum\Authorization::APPROVED;
 		} else {