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

Prevent fatal error when probing WebFinger address in Network\Probe::feed

This commit is contained in:
Hypolite Petovan 2023-01-26 00:00:55 -05:00
parent 6bedd190b9
commit 91d8cd2c87
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Network/Probe.php
View File

@ -761,7 +761,7 @@ class Probe
$result = self::feed($uri); $result = self::feed($uri);
} else { } else {
// We overwrite the detected nick with our try if the previois routines hadn't detected it. // We overwrite the detected nick with our try if the previois routines hadn't detected it.
// Additionally it is overwritten when the nickname doesn't make sense (contains spaces). // Additionally, it is overwritten when the nickname doesn't make sense (contains spaces).
if ((empty($result['nick']) || (strstr($result['nick'], ' '))) && ($nick != '')) { if ((empty($result['nick']) || (strstr($result['nick'], ' '))) && ($nick != '')) {
$result['nick'] = $nick; $result['nick'] = $nick;
} }
@ -1853,11 +1853,18 @@ class Probe
*/ */
private static function feed(string $url, bool $probe = true): array private static function feed(string $url, bool $probe = true): array
{ {
$curlResult = DI::httpClient()->get($url, HttpClientAccept::FEED_XML); try {
$curlResult = DI::httpClient()->get($url, HttpClientAccept::FEED_XML);
} catch(\Throwable $e) {
DI::logger()->info('Error requesting feed URL', ['url' => $url, 'exception' => $e]);
return [];
}
if ($curlResult->isTimeout()) { if ($curlResult->isTimeout()) {
self::$isTimeout = true; self::$isTimeout = true;
return []; return [];
} }
$feed = $curlResult->getBody(); $feed = $curlResult->getBody();
$feed_data = Feed::import($feed); $feed_data = Feed::import($feed);