Skip to content

[stable31] fix(settings): change Mastodon only URI to webfinger #53843

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

Merged
provokateurin merged 3 commits into from
Jul 11, 2025
Merged

[stable31] fix(settings): change Mastodon only URI to webfinger #53843

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f0f6e6
fix(settings): change Mastodon only URI to webfinger
TechnicalSuwako May 25, 2025
645b989
fix(settings): add link check in webfinger
TechnicalSuwako May 26, 2025
df78886
fix(settings): fix test
TechnicalSuwako May 27, 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
Prev Previous commit
Next Next commit
fix(settings): add link check in webfinger 
Signed-off-by: 諏訪子 <[email protected]>
  • Loading branch information
@TechnicalSuwako @backportbot
TechnicalSuwako authored and backportbot[bot] committed Jul 7, 2025
commit 645b98961907786f173f59dd3f2153955fcf8593
17 changes: 17 additions & 0 deletions lib/private/Accounts/AccountManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,6 +748,23 @@ private function sanitizePropertyFediverse(IAccountProperty $property): void {
if (!is_array($decoded) || ($decoded['subject'] ?? '') !== "acct:{$username}@{$instance}") {
throw new InvalidArgumentException();
}
// check for activitypub link
if (is_array($decoded['links']) && isset($decoded['links'])) {
$found = false;
foreach ($decoded['links'] as $link) {
// have application/activity+json or application/ld+json
if (isset($link['type']) && (
$link['type'] === 'application/activity+json' ||
$link['type'] === 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'
)) {
$found = true;
break;
}
}
if (!$found) {
throw new InvalidArgumentException();
}
}
} catch (InvalidArgumentException) {
throw new InvalidArgumentException(self::PROPERTY_FEDIVERSE);
} catch (\Exception $error) {
Expand Down