Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 22:30:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix the following of accounts with "?" in the URL

Browse source
This commit is contained in:
Michael 2024-10-16 03:00:20 +00:00
parent c4aaff181c
commit 93536f31e8
7 changed files with 27 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/Module/Contact/Follow.php
View file

@ -56,11 +56,15 @@ class Follow extends BaseModule
throw new ForbiddenException($this->t('Access denied.'));
}
if (isset($request['cancel']) || empty($request['url'])) {
$this->baseUrl->redirect('contact');
if (!empty($request['follow-url'])) {
$this->baseUrl->redirect('contact/follow?binurl=' . bin2hex($request['follow-url']));
}
$url = Probe::cleanURI($request['url']);
$url = $this->getUrl($request);
if (isset($request['cancel']) || empty($url)) {
$this->baseUrl->redirect('contact');
}
$this->process($url);
}
@ -77,7 +81,7 @@ class Follow extends BaseModule
$uid = $this->session->getLocalUserId();
// uri is used by the /authorize_interaction Mastodon route
$url = Probe::cleanURI(trim($request['uri'] ?? $request['url'] ?? ''));
$url = $this->getUrl($request);
// Issue 6874: Allow remote following from Peertube
if (strpos($url, 'acct:') === 0) {
@ -182,7 +186,7 @@ class Follow extends BaseModule
protected function process(string $url)
{
$returnPath = 'contact/follow?url=' . urlencode($url);
$returnPath = 'contact/follow?binurl=' . bin2hex($url);
$result = Contact::createFromProbeForUser($this->session->getLocalUserId(), $url);
@ -227,4 +231,14 @@ class Follow extends BaseModule
return;
}
}
private function getUrl(array $request): string
{
if (!empty($request['binurl']) && Strings::isHex($request['binurl'])) {
$url = hex2bin($request['binurl']);
} else {
$url = $request['url'] ?? '';
}
return Probe::cleanURI($url);
}
}

2
src/Module/Contact/Profile.php
View file

@ -477,7 +477,7 @@ class Profile extends BaseModule
} else {
$contact_actions['follow'] = [
'label' => $this->t('Follow'),
'url' => 'contact/follow?url=' . urlencode($contact['url']) . '&auto=1',
'url' => 'contact/follow?binurl=' . bin2hex($contact['url']) . '&auto=1',
'title' => '',
'sel' => '',
'id' => 'follow',