$xrd = null;
$curlResult = Network::curl($ssl_url, false, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
+ $ssl_connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
if ($curlResult->isSuccess()) {
$xml = $curlResult->getBody();
$xrd = XML::parseString($xml, false);
$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)) {
$curlResult = Network::curl($url, false, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
+ $connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
if ($curlResult->isTimeout()) {
- Logger::log("Probing timeout for " . $url, Logger::DEBUG);
+ Logger::info('Probing timeout', ['url' => $url], Logger::DEBUG);
+ self::$istimeout = true;
+ return false;
+ } elseif ($connection_error && $ssl_connection_error) {
self::$istimeout = true;
return false;
}
+
$xml = $curlResult->getBody();
$xrd = XML::parseString($xml, false);
$host_url = 'http://'.$host;
$data['url'] = $uri;
}
- if (!empty($data['photo']) && !empty($data["baseurl"])) {
+ if (!empty($data['photo']) && !empty($data['baseurl'])) {
$data['baseurl'] = Network::getUrlMatch(Strings::normaliseLink($data['baseurl']), Strings::normaliseLink($data['photo']));
} elseif (empty($data['photo'])) {
$data['photo'] = System::baseUrl() . '/images/person-300.jpg';
if (in_array($network, ["", Protocol::DFRN])) {
$result = self::dfrn($webfinger);
}
- if ((empty($result['network']) && ($network == "")) || ($network == Protocol::DIASPORA)) {
- $result = self::diaspora($webfinger, $result);
+ if ((!$result && ($network == "")) || ($network == Protocol::DIASPORA)) {
+ $result = self::diaspora($webfinger);
}
- if ((empty($result['network']) && ($network == "")) || ($network == Protocol::OSTATUS)) {
- $result = self::ostatus($webfinger, false, $result);
+ if ((!$result && ($network == "")) || ($network == Protocol::OSTATUS)) {
+ $result = self::ostatus($webfinger);
}
- if ((empty($result['network']) && ($network == "")) || ($network == Protocol::PUMPIO)) {
- $result = self::pumpio($webfinger, $addr, $result);
- }
- if ((empty($result['network']) && ($network == "")) || ($network == Protocol::ZOT)) {
+ if (in_array($network, ['', Protocol::ZOT])) {
$result = self::zot($webfinger, $result);
}
- if ((empty($result['network']) && ($network == "")) || ($network == Protocol::FEED)) {
- $result = self::feed($uri, true, $result);
+ if ((!$result && ($network == "")) || ($network == Protocol::PUMPIO)) {
+ $result = self::pumpio($webfinger, $addr);
+ }
+ if ((!$result && ($network == "")) || ($network == Protocol::FEED)) {
+ $result = self::feed($uri);
} else {
// 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).
*/
private static function zot($webfinger, $data)
{
+ if (!empty($webfinger["aliases"]) && is_array($webfinger["aliases"])) {
+ foreach ($webfinger["aliases"] as $alias) {
+ if (substr($alias, 0, 5) == 'acct:') {
+ $data["addr"] = substr($alias, 5);
+ }
+ }
+ }
+
+ if (!empty($webfinger["subject"]) && (substr($webfinger["subject"], 0, 5) == "acct:")) {
+ $data["addr"] = substr($webfinger["subject"], 5);
+ }
+
$zot_url = '';
foreach ($webfinger['links'] as $link) {
if (($link['rel'] == 'http://purl.org/zot/protocol') && !empty($link['href'])) {
}
if (empty($zot_url) && !empty($data['addr']) && !empty(self::$baseurl)) {
+ $condition = ['nurl' => Strings::normaliseLink(self::$baseurl), 'platform' => ['hubzilla']];
+ if (!DBA::exists('gserver', $condition)) {
+ return $data;
+ }
$zot_url = self::$baseurl . '/.well-known/zot-info?address=' . $data['addr'];
}
- if (!empty($zot_url)) {
- $data = self::pollZot($zot_url, $data);
+ if (empty($zot_url)) {
+ return $data;
+ }
+
+ $data = self::pollZot($zot_url, $data);
+
+ if (!empty($data['url']) && !empty($webfinger['aliases']) && is_array($webfinger['aliases'])) {
+ foreach ($webfinger['aliases'] as $alias) {
+ if (!strstr($alias, '@') && Strings::normaliseLink($alias) != Strings::normaliseLink($data['url'])) {
+ $data['alias'] = $alias;
+ }
+ }
}
return $data;
return $data;
}
- if (!empty($json['protocols']) && in_array('zot', $json['protocols'])) {
- $data['network'] = Protocol::ZOT;
- } elseif (!isset($json['protocols'])) {
- $data['network'] = Protocol::ZOT;
+ if (empty($data['network'])) {
+ if (!empty($json['protocols']) && in_array('zot', $json['protocols'])) {
+ $data['network'] = Protocol::ZOT;
+ } elseif (!isset($json['protocols'])) {
+ $data['network'] = Protocol::ZOT;
+ }
}
- if (!empty($json['guid'])) {
+ if (!empty($json['guid']) && empty($data['guid'])) {
$data['guid'] = $json['guid'];
}
- if (!empty($json['key'])) {
+ if (!empty($json['key']) && empty($data['pubkey'])) {
$data['pubkey'] = $json['key'];
}
if (!empty($json['name'])) {
$data['name'] = $json['name'];
}
- if (!empty($json['photo']) && empty($data['photo'])) {
+ if (!empty($json['photo'])) {
$data['photo'] = $json['photo'];
+ if (!empty($json['photo_updated'])) {
+ $data['photo'] .= '?rev=' . urlencode($json['photo_updated']);
+ }
}
if (!empty($json['address'])) {
$data['addr'] = $json['address'];
}
if (!isset($data["network"]) || ($hcard_url == "")) {
- return $data;
+ return false;
}
// Fetch data via noscrape - this is faster
* @brief Check for Diaspora contact
*
* @param array $webfinger Webfinger data
- * @param array $data previously probed data
*
* @return array Diaspora data
* @throws HTTPException\InternalServerErrorException
*/
- private static function diaspora($webfinger, $data)
+ private static function diaspora($webfinger)
{
$hcard_url = "";
-
- unset($data["guid"]);
- unset($data["pubkey"]);
+ $data = [];
// The array is reversed to take into account the order of preference for same-rel links
// See: https://tools.ietf.org/html/rfc7033#section-4.4.4
}
if (empty($data["url"]) || empty($hcard_url)) {
- return $data;
+ return false;
}
if (!empty($webfinger["aliases"]) && is_array($webfinger["aliases"])) {
// Fetch further information from the hcard
$data = self::pollHcard($hcard_url, $data);
+ if (!$data) {
+ return false;
+ }
+
if (!empty($data["url"])
&& !empty($data["guid"])
&& !empty($data["baseurl"])
// We have to overwrite the detected value for "notify" since Hubzilla doesn't send it
$data["notify"] = $data["baseurl"] . "/receive/users/" . $data["guid"];
$data["batch"] = $data["baseurl"] . "/receive/public";
+ } else {
+ return false;
}
return $data;
*
* @param array $webfinger Webfinger data
* @param bool $short Short detection mode
- * @param array $data previously probed data
*
* @return array|bool OStatus data or "false" on error or "true" on short mode
* @throws HTTPException\InternalServerErrorException
*/
- private static function ostatus($webfinger, $short = false, $data = [])
+ private static function ostatus($webfinger, $short = false)
{
+ $data = [];
+
if (!empty($webfinger["aliases"]) && is_array($webfinger["aliases"])) {
foreach ($webfinger["aliases"] as $alias) {
if (strstr($alias, "@") && !strstr(Strings::normaliseLink($alias), "http://")) {
$curlResult = Network::curl($pubkey);
if ($curlResult->isTimeout()) {
self::$istimeout = true;
- if ($short) {
- return false;
- } else {
- return $data;
- }
+ return false;
}
$pubkey = $curlResult->getBody();
}
&& isset($data["url"])
) {
$data["network"] = Protocol::OSTATUS;
- } elseif ($short) {
- return false;
} else {
- return $data;
+ return false;
}
if ($short) {
$curlResult = Network::curl($data["poll"]);
if ($curlResult->isTimeout()) {
self::$istimeout = true;
- return $data;
+ return false;
}
$feed = $curlResult->getBody();
$dummy1 = null;
$dummy2 = null;
$feed_data = Feed::import($feed, $dummy1, $dummy2, $dummy3, true);
if (!$feed_data) {
- return $data;
+ return false;
}
if (!empty($feed_data["header"]["author-name"])) {
*/
private static function pumpioProfileData($profile_link)
{
+ $curlResult = Network::curl($profile_link);
+ if (!$curlResult->isSuccess()) {
+ return false;
+ }
+
$doc = new DOMDocument();
- if (!@$doc->loadHTMLFile($profile_link)) {
+ if (!@$doc->loadHTML($curlResult->getBody())) {
return false;
}
*
* @param array $webfinger Webfinger data
* @param string $addr
- * @param array $data previously probed data
* @return array pump.io data
*/
- private static function pumpio($webfinger, $addr, $data)
+ private static function pumpio($webfinger, $addr)
{
+ $data = [];
// The array is reversed to take into account the order of preference for same-rel links
// See: https://tools.ietf.org/html/rfc7033#section-4.4.4
foreach (array_reverse($webfinger["links"]) as $link) {
$data["network"] = Protocol::PUMPIO;
} else {
- return $data;
+ return false;
}
$profile_data = self::pumpioProfileData($data["url"]);
if (!$profile_data) {
- return $data;
+ return false;
}
$data = array_merge($data, $profile_data);
*/
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;
}
*
* @param string $url Profile link
* @param boolean $probe Do a probe if the page contains a feed link
- * @param array $data previously probed data
*
* @return array feed data
* @throws HTTPException\InternalServerErrorException
*/
- private static function feed($url, $probe = true, $data = [])
+ private static function feed($url, $probe = true)
{
$curlResult = Network::curl($url);
if ($curlResult->isTimeout()) {
self::$istimeout = true;
- return $data;
+ return false;
}
$feed = $curlResult->getBody();
$dummy1 = $dummy2 = $dummy3 = null;
if (!$feed_data) {
if (!$probe) {
- return $data;
+ return false;
}
$feed_url = self::getFeedLink($url);
if (!$feed_url) {
- return $data;
+ return false;
}
return self::feed($feed_url, false);
projects / friendica.git / blobdiff