Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-09 16:22:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14411 from annando/content-type

Browse source 
Feeds: Check the content type before fetching feeds
This commit is contained in:
Tobias Diekershoff 2024-09-07 15:34:11 +02:00 committed by GitHub
commit 8eff24d693
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Network/Probe.php
View file

@ -1715,9 +1715,11 @@ class Probe
} }
$feed = $curlResult->getBodyString(); $feed = $curlResult->getBodyString();
$feed_data = Feed::import($feed); if (strpos($curlResult->getContentType(), 'xml') !== false) {
$feed_data = Feed::import($feed);
}
if (!$feed_data) { if (empty($feed_data)) {
if (!$probe) { if (!$probe) {
return []; return [];
} }

5
src/Worker/OnePoll.php
View file

@ -188,6 +188,11 @@ class OnePoll
return false; return false;
} }
if (strpos($curlResult->getContentType(), 'xml') !== false) {
Logger::notice('Unexpected content type.', ['id' => $contact['id'], 'url' => $contact['poll'], 'content-type' => $curlResult->getContentType()]);
return false;
}
if (!strstr($xml, '<')) { if (!strstr($xml, '<')) {
Logger::notice('response did not contain XML.', ['id' => $contact['id'], 'url' => $contact['poll']]); Logger::notice('response did not contain XML.', ['id' => $contact['id'], 'url' => $contact['poll']]);
return false; return false;