clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8025 from annando/probe-failure 

Don't create contacts for unknown networks / improved content fetching
This commit is contained in:
Philipp 2019-12-29 00:15:07 +01:00 committed by GitHub
parent ae0421f321 fab0d9b919
commit 5c4184c03a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Model/Contact.php
View File

@ -1514,7 +1514,7 @@ class Contact extends BaseObject
$data = array_merge($data, $default); $data = array_merge($data, $default);
} }
if (empty($data)) { if (empty($data) || ($data['network'] == Protocol::PHANTOM)) {
return 0; return 0;
} }

21
src/Network/Probe.php
View File

@ -119,12 +119,16 @@ class Probe
$xml = $curlResult->getBody(); $xml = $curlResult->getBody();
$xrd = XML::parseString($xml, false); $xrd = XML::parseString($xml, false);
$host_url = 'https://'.$host; $host_url = 'https://'.$host;
} elseif ($curlResult->isTimeout()) {
Logger::info('Probing timeout', ['url' => $ssl_url], Logger::DEBUG);
self::$istimeout = true;
return false;
} }
if (!is_object($xrd)) { if (!is_object($xrd)) {
$curlResult = Network::curl($url, false, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']); $curlResult = Network::curl($url, false, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
if ($curlResult->isTimeout()) { if ($curlResult->isTimeout()) {
Logger::log("Probing timeout for " . $url, Logger::DEBUG); Logger::info('Probing timeout', ['url' => $url], Logger::DEBUG);
self::$istimeout = true; self::$istimeout = true;
return false; return false;
} }
@ -1520,8 +1524,13 @@ class Probe
*/ */
private static function pumpioProfileData($profile_link) private static function pumpioProfileData($profile_link)
{ {
$curlResult = Network::curl($profile_link);
if (!$curlResult->isSuccess()) {
return false;
}
$doc = new DOMDocument(); $doc = new DOMDocument();
if (!@$doc->loadHTMLFile($profile_link)) { if (!@$doc->loadHTML($curlResult->getBody())) {
return false; return false;
} }
@ -1693,9 +1702,13 @@ class Probe
*/ */
private static function getFeedLink($url) private static function getFeedLink($url)
{ {
$doc = new DOMDocument(); $curlResult = Network::curl($url);
if (!$curlResult->isSuccess()) {
return false;
}
if (!@$doc->loadHTMLFile($url)) { $doc = new DOMDocument();
if (!@$doc->loadHTML($curlResult->getBody())) {
return false; return false;
} }