Merge remote-tracking branch 'origin/master' into add-solid-crud-tests

Author: ylebre

Dockerfile

@@ -19,4 +19,5 @@ ADD . /app
 WORKDIR /app
 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

bin/serve-docker-dev.sh

@@ -4,15 +4,9 @@
 
 docker run                          \
   -i                                \
-  --env 'ENVIRONMENT=development'   \
-  --expose 80                       \
-  --name php-solid-server           \
+  --expose 443                      \
+  --name server                     \
   --network host                    \
   --rm                              \
   --volume "${PWD}:/app"            \
-  "php:${PHP_VERSION:-7.1}-alpine"  \
-  php                               \
-    --define 'log_errors=On'        \
-    --docroot /app/web/             \
-    --server '0.0.0.0:80'           \
-    /app/web/index.php
+  "${DOCKER_IMAGE:=php-solid-server}"

composer.json

@@ -45,5 +45,10 @@
         "serve-dev-docker":"bash ./bin/serve-docker-dev.sh",
         "test":"phpunit"
     },
+    "scripts-descriptions": {
+      "serve-dev": "Run the application with the internal PHP development server",
+      "serve-dev-docker": "Run the application with the docker image provided by the TestSuite repo.",
+      "test": "Run unit-test with PHPUnit"
+    },
     "type": "project"
 }

run-solid-test-suite.sh

@@ -6,12 +6,14 @@ docker network create testnet
 
 # Build and start Nextcloud server with code from current repo contents:
 docker build -t server .
-docker run -d --name server --network=testnet 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 -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
+
 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 ...

src/Controller/AuthorizeController.php

@@ -14,7 +14,8 @@ final public function __invoke(ServerRequestInterface $request, array $args): Re
 			$response = $response->withStatus(302, "Approval required");
 
 			// FIXME: Generate a proper url for this;
-			$loginUrl = "https://localhost/login/?returnUrl=" . urlencode($_SERVER['REQUEST_URI']);
+			$baseUrl = $this->baseUrl;
+			$loginUrl = $baseUrl . "/login/?returnUrl=" . urlencode($_SERVER['REQUEST_URI']);
 			$response = $response->withHeader("Location", $loginUrl);
 			return $response;
 		}
@@ -50,7 +51,8 @@ final public function __invoke(ServerRequestInterface $request, array $args): Re
 			$response = $response->withStatus(302, "Approval required");
 
 			// FIXME: Generate a proper url for this;
-			$approvalUrl = "https://localhost/sharing/$clientId/?returnUrl=" . urlencode($_SERVER['REQUEST_URI']);
+			$baseUrl = $this->baseUrl;
+			$approvalUrl = $baseUrl . "/sharing/$clientId/?returnUrl=" . urlencode($_SERVER['REQUEST_URI']);
 			$response = $response->withHeader("Location", $approvalUrl);
 			return $response;
 		}

src/Controller/LoginController.php

