Add solid-crud tests

Dockerfile

@@ -21,3 +21,4 @@ RUN php /install/composer.phar install --no-dev --prefer-dist
 COPY site.conf /etc/apache2/sites-enabled/site.conf
 RUN chown www-data /app/config
 EXPOSE 443
+RUN chown www-data:www-data config

run-solid-test-suite.sh

@@ -5,28 +5,37 @@ set -e
 docker network create testnet
 
 # Build and start Nextcloud server with code from current repo contents:
-docker build -t server .
+docker build -t standalone-solid-server .
 
 docker build -t webid-provider https://github.com/pdsinterop/test-suites.git#master:/testers/webid-provider
+#docker build -t solid-crud https://github.com/pdsinterop/test-suites.git#master:/testers/solid-crud
+docker build --no-cache -t solid-crud https://github.com/pdsinterop/test-suites.git#master:/testers/solid-crud
 docker build -t cookie         https://github.com/pdsinterop/test-suites.git#master:servers/php-solid-server/cookie
-wget -O /tmp/env-vars-for-test-image.list https://raw.githubusercontent.com/pdsinterop/test-suites/master/servers/php-solid-server/env.list
-docker run -d --name server --network=testnet --env-file /tmp/env-vars-for-test-image.list server
+docker build -t pubsub-server  https://github.com/pdsinterop/php-solid-pubsub-server.git#master
+
+# wget -O /tmp/env-vars-for-test-image.list https://raw.githubusercontent.com/pdsinterop/test-suites/master/servers/php-solid-server/env.list
+curl https://raw.githubusercontent.com/pdsinterop/test-suites/master/servers/php-solid-server/env.list -o /tmp/env-vars-for-test-image.list
+
+docker run -d --name server --network=testnet --env-file /tmp/env-vars-for-test-image.list standalone-solid-server
+
+docker run -d --name pubsub --network=testnet pubsub-server
 
 until docker run --rm --network=testnet webid-provider curl -kI https://server 2> /dev/null > /dev/null
 do
   echo Waiting for server to start, this can take up to a minute ...
   docker ps -a
-  docker logs server || true
+  docker logs standalone-solid-server || true
   sleep 1
 done
 docker ps -a
-docker logs server
+docker logs standalone-solid-server
 
 echo Getting cookie...
 export COOKIE="`docker run --cap-add=SYS_ADMIN --network=testnet --env-file /tmp/env-vars-for-test-image.list cookie`"
 echo "Running webid-provider tests with cookie $COOKIE"
-docker run --rm --network=testnet --env COOKIE="$COOKIE" --env-file /tmp/env-vars-for-test-image.list webid-provider
+# docker run --rm --network=testnet --env COOKIE="$COOKIE" --env-file /tmp/env-vars-for-test-image.list webid-provider
+docker run --rm --network=testnet --env-file /tmp/env-vars-for-test-image.list solid-crud
 # rm /tmp/env-vars-for-test-image.list
-# docker stop server
-# docker rm server
+# docker stop standalone-solid-server
+# docker rm standalone-solid-server
 # docker network remove testnet

src/Controller/StorageController.php

@@ -0,0 +1,32 @@
+<?php declare(strict_types=1);
+
+namespace Pdsinterop\Solid\Controller;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+
+class StorageController extends ServerController
+{    
+    final public function __invoke(ServerRequestInterface $request, array $args): ResponseInterface
+    {	
+$body = <<< EOF
+@prefix : <#>.
+@prefix inbox: <>.
+@prefix ldp: <http://www.w3.org/ns/ldp#>.
+@prefix terms: <http://purl.org/dc/terms/>.
+@prefix XML: <http://www.w3.org/2001/XMLSchema#>.
+@prefix st: <http://www.w3.org/ns/posix/stat#>.
+
+inbox:
+    a ldp:BasicContainer, ldp:Container, ldp:Resource;
+    terms:modified "2019-12-20T14:52:54Z"^^XML:dateTime;
+    st:mtime 1576853574.389;
+    st:size 4096.
+EOF;
+		$response = $this->getResponse();
+
+		$response->getBody()->write($body);
+		return $response
+			->withHeader("Content-type", "text/turtle");
+    }
+}

tests/fixtures/foaf.rdf

@@ -9,8 +9,8 @@
 >
     <foaf:Person rdf:ID="me">
         <ldp:inbox rdf:resource="/inbox/"/>
-        <solid:account rdf:resource="/"/>
-        <space:storage rdf:resource="/"/>
+        <solid:account rdf:resource="/account/"/>
+        <space:storage rdf:resource="/storage/"/>
         <solid:privateTypeIndex rdf:resource="/settings/privateTypeIndex.ttl"/>
         <solid:publicTypeIndex rdf:resource="/settings/publicTypeIndex.ttl"/>
         <space:preferencesFile rdf:resource="/settings/preferencesFile.ttl"/>

