bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Harden OEmbed link discovery

Browse source 
- Check OEmbed call return code before storing response
- Stop at first successful OEmbed response
This commit is contained in:
Hypolite Petovan 2021-02-08 02:03:48 -05:00
parent 5354a2d5d0
commit 0927bb5f2c
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Content/OEmbed.php
View file

@ -98,21 +98,19 @@ class OEmbed
// try oembed autodiscovery // try oembed autodiscovery
$html_text = DI::httpRequest()->fetch($embedurl, 15, 'text/*'); $html_text = DI::httpRequest()->fetch($embedurl, 15, 'text/*');
if ($html_text) { if ($html_text) {
$dom = @DOMDocument::loadHTML($html_text); $dom = new DOMDocument();
if ($dom) { if ($dom->loadHTML($html_text)) {
$xpath = new DOMXPath($dom); $xpath = new DOMXPath($dom);
$entries = $xpath->query("//link[@type='application/json+oembed']"); foreach (
foreach ($entries as $e) { $xpath->query("//link[@type='application/json+oembed'] | //link[@type='text/json+oembed']")
$href = $e->getAttributeNode('href')->nodeValue; as $link)
$json_string = DI::httpRequest()->fetch($href . '&maxwidth=' . $a->videowidth); {
$href = $link->getAttributeNode('href')->nodeValue;
$result = DI::httpRequest()->fetchFull($href . '&maxwidth=' . $a->videowidth);
if ($result->getReturnCode() === 200) {
$json_string = $result->getBody();
break; break;
} }
$entries = $xpath->query("//link[@type='text/json+oembed']");
foreach ($entries as $e) {
$href = $e->getAttributeNode('href')->nodeValue;
$json_string = DI::httpRequest()->fetch($href . '&maxwidth=' . $a->videowidth);
break;
} }
} }
} }