@@ -22,8 +22,8 @@ final public function __invoke(ServerRequestInterface $request, array $args): Re
 		  }
           $response->getBody()->write("<h1>Already logged in as $user</h1>");
         } else if (
-			($postBody['username'] == $_ENV['USER'] && $postBody['password'] == $_ENV['PASSWORD']) ||
-			($postBody['username'] == $_SERVER['USER'] && $postBody['password'] == $_SERVER['PASSWORD'])
+			($postBody['username'] == $_ENV['USERNAME'] && $postBody['password'] == $_ENV['PASSWORD']) ||
+			($postBody['username'] == $_SERVER['USERNAME'] && $postBody['password'] == $_SERVER['PASSWORD'])
 		) {
           $user = $postBody['username'];
           $_SESSION['userid'] =  $user;

src/Controller/RegisterController.php

@@ -20,10 +20,14 @@ final public function __invoke(ServerRequestInterface $request, array $args): Re
 		$origin = $parsedOrigin['host'];
 
 		$clientId = $this->config->saveClientRegistration($origin, $clientData);
-		
+
+		// FIXME: properly generate this url;
+		$baseUrl = $this->baseUrl;
+		$clientUrl = $baseUrl . "/clients/$clientId";
+
 		$registration = array(
 			'client_id' => $clientId,
-			'registration_client_uri' => "https://localhost/clients/$clientId", // FIXME: properly generate this url;
+			'registration_client_uri' => $clientUrl,
 			'client_id_issued_at' => $clientData['client_id_issued_at'],
 			'redirect_uris' => $clientData['redirect_uris'],
 		);

src/Controller/ResourceController.php

@@ -0,0 +1,27 @@
+<?php declare(strict_types=1);
+
+namespace Pdsinterop\Solid\Controller;
+
+use Pdsinterop\Solid\Resources\Server;
+use Psr\Http\Message\ResponseInterface as Response;
+use Psr\Http\Message\ServerRequestInterface as Request;
+
+class ResourceController extends AbstractController
+{
+    ////////////////////////////// CLASS PROPERTIES \\\\\\\\\\\\\\\\\\\\\\\\\\\\
+
+    /** @var Server */
+    private $server;
+
+    //////////////////////////////// PUBLIC API \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
+
+    final public function __construct(Server $server)
+    {
+        $this->server = $server;
+    }
+
+    final public function __invoke(Request $request, array $args) : Response
+    {
+        return $this->server->respondToRequest($request);
+    }
+}

src/Controller/ServerController.php

@@ -20,22 +20,21 @@ public function __construct() {
 		$this->authServerConfig = $this->createAuthServerConfig(); 
 		$this->authServerFactory = (new \Pdsinterop\Solid\Auth\Factory\AuthorizationServerFactory($this->authServerConfig))->create();		
 		$this->tokenGenerator = (new \Pdsinterop\Solid\Auth\TokenGenerator($this->authServerConfig));
-		
-//		$this->baseUrl = "https://localhost";
+		$this->baseUrl = isset($_ENV['SERVER_ROOT']) ? $_ENV['SERVER_ROOT'] : "https://localhost";
     }
 
 	public function getOpenIdEndpoints() {
 		// FIXME: would be better to base this on the available routes if possible.
-		$this->baseUrl = "https://localhost/"; // FIXME: generate proper urls
+		$this->baseUrl = isset($_ENV['SERVER_ROOT']) ? $_ENV['SERVER_ROOT'] : "https://localhost";
 		return [
 			'issuer' => $this->baseUrl,
-			'authorization_endpoint' => $this->baseUrl . "authorize",
-			'jwks_uri' => $this->baseUrl . "jwks",
-			"check_session_iframe" => $this->baseUrl . "session",
-			"end_session_endpoint" => $this->baseUrl . "logout",
-			"token_endpoint" => $this->baseUrl . "token",
-			"userinfo_endpoint" => $this->baseUrl . "userinfo",
-			"registration_endpoint" => $this->baseUrl . "register"
+			'authorization_endpoint' => $this->baseUrl . "/authorize",
+			'jwks_uri' => $this->baseUrl . "/jwks",
+			"check_session_iframe" => $this->baseUrl . "/session",
+			"end_session_endpoint" => $this->baseUrl . "/logout",
+			"token_endpoint" => $this->baseUrl . "/token",
+			"userinfo_endpoint" => $this->baseUrl . "/userinfo",
+			"registration_endpoint" => $this->baseUrl . "/register",
 		];
 	}
 
@@ -114,7 +113,7 @@ public function checkApproval($clientId) {
 	}
 
 	public function getProfilePage() {
-		return $this->baseUrl . "profile/card#me"; // FIXME: would be better to base this on the available routes if possible.
+		return $this->baseUrl . "/profile/card#me"; // FIXME: would be better to base this on the available routes if possible.
 	}
 
 	public function getResponseType() {

web/index.php

@@ -17,8 +17,8 @@
 use League\Route\Router;
 use League\Route\Strategy\ApplicationStrategy;
 use Pdsinterop\Solid\Controller\AddSlashToPathController;
-use Pdsinterop\Solid\Controller\AuthorizeController;
 use Pdsinterop\Solid\Controller\ApprovalController;
+use Pdsinterop\Solid\Controller\AuthorizeController;
 use Pdsinterop\Solid\Controller\CorsController;
 use Pdsinterop\Solid\Controller\HandleApprovalController;
 use Pdsinterop\Solid\Controller\HelloWorldController;
@@ -30,9 +30,10 @@
 use Pdsinterop\Solid\Controller\Profile\CardController;
 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;
+use Pdsinterop\Solid\Resources\Server as ResourceServer;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -81,6 +82,16 @@
     return $template;
 });
 
+$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,
@@ -191,6 +202,53 @@
 
 		$response = new HtmlResponse($html, 500, []);
 	}
+/*
+$router->group('/data', static function (\League\Route\RouteGroup $group) {
+    $methods = [
+        'DELETE',
+        'GET',
+        'HEAD',
+        // 'OPTIONS', // @TODO: This breaks because of the CorsController being added to `OPTION /*` in the index.php
+        'PATCH',
+        'POST',
+        'PUT',
+    ];
+
+    array_walk($methods, static function ($method) use (&$group) {
+        $group->map($method, '/', AddSlashToPathController::class);
+        $group->map($method, '{path:.*}', ResourceController::class);
+    });
+})->setScheme($scheme);
+
+try {
+    $response = $router->dispatch($request);
+} catch (HttpException $exception) {
+    $status = $exception->getStatusCode();
+
+    $message = 'Yeah, that\'s an error.';
+    if ($exception instanceof  NotFoundException) {
+        $message = 'No such page.';
+    }
+
+    $html = "<h1>{$message}</h1><p>{$exception->getMessage()} ({$status})</p>";
+
+    if (getenv('ENVIRONMENT') === 'development') {
+        $html .= "<pre>{$exception->getTraceAsString()}</pre>";
+    }
+
+    $response = new HtmlResponse($html, $status, $exception->getHeaders());
+} catch (\Exception $exception) {
+    $html = "<h1>Oh-no! The developers messed up!</h1><p>{$exception->getMessage()}</p>";
+
+    if (getenv('ENVIRONMENT') === 'development') {
+        $html .=
+            "<p>{$exception->getFile()}:{$exception->getLine()}</p>" .
+            "<pre>{$exception->getTraceAsString()}</pre>"
+        ;
+    }
+
+    $response = new HtmlResponse($html, 500, []);
+*/
 }
 
 // send the response to the browser