Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow custom URI schemas to work #173

Merged
merged 6 commits into from
Mar 3, 2025
Merged

Allow custom URI schemas to work #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4c9bc14
add special handling to let authorize call work when logging in, with…
ylebre Feb 21, 2025
891b83a
remove closing tag
ylebre Feb 26, 2025
746d92f
remove console log. let the customscheme marker come from the redirect
ylebre Feb 26, 2025
446893c
remove error_log
ylebre Feb 26, 2025
2f214fc
allow http scheme to not go past customscheme (helps the test suite)
ylebre Mar 3, 2025
4c7b29d
use request scheme from the server params to allow http and https
ylebre Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions solid/appinfo/routes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
['name' => 'page#handleRevoke', 'url' => '/revoke/{clientId}', 'verb' => 'GET'],
['name' => 'page#handleApproval', 'url' => '/sharing/{clientId}', 'verb' => 'POST'],
['name' => 'page#dataJson', 'url' => '/@{userId}/data.json', 'verb' => 'GET' ],
['name' => 'page#customscheme', 'url' => '/customscheme', 'verb' => 'GET'],

['name' => 'server#cors', 'url' => '/{path}', 'verb' => 'OPTIONS', 'requirements' => array('path' => '.+') ],
['name' => 'server#authorize', 'url' => '/authorize', 'verb' => 'GET'],
Expand Down
2 changes: 2 additions & 0 deletions solid/js/customscheme.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
let newUrl = document.location.href.replace("customscheme", "authorize");
document.location.href = newUrl;
12 changes: 8 additions & 4 deletions solid/lib/Controller/CalendarController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public function __construct(

private function getFileSystem($userId) {
// Make sure the root folder has an acl file, as is required by the spec;
// Generate a default file granting the owner full access.
// Generate a default file granting the owner full access.
$defaultAcl = $this->generateDefaultAcl($userId);

// Create the Nextcloud Calendar Adapter
Expand All @@ -61,7 +61,11 @@ private function getFileSystem($userId) {
// Create Formats objects
$formats = new \Pdsinterop\Rdf\Formats();

$serverUri = "https://" . $this->rawRequest->getServerParams()["SERVER_NAME"] . $this->rawRequest->getServerParams()["REQUEST_URI"]; // FIXME: doublecheck that this is the correct url;
$serverParams = $this->rawRequest->getServerParams();
$scheme = $serverParams['REQUEST_SCHEME'];
$domain = $serverParams['SERVER_NAME'];
$path = $serverParams['REQUEST_URI'];
$serverUri = "{$scheme}://{$domain}{$path}"; // FIXME: doublecheck that this is the correct url;

// Create the RDF Adapter
$rdfAdapter = new \Pdsinterop\Rdf\Flysystem\Adapter\Rdf(
Expand Down Expand Up @@ -122,8 +126,8 @@ private function getCalendarUrl($userId) {
* @NoCSRFRequired
*/
public function handleRequest($userId, $path) {
$this->calendarUserId = $userId;
$this->calendarUserId = $userId;

$this->rawRequest = \Laminas\Diactoros\ServerRequestFactory::fromGlobals($_SERVER, $_GET, $_POST, $_COOKIE, $_FILES);
$this->response = new \Laminas\Diactoros\Response();

Expand Down
12 changes: 8 additions & 4 deletions solid/lib/Controller/ContactsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public function __construct(

private function getFileSystem($userId) {
// Make sure the root folder has an acl file, as is required by the spec;
// Generate a default file granting the owner full access.
// Generate a default file granting the owner full access.
$defaultAcl = $this->generateDefaultAcl($userId);

// Create the Nextcloud Contacts Adapter
Expand All @@ -62,7 +62,11 @@ private function getFileSystem($userId) {
// Create Formats objects
$formats = new \Pdsinterop\Rdf\Formats();

$serverUri = "https://" . $this->rawRequest->getServerParams()["SERVER_NAME"] . $this->rawRequest->getServerParams()["REQUEST_URI"]; // FIXME: doublecheck that this is the correct url;
$serverParams = $this->rawRequest->getServerParams();
$scheme = $serverParams['REQUEST_SCHEME'];
$domain = $serverParams['SERVER_NAME'];
$path = $serverParams['REQUEST_URI'];
$serverUri = "{$scheme}://{$domain}{$path}"; // FIXME: doublecheck that this is the correct url;

// Create the RDF Adapter
$rdfAdapter = new \Pdsinterop\Rdf\Flysystem\Adapter\Rdf(
Expand Down Expand Up @@ -123,8 +127,8 @@ private function getContactsUrl($userId) {
* @NoCSRFRequired
*/
public function handleRequest($userId, $path) {
$this->contactsUserId = $userId;
$this->contactsUserId = $userId;

$this->rawRequest = \Laminas\Diactoros\ServerRequestFactory::fromGlobals($_SERVER, $_GET, $_POST, $_COOKIE, $_FILES);
$this->response = new \Laminas\Diactoros\Response();

Expand Down
15 changes: 13 additions & 2 deletions solid/lib/Controller/PageController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,18 +95,29 @@ public function approval($clientId) {
"returnUrl" => $_GET['returnUrl'],
);
$templateResponse = new TemplateResponse('solid', 'sharing', $params);

$policy = new ContentSecurityPolicy();
$policy->addAllowedStyleDomain("data:");

$parsedOrigin = parse_url($clientRegistration['redirect_uris'][0]);
$origin = $parsedOrigin['scheme'] . "://" . $parsedOrigin['host'];
$origin = $parsedOrigin['host'];
if ($origin) {
$policy->addAllowedFormActionDomain($origin);
$policy->addAllowedFormActionDomain($parsedOrigin['scheme'] . "://" . $origin);
$templateResponse->setContentSecurityPolicy($policy);
}
return $templateResponse;
}

/**
* @PublicPage
* @NoAdminRequired
* @NoCSRFRequired
*/
public function customscheme() {
$templateResponse = new TemplateResponse('solid', 'customscheme');
return $templateResponse;
}

/**
* @PublicPage
* @NoAdminRequired
Expand Down
12 changes: 8 additions & 4 deletions solid/lib/Controller/ProfileController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public function __construct(

private function getFileSystem($userId) {
// Make sure the root folder has an acl file, as is required by the spec;
// Generate a default file granting the owner full access.
// Generate a default file granting the owner full access.
$defaultAcl = $this->generateDefaultAcl($userId);
$profile = $this->generateTurtleProfile($userId);

Expand All @@ -65,7 +65,11 @@ private function getFileSystem($userId) {
// Create Formats objects
$formats = new \Pdsinterop\Rdf\Formats();

$serverUri = "https://" . $this->rawRequest->getServerParams()["SERVER_NAME"] . $this->rawRequest->getServerParams()["REQUEST_URI"]; // FIXME: doublecheck that this is the correct url;
$serverParams = $this->rawRequest->getServerParams();
$scheme = $serverParams['REQUEST_SCHEME'];
$domain = $serverParams['SERVER_NAME'];
$path = $serverParams['REQUEST_URI'];
$serverUri = "{$scheme}://{$domain}{$path}"; // FIXME: doublecheck that this is the correct url;

// Create the RDF Adapter
$rdfAdapter = new \Pdsinterop\Rdf\Flysystem\Adapter\Rdf(
Expand Down Expand Up @@ -139,8 +143,8 @@ private function getStorageUrl($userId) {
* @NoCSRFRequired
*/
public function handleRequest($userId, $path) {
$this->userId = $userId;
$this->userId = $userId;

$this->rawRequest = \Laminas\Diactoros\ServerRequestFactory::fromGlobals($_SERVER, $_GET, $_POST, $_COOKIE, $_FILES);
$this->response = new \Laminas\Diactoros\Response();

Expand Down
14 changes: 14 additions & 0 deletions solid/lib/Controller/ServerController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,20 @@ public function authorize() {
return $result; // ->addHeader('Access-Control-Allow-Origin', '*');
}

$parsedOrigin = parse_url($clientRegistration['redirect_uris'][0]);
if (
$parsedOrigin['scheme'] != "https" &&
$parsedOrigin['scheme'] != "http" &&
!isset($_GET['customscheme'])
) {
$result = new JSONResponse('Custom schema');
$result->setStatus(302);
$originalRequest = parse_url($_SERVER['REQUEST_URI']);
$customSchemeUrl = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("solid.page.customscheme")) . ($originalRequest['query'] ? "?" . $originalRequest['query'] . "&customscheme=" . $parsedOrigin['scheme'] : '');
$result->addHeader("Location", $customSchemeUrl);
return $result;
}

$user = new \Pdsinterop\Solid\Auth\Entity\User();
$user->setIdentifier($this->getProfilePage());

Expand Down
32 changes: 18 additions & 14 deletions solid/lib/Controller/StorageController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,11 @@ private function getFileSystem() {
// Create Formats objects
$formats = new \Pdsinterop\Rdf\Formats();

$serverUri = "https://" . $this->rawRequest->getServerParams()["SERVER_NAME"] . $this->rawRequest->getServerParams()["REQUEST_URI"]; // FIXME: doublecheck that this is the correct url;
$serverParams = $this->rawRequest->getServerParams();
$scheme = $serverParams['REQUEST_SCHEME'];
$domain = $serverParams['SERVER_NAME'];
$path = $serverParams['REQUEST_URI'];
$serverUri = "{$scheme}://{$domain}{$path}"; // FIXME: doublecheck that this is the correct url;

// Create the RDF Adapter
$rdfAdapter = new \Pdsinterop\Rdf\Flysystem\Adapter\Rdf(
Expand Down Expand Up @@ -431,19 +435,19 @@ private function respond($response) {
// $result->addHeader('Access-Control-Allow-Headers', 'Content-Type, Authorization');
// $result->addHeader('Access-Control-Allow-Origin', $origin);

$policy = new EmptyContentSecurityPolicy();
$policy->addAllowedStyleDomain("*");
$policy->addAllowedStyleDomain("data:");
$policy->addAllowedScriptDomain("*");
$policy->addAllowedImageDomain("*");
$policy->addAllowedFontDomain("*");
$policy->addAllowedConnectDomain("*");
$policy->allowInlineStyle(true);
// $policy->allowInlineScript(true); - removed, this function no longer exists in NC28
$policy->allowEvalScript(true);
$result->setContentSecurityPolicy($policy);
$result->setStatus($statusCode);
$policy = new EmptyContentSecurityPolicy();
$policy->addAllowedStyleDomain("*");
$policy->addAllowedStyleDomain("data:");
$policy->addAllowedScriptDomain("*");
$policy->addAllowedImageDomain("*");
$policy->addAllowedFontDomain("*");
$policy->addAllowedConnectDomain("*");
$policy->allowInlineStyle(true);
// $policy->allowInlineScript(true); - removed, this function no longer exists in NC28
$policy->allowEvalScript(true);
$result->setContentSecurityPolicy($policy);

$result->setStatus($statusCode);
return $result;
}
}
2 changes: 2 additions & 0 deletions solid/templates/customscheme.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?php
script('solid', 'customscheme');
Loading