nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #11390 from annando/plink

Browse source 
Only use and accept valid http links as links to an external resource
This commit is contained in:
Hypolite Petovan 2022-04-04 10:58:37 -04:00 committed by GitHub
parent c700645385 5290f0cd51
commit 8ab477320a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Model/Item.php
View file

@ -3191,6 +3191,12 @@ class Item
*/
public static function getPlink($item)
{
if (Network::isValidHttpUrl($item['plink'])) {
$plink = $item['plink'];
} elseif (Network::isValidHttpUrl($item['uri']) && !Network::isLocalLink($item['uri'])) {
$plink = $item['uri'];
}
if (local_user()) {
$ret = [
'href' => "display/" . $item['guid'],
@ -3199,14 +3205,14 @@ class Item
'orig_title' => DI::l10n()->t('View on separate page'),
];
if (!empty($item['plink'])) {
$ret['href'] = DI::baseUrl()->remove($item['plink']);
if (!empty($plink)) {
$ret['href'] = DI::baseUrl()->remove($plink);
$ret['title'] = DI::l10n()->t('Link to source');
}
} elseif (!empty($item['plink']) && ($item['private'] != self::PRIVATE)) {
} elseif (!empty($plink) && ($item['private'] != self::PRIVATE)) {
$ret = [
'href' => $item['plink'],
'orig' => $item['plink'],
'href' => $plink,
'orig' => $plink,
'title' => DI::l10n()->t('Link to source'),
'orig_title' => DI::l10n()->t('Link to source'),
];

5
src/Protocol/ActivityPub/Receiver.php
View file

@ -37,6 +37,7 @@ use Friendica\Protocol\ActivityPub;
use Friendica\Util\HTTPSignature;
use Friendica\Util\JsonLD;
use Friendica\Util\LDSignature;
use Friendica\Util\Network;
use Friendica\Util\Strings;
/**
@ -1533,6 +1534,10 @@ class Receiver
}
}
if (!empty($object_data['alternate-url']) && !Network::isValidHttpUrl($object_data['alternate-url'])) {
$object_data['alternate-url'] = null;
}
if (in_array($object_data['object_type'], ['as:Audio', 'as:Video'])) {
$object_data['alternate-url'] = self::extractAlternateUrl($object['as:url'] ?? []) ?: $object_data['alternate-url'];
$object_data['attachments'] = array_merge($object_data['attachments'], self::processAttachmentUrls($object['as:url'] ?? []));

12
src/Util/Network.php
View file

@ -560,4 +560,16 @@ class Network
{
return (strpos(Strings::normaliseLink($url), Strings::normaliseLink(DI::baseUrl())) !== false);
}
/**
* Check if the given URL is a valid HTTP/HTTPS URL
*
* @param string $url
* @return bool
*/
public static function isValidHttpUrl(string $url)
{
$scheme = parse_url($url, PHP_URL_SCHEME);
return !empty($scheme) && in_array($scheme, ['http', 'https']) && parse_url($url, PHP_URL_HOST);
}
}