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

Merge pull request #14428 from annando/gserver-loop

Browse source 
Prevent a loop when trying to detect the server type
This commit is contained in:
Tobias Diekershoff 2024-09-10 07:30:30 +02:00 committed by GitHub
commit d48d07e18d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/Model/GServer.php
View file

@ -1780,43 +1780,15 @@ class GServer
*/ */
private static function detectNetworkViaContacts(string $url, array $serverdata): array private static function detectNetworkViaContacts(string $url, array $serverdata): array
{ {
$contacts = []; $contact = DBA::selectFirst('contact', ['network'], ["`network` != ? AND NOT `failed` AND `uid` = ? AND `baseurl` IN (?, ?)", Protocol::PHANTOM, 0, $url, Strings::normaliseLink($url)]);
if (empty($contact)) {
$nurl = Strings::normaliseLink($url);
$apcontacts = DBA::select('apcontact', ['url'], ['baseurl' => [$url, $nurl]]);
while ($apcontact = DBA::fetch($apcontacts)) {
$contacts[Strings::normaliseLink($apcontact['url'])] = $apcontact['url'];
}
DBA::close($apcontacts);
$pcontacts = DBA::select('contact', ['url', 'nurl'], ['uid' => 0, 'baseurl' => [$url, $nurl]]);
while ($pcontact = DBA::fetch($pcontacts)) {
$contacts[$pcontact['nurl']] = $pcontact['url'];
}
DBA::close($pcontacts);
if (empty($contacts)) {
return $serverdata; return $serverdata;
} }
$serverdata['network'] = $contact['network'];
$time = time(); if (in_array($serverdata['detection-method'], self::DETECT_UNSPECIFIC)) {
foreach ($contacts as $contact) { $serverdata['detection-method'] = self::DETECT_CONTACTS;
// Endlosschleife verhindern wegen gsid!
$data = Probe::uri($contact);
if (in_array($data['network'], Protocol::FEDERATED)) {
$serverdata['network'] = $data['network'];
if (in_array($serverdata['detection-method'], self::DETECT_UNSPECIFIC)) {
$serverdata['detection-method'] = self::DETECT_CONTACTS;
}
break;
} elseif ((time() - $time) > 10) {
// To reduce the stress on remote systems we probe a maximum of 10 seconds
break;
}
} }
return $serverdata; return $serverdata;
} }