Skip to content

fix: Handle when required resource parameter is missing or empty #1951

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
joshtrichards wants to merge 5 commits into
base: master
Choose a base branch
from
Open

fix: Handle when required resource parameter is missing or empty #1951

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
af1444e
fix: Handle when required `resource` parameter is missing or empty
joshtrichards Nov 21, 2024
4c0834d
fix: psalm
joshtrichards Nov 21, 2024
3a0c72e
fix: oops
joshtrichards Nov 21, 2024
662b199
fixup
joshtrichards Nov 27, 2024
a02f309
Update WebfingerHandler.php
joshtrichards Nov 27, 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
13 changes: 11 additions & 2 deletions lib/WellKnown/WebfingerHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,12 @@ public function handle(
*/
public function handleWebfinger(IRequestContext $context, ?IResponse $previousResponse): ?IResponse {
$subject = $this->getSubjectFromRequest($context->getHttpRequest());

// the `resource` parameter is required
if ($subject === '') {
return new JrdResponse('', Http::STATUS_BAD_REQUEST);
}

if (str_starts_with($subject, 'acct:')) {
$subject = substr($subject, 5);
}
Expand Down Expand Up @@ -216,8 +222,11 @@ private function getSubjectFromRequest(IRequest $request): string {

// work around to extract resource:
// on some setup (i.e. tests) the data are not available from IRequest
parse_str(parse_url($request->getRequestUri(), PHP_URL_QUERY), $query);

$requestUri = $request->getRequestUri();
if ($requestUri !== '') {
parse_str(parse_url($requestUri, PHP_URL_QUERY) ?? '', $query);
}
Comment on lines +225 to +228
Copy link
Contributor

@come-nc come-nc Nov 28, 2024

Choose a reason for hiding this comment

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

Suggested change
$requestUri = $request->getRequestUri();
if ($requestUri !== '') {
parse_str(parse_url($requestUri, PHP_URL_QUERY) ?? '', $query);
}
parse_str(parse_url($request->getRequestUri(), PHP_URL_QUERY) ?? '', $query);

The if is not useful anymore, I think


return $query['resource'] ?? '';
}
}
Loading