web/index.php

@@ -16,7 +16,6 @@
 use League\Route\Http\Exception\NotFoundException;
 use League\Route\Router;
 use League\Route\Strategy\ApplicationStrategy;
-
 use Pdsinterop\Solid\Controller\AddSlashToPathController;
 use Pdsinterop\Solid\Controller\ApprovalController;
 use Pdsinterop\Solid\Controller\AuthorizeController;
@@ -32,6 +31,7 @@
 use Pdsinterop\Solid\Controller\Profile\ProfileController;
 use Pdsinterop\Solid\Controller\RegisterController;
 use Pdsinterop\Solid\Controller\ResourceController;
+use Pdsinterop\Solid\Controller\StorageController;
 use Pdsinterop\Solid\Controller\TokenController;
 use Pdsinterop\Solid\Resources\Server as ResourceServer;
 
@@ -55,21 +55,40 @@
 $container->add(ServerRequestInterface::class, Request::class);
 $container->add(ResponseInterface::class, Response::class);
 
+/*
 $adapter = new \League\Flysystem\Adapter\Local(__DIR__ . '/../tests/fixtures');
 $filesystem = new \League\Flysystem\Filesystem($adapter);
 $graph = new \EasyRdf_Graph();
 $plugin = new \Pdsinterop\Rdf\Flysystem\Plugin\ReadRdf($graph);
 $filesystem->addPlugin($plugin);
+*/
 
-$container->share(FilesystemInterface::class, function () {
+$container->share(FilesystemInterface::class, function () use ($request) {
     // @FIXME: Filesystem root and the $adapter should be configurable.
     //         Implement this with `$filesystem = \MJRider\FlysystemFactory\create(getenv('STORAGE_ENDPOINT'));`
     $filesystemRoot = __DIR__ . '/../tests/fixtures';
 
     $adapter = new \League\Flysystem\Adapter\Local($filesystemRoot);
 
-    $filesystem = new \League\Flysystem\Filesystem($adapter);
     $graph = new \EasyRdf_Graph();
+
+	// Create Formats objects
+	$formats = new \Pdsinterop\Rdf\Formats();
+
+	$serverUri = "https://server" . $request->getServerParams()["REQUEST_URI"]; // FIXME: doublecheck that this is the correct url;
+
+	// Create the RDF Adapter
+	$rdfAdapter = new \Pdsinterop\Rdf\Flysystem\Adapter\Rdf(
+		$adapter,
+		$graph,
+		$formats,
+		$serverUri
+	);
+
+    $filesystem = new \League\Flysystem\Filesystem($rdfAdapter);
+
+	$filesystem->addPlugin(new \Pdsinterop\Rdf\Flysystem\Plugin\AsMime($formats));
+
     $plugin = new \Pdsinterop\Rdf\Flysystem\Plugin\ReadRdf($graph);
     $filesystem->addPlugin($plugin);
 
@@ -85,20 +104,18 @@
 $container->add(ResourceController::class, function () use ($container) {
     $filesystem = $container-> get(FilesystemInterface::class);
 
-    require_once __DIR__ . '/../lib/solid-crud/src/Server.php';
-
     $server = new ResourceServer($filesystem, new Response());
 
     return new ResourceController($server);
 });
 
 $controllers = [
     AddSlashToPathController::class,
-	ApprovalController::class,
+    ApprovalController::class,
     AuthorizeController::class,
     CardController::class,
     CorsController::class,
-	HandleApprovalController::class,
+    HandleApprovalController::class,
     HelloWorldController::class,
     HttpToHttpsController::class,
     JwksController::class,
@@ -107,7 +124,8 @@
     OpenidController::class,
     ProfileController::class,
     RegisterController::class,
-	TokenController::class,
+	StorageController::class,
+    TokenController::class,
 ];
 
 $traits = [
@@ -160,8 +178,7 @@
 $router->map('POST', '/sharing/{clientId}/', HandleApprovalController::class)->setScheme($scheme);
 $router->map('POST', '/token', TokenController::class)->setScheme($scheme);
 $router->map('POST', '/token/', TokenController::class)->setScheme($scheme);
-
-$router->group('/data', static function (\League\Route\RouteGroup $group) {
+$router->group('/storage', static function (\League\Route\RouteGroup $group) {
     $methods = [
         'DELETE',
         'GET',
@@ -174,6 +191,7 @@
 
     array_walk($methods, static function ($method) use (&$group) {
         $group->map($method, '/', AddSlashToPathController::class);
+//        $group->map($method, '//', StorageController::class);
         $group->map($method, '{path:.*}', ResourceController::class);
     });
 })->setScheme($scheme);