Skip to content

No more me #14

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

No more me #14

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8333eeb
Default to first configured endpoint at all times
Zegnat Nov 29, 2020
47f0cd5
support all the trusted endpoints, not just one
carrvo Nov 29, 2024
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
108 changes: 27 additions & 81 deletions endpoint.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,68 +105,17 @@ function revokeToken(string $token): void
}
}

function isTrustedEndpoint(string $endpoint): bool
function getTrustedEndpoints(): array
{
$pdo = connectToDatabase();
$statement = $pdo->prepare('SELECT COUNT(*) FROM settings WHERE setting_name = ? AND setting_value = ?');
$statement->execute(['endpoint', $endpoint]);
return $statement->fetchColumn() > 0;
}

function discoverAuthorizationEndpoint(string $url): ?string
{
$curl = initCurl($url);
$headers = [];
$last = '';
curl_setopt($curl, CURLOPT_HEADERFUNCTION, function ($curl, $header) use (&$headers, &$last): int {
$url = curl_getinfo($curl, CURLINFO_EFFECTIVE_URL);
if ($url !== $last) {
$headers = [];
}
$len = strlen($header);
$header = explode(':', $header, 2);
if (count($header) === 2) {
$name = strtolower(trim($header[0]));
if (!array_key_exists($name, $headers)) {
$headers[$name] = [trim($header[1])];
} else {
$headers[$name][] = trim($header[1]);
}
}
$last = $url;
return $len;
});
$body = curl_exec($curl);
if (curl_getinfo($curl, CURLINFO_HTTP_CODE) !== 200 || curl_errno($curl) !== 0) {
return null;
}
curl_close($curl);
$endpoint = null;
if (array_key_exists('link', $headers)) {
foreach ($headers['link'] as $link) {
$found = preg_match('@^\s*<([^>]*)>\s*;(.*?;)?\srel="([^"]*?\s+)?authorization_endpoint(\s+[^"]*?)?"@', $link, $match);
if ($found === 1) {
$endpoint = $match[1];
break;
}
}
}
if ($endpoint === null) {
libxml_use_internal_errors(true);
$dom = new DOMDocument();
$dom->loadHTML(mb_convert_encoding($body, 'HTML-ENTITIES', 'UTF-8'));
$xpath = new DOMXPath($dom);
$nodes = $xpath->query('//*[contains(concat(" ", normalize-space(@rel), " "), " authorization_endpoint ") and @href][1]/@href');
if ($nodes->length === 0) {
return null;
}
$endpoint = $nodes->item(0)->value;
$bases = $xpath->query('//base[@href][1]/@href');
if ($bases->length !== 0) {
$last = resolveUrl($last, $bases->item(0)->value);
}
}
return resolveUrl($last, $endpoint);
$statement = $pdo->prepare('SELECT setting_value FROM settings WHERE setting_name = ?');
$statement->execute(['endpoint']);
$nextValue = $statement->fetchColumn();
while ($nextValue) {
$trusted[] = $nextValue;
$nextValue = $statement->fetchColumn();
}
return $trusted;
}

function verifyCode(string $code, string $client_id, string $redirect_uri, string $endpoint): ?array
Expand Down Expand Up @@ -262,31 +211,28 @@ function invalidRequest(): void
header('HTTP/1.1 200 OK');
exit();
}
$request = array_merge(
filter_input_array(INPUT_POST, [
'grant_type' => [
'filter' => FILTER_VALIDATE_REGEXP,
'options' => ['regexp' => '@^authorization_code$@'],
],
'code' => [
'filter' => FILTER_VALIDATE_REGEXP,
'options' => ['regexp' => '@^[\x20-\x7E]+$@'],
],
'client_id' => FILTER_VALIDATE_URL,
'redirect_uri' => FILTER_VALIDATE_URL,
]),
filter_input_array(INPUT_GET, [
'me' => FILTER_VALIDATE_URL,
])
);
$request = filter_input_array(INPUT_POST, [
'grant_type' => [
'filter' => FILTER_VALIDATE_REGEXP,
'options' => ['regexp' => '@^authorization_code$@'],
],
'code' => [
'filter' => FILTER_VALIDATE_REGEXP,
'options' => ['regexp' => '@^[\x20-\x7E]+$@'],
],
'client_id' => FILTER_VALIDATE_URL,
'redirect_uri' => FILTER_VALIDATE_URL,
]);
if (in_array(null, $request, true) || in_array(false, $request, true)) {
invalidRequest();
}
$endpoint = discoverAuthorizationEndpoint($request['me']);
if ($endpoint === null || !isTrustedEndpoint($endpoint)) {
invalidRequest();
$endpoints = getTrustedEndpoints();
foreach ($endpoints as $endpoint) {
$info = verifyCode($request['code'], $request['client_id'], $request['redirect_uri'], $endpoint);
Comment on lines +229 to +231
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
$endpoints = getTrustedEndpoints();
foreach ($endpoints as $endpoint) {
$info = verifyCode($request['code'], $request['client_id'], $request['redirect_uri'], $endpoint);
$endpoints = getTrustedEndpoints();
// Iterate through the trusted endpoints asking each in turn if they own the code and can verify it.
foreach ($endpoints as $endpoint) {
$info = verifyCode($request['code'], $request['client_id'], $request['redirect_uri'], $endpoint);

if ($info !== null) {
break;
}
}
$info = verifyCode($request['code'], $request['client_id'], $request['redirect_uri'], $endpoint);
if ($info === null) {
invalidRequest();
}
Expand Down