friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Harden OEmbed link discovery 

- 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

26
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); {
break; $href = $link->getAttributeNode('href')->nodeValue;
} $result = DI::httpRequest()->fetchFull($href . '&maxwidth=' . $a->videowidth);
if ($result->getReturnCode() === 200) {
$entries = $xpath->query("//link[@type='text/json+oembed']"); $json_string = $result->getBody();
foreach ($entries as $e) { break;
$href = $e->getAttributeNode('href')->nodeValue; }
$json_string = DI::httpRequest()->fetch($href . '&maxwidth=' . $a->videowidth);
break;
} }
} }
} }