Skip to content

Fix unset registered client #40

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

Closed
ylebre wants to merge 2 commits into from
+184 −163
Closed

Fix unset registered client #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a350b13
add a generic try/catch so we just output 500 error
ylebre Jul 6, 2026
a36cb91
throw when the registered client is false
ylebre Jul 6, 2026
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
18 changes: 10 additions & 8 deletions lib/Server.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,16 @@ public static function getConfigClient()
$clientId = $_GET['client_id'] ?? $_POST['client_id'] ?? null;
if ($clientId) {
$registeredClient = ClientRegistration::getRegistration($clientId);
}
if (isset($registeredClient)) {
return new ConfigClient(
$clientId,
$registeredClient['client_secret'] ?? '',
$registeredClient['redirect_uris'],
$registeredClient['client_name']
);
if (isset($registeredClient) && isset($registeredClient['redirect_uris'])) {
return new ConfigClient(
$clientId,
$registeredClient['client_secret'] ?? '',
$registeredClient['redirect_uris'],
$registeredClient['client_name']
);
} else {
throw new \Exception("Invalid client ID");
}
} else {
return new ConfigClient(
'',
Expand Down
229 changes: 117 additions & 112 deletions www/idp/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,118 +20,123 @@

Middleware::cors();

switch ($method) {
case "GET":
switch ($request) {
case "/jwks":
case "/jwks/":
SolidIdp::respondToJwks();
break;
case "/.well-known/openid-configuration":
SolidIdp::respondToWellKnownOpenIdConfiguration();
break;
case "/authorize":
case "/authorize/":
Account::requireLoggedInUser();
SolidIdp::respondToAuthorize();
break;
case "/dashboard":
case "/dashboard/":
Account::requireLoggedInUser();
Account::respondToDashboard();
break;
case "/logout":
case "/logout/":
Account::respondToLogout();
break;
case "/login/password":
case "/login/password/":
header("Location: /dashboard/");
break;
case "/":
case "/login":
case "/login/":
case "/register":
case "/register/":
case "/reset-password":
case "/reset-password/":
case "/change-password":
case "/change-password/":
case "/account/delete":
case "/account/delete/":
case "/account/delete/confirm":
case "/account/delete/confirm/":
include_once(FRONTENDDIR . "generated.html");
break;
case "/sharing":
case "/sharing/":
Account::requireLoggedInUser();
include_once(FRONTENDDIR . "generated.html");
break;
case '/session':
case '/session/':
case '/userinfo':
case '/userinfo/':
header("HTTP/1.1 501 Not implemented");
break;
default:
header($_SERVER['SERVER_PROTOCOL'] . " 404 Not found");
break;
}
break;
case "POST":
switch ($request) {
case "/api/accounts/verify":
case "/api/accounts/verify/":
Account::respondToAccountVerify();
break;
case "/api/accounts/new":
case "/api/accounts/new/":
Account::respondToAccountNew();
break;
case "/api/accounts/reset-password":
case "/api/accounts/reset-password/":
Account::respondToAccountResetPassword();
break;
case "/api/accounts/change-password":
case "/api/accounts/change-password/":
Account::respondToAccountChangePassword();
break;
case "/api/accounts/delete":
case "/api/accounts/delete/":
Account::respondToAccountDelete();
break;
case "/api/accounts/delete/confirm":
case "/api/accounts/delete/confirm/":
Account::respondToAccountDeleteConfirm();
break;
case "/login/password":
case "/login/password/":
Account::respondToLogin();
break;
case "/register":
case "/register/":
SolidIdp::respondToRegister();
break;
case "/api/sharing":
case "/api/sharing/":
SolidIdp::respondToSharing();
break;
case "/token":
case "/token/":
SolidIdp::respondToToken();
break;
default:
header($_SERVER['SERVER_PROTOCOL'] . " 404 Not found");
break;
}
break;
case "OPTIONS":
break;
case "PUT":
default:
header($_SERVER['SERVER_PROTOCOL'] . " 405 Method not allowed");
break;
try {
switch ($method) {
case "GET":
switch ($request) {
case "/jwks":
case "/jwks/":
SolidIdp::respondToJwks();
break;
case "/.well-known/openid-configuration":
SolidIdp::respondToWellKnownOpenIdConfiguration();
break;
case "/authorize":
case "/authorize/":
Account::requireLoggedInUser();
SolidIdp::respondToAuthorize();
break;
case "/dashboard":
case "/dashboard/":
Account::requireLoggedInUser();
Account::respondToDashboard();
break;
case "/logout":
case "/logout/":
Account::respondToLogout();
break;
case "/login/password":
case "/login/password/":
header("Location: /dashboard/");
break;
case "/":
case "/login":
case "/login/":
case "/register":
case "/register/":
case "/reset-password":
case "/reset-password/":
case "/change-password":
case "/change-password/":
case "/account/delete":
case "/account/delete/":
case "/account/delete/confirm":
case "/account/delete/confirm/":
include_once(FRONTENDDIR . "generated.html");
break;
case "/sharing":
case "/sharing/":
Account::requireLoggedInUser();
include_once(FRONTENDDIR . "generated.html");
break;
case '/session':
case '/session/':
case '/userinfo':
case '/userinfo/':
header("HTTP/1.1 501 Not implemented");
break;
default:
header($_SERVER['SERVER_PROTOCOL'] . " 404 Not found");
break;
}
break;
case "POST":
switch ($request) {
case "/api/accounts/verify":
case "/api/accounts/verify/":
Account::respondToAccountVerify();
break;
case "/api/accounts/new":
case "/api/accounts/new/":
Account::respondToAccountNew();
break;
case "/api/accounts/reset-password":
case "/api/accounts/reset-password/":
Account::respondToAccountResetPassword();
break;
case "/api/accounts/change-password":
case "/api/accounts/change-password/":
Account::respondToAccountChangePassword();
break;
case "/api/accounts/delete":
case "/api/accounts/delete/":
Account::respondToAccountDelete();
break;
case "/api/accounts/delete/confirm":
case "/api/accounts/delete/confirm/":
Account::respondToAccountDeleteConfirm();
break;
case "/login/password":
case "/login/password/":
Account::respondToLogin();
break;
case "/register":
case "/register/":
SolidIdp::respondToRegister();
break;
case "/api/sharing":
case "/api/sharing/":
SolidIdp::respondToSharing();
break;
case "/token":
case "/token/":
SolidIdp::respondToToken();
break;
default:
header($_SERVER['SERVER_PROTOCOL'] . " 404 Not found");
break;
}
break;
case "OPTIONS":
break;
case "PUT":
default:
header($_SERVER['SERVER_PROTOCOL'] . " 405 Method not allowed");
break;
}
} catch (\Throwable $e) {
// Catch all so we don't leak information to the client.
header($_SERVER['SERVER_PROTOCOL'] . " 500 Internal server error");
}
if (!file_exists(CLEANUP_FILE) || (filemtime(CLEANUP_FILE) < time())) {
touch(CLEANUP_FILE, time() + 3600);
Expand Down
56 changes: 30 additions & 26 deletions www/storage/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,30 +14,34 @@
$method = $_SERVER['REQUEST_METHOD'];

Middleware::cors();

switch ($method) {
case "GET":
switch ($request) {
default:
header($_SERVER['SERVER_PROTOCOL'] . " 404 Not found");
break;
}
break;
case "POST":
switch ($request) {
case "/api/storage":
case "/api/storage/":
SolidStorageProvider::respondToStorageNew();
break;
default:
header($_SERVER['SERVER_PROTOCOL'] . " 404 Not found");
break;
}
break;
case "OPTIONS":
break;
case "PUT":
default:
header($_SERVER['SERVER_PROTOCOL'] . " 405 Method not allowed");
break;
try {
switch ($method) {
case "GET":
switch ($request) {
default:
header($_SERVER['SERVER_PROTOCOL'] . " 404 Not found");
break;
}
break;
case "POST":
switch ($request) {
case "/api/storage":
case "/api/storage/":
SolidStorageProvider::respondToStorageNew();
break;
default:
header($_SERVER['SERVER_PROTOCOL'] . " 404 Not found");
break;
}
break;
case "OPTIONS":
break;
case "PUT":
default:
header($_SERVER['SERVER_PROTOCOL'] . " 405 Method not allowed");
break;
}
} catch (\Throwable $e) {
// Catch all so we don't leak information to the client.
header($_SERVER['SERVER_PROTOCOL'] . " 500 Internal server error");
}
23 changes: 14 additions & 9 deletions www/user/profile.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,21 @@

// phpcs:disable Generic.WhiteSpace.ScopeIndent.IncorrectExact

ini_set("log_errors", 1);
ini_set('expose_php', 'off');
ini_set("log_errors", 1);
ini_set('expose_php', 'off');

require_once(__DIR__ . "/../../config.php");
require_once(__DIR__ . "/../../vendor/autoload.php");
require_once(__DIR__ . "/../../config.php");
require_once(__DIR__ . "/../../vendor/autoload.php");

use Pdsinterop\PhpSolid\Middleware;
use Pdsinterop\PhpSolid\Routes\SolidUserProfile;
use Pdsinterop\PhpSolid\Middleware;
use Pdsinterop\PhpSolid\Routes\SolidUserProfile;

$request = explode("?", $_SERVER['REQUEST_URI'], 2)[0];
$method = $_SERVER['REQUEST_METHOD'];
$request = explode("?", $_SERVER['REQUEST_URI'], 2)[0];
$method = $_SERVER['REQUEST_METHOD'];

Middleware::cors();
Middleware::cors();

try {
switch ($method) {
case "GET":
case "PUT":
Expand All @@ -31,3 +32,7 @@
header($_SERVER['SERVER_PROTOCOL'] . " 405 Method not allowed");
break;
}
} catch (\Throwable $e) {
// Catch all so we don't leak information to the client.
header($_SERVER['SERVER_PROTOCOL'] . " 500 Internal server error");
}
21 changes: 13 additions & 8 deletions www/user/storage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,17 @@
Middleware::cors();
Middleware::pubsub();

switch ($method) {
case "OPTIONS":
echo "OK";
return;
break;
default:
SolidStorage::respondToStorage();
break;
try {
switch ($method) {
case "OPTIONS":
echo "OK";
return;
break;
default:
SolidStorage::respondToStorage();
break;
}
} catch (\Throwable $e) {
// Catch all so we don't leak information to the client.
header($_SERVER['SERVER_PROTOCOL'] . " 500 Internal server error");
}
Loading