X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2FProbe.php;h=6145daaaae5f7eea3dce174660a6cc84173bb58a;hb=80ec0398d877810ddfb8c76f2f258fdaa962ec9e;hp=df2246f2064b91a88371e436f4cb3e9e03833248;hpb=b9da831138667700d465f15ad50df650ab4da427;p=friendica.git diff --git a/include/Probe.php b/include/Probe.php index df2246f206..6145daaaae 100644 --- a/include/Probe.php +++ b/include/Probe.php @@ -118,18 +118,16 @@ class Probe { */ public static function webfinger_dfrn($webbie, &$hcard) { - if (!strstr($webbie, '@')) - return $webbie; $profile_link = ''; - $links = self::webfinger($webbie); + $links = self::lrdd($webbie); logger('webfinger_dfrn: '.$webbie.':'.print_r($links,true), LOGGER_DATA); if (count($links)) { foreach ($links as $link) { if ($link['@attributes']['rel'] === NAMESPACE_DFRN) $profile_link = $link['@attributes']['href']; - if ($link['@attributes']['rel'] === NAMESPACE_OSTATUSSUB) + if (($link['@attributes']['rel'] === NAMESPACE_OSTATUSSUB) AND ($profile_link == "")) $profile_link = 'stat:'.$link['@attributes']['template']; if ($link['@attributes']['rel'] === 'http://microformats.org/profile/hcard') $hcard = $link['@attributes']['href']; @@ -180,6 +178,11 @@ class Probe { $path = str_replace('{uri}', urlencode($uri), $link); $webfinger = self::webfinger($path); + + if (!$webfinger AND (strstr($uri, "@"))) { + $path = str_replace('{uri}', urlencode("acct:".$uri), $link); + $webfinger = self::webfinger($path); + } } if (!is_array($webfinger["links"])) @@ -200,7 +203,7 @@ class Probe { } /** - * @brief Fetch information about a given uri + * @brief Fetch information (protocol endpoints and user information) about a given uri * * @param string $uri Address that should be probed * @param string $network Test for this specific network @@ -214,7 +217,6 @@ class Probe { if ($cache) { $result = Cache::get("probe_url:".$network.":".$uri); if (!is_null($result)) { - $result = unserialize($result); return $result; } } @@ -254,7 +256,7 @@ class Probe { // Only store into the cache if the value seems to be valid if (!in_array($data['network'], array(NETWORK_PHANTOM, NETWORK_MAIL))) { - Cache::set("probe_url:".$network.":".$uri,serialize($data), CACHE_DAY); + Cache::set("probe_url:".$network.":".$uri, $data, CACHE_DAY); /// @todo temporary fix - we need a real contact update function that updates only changing fields /// The biggest problem is the avatar picture that could have a reduced image size. @@ -279,7 +281,9 @@ class Probe { } /** - * @brief Detect information about a given uri + * @brief Fetch information (protocol endpoints and user information) about a given uri + * + * This function is only called by the "uri" function that adds caching and rearranging of data. * * @param string $uri Address that should be probed * @param string $network Test for this specific network @@ -289,7 +293,7 @@ class Probe { */ private function detect($uri, $network, $uid) { if (strstr($uri, '@')) { - // If the URI starts with "mailto:" then jum directly to the mail detection + // If the URI starts with "mailto:" then jump directly to the mail detection if (strpos($url,'mailto:') !== false) { $uri = str_replace('mailto:', '', $url); return self::mail($uri, $uid); @@ -308,6 +312,7 @@ class Probe { return array("network" => NETWORK_TWITTER); $lrdd = self::xrd($host); + if (!$lrdd) return self::mail($uri, $uid); @@ -319,7 +324,7 @@ class Probe { !isset($parts["path"])) return false; - // todo: Ports? + /// @todo: Ports? $host = $parts["host"]; if ($host == 'twitter.com') @@ -354,6 +359,12 @@ class Probe { $path = str_replace('{uri}', urlencode($addr), $link); $webfinger = self::webfinger($path); + // Mastodon needs to have it with "acct:" + if (!$webfinger) { + $path = str_replace('{uri}', urlencode("acct:".$addr), $link); + $webfinger = self::webfinger($path); + } + // If webfinger wasn't successful then try it with the URL - possibly in the format https://... if (!$webfinger AND ($uri != $addr)) { $path = str_replace('{uri}', urlencode($uri), $link); @@ -406,7 +417,9 @@ class Probe { } /** - * @brief Do a webfinger request + * @brief Perform a webfinger request. + * + * For details see RFC 7033: * * @param string $url Address that should be probed * @@ -458,7 +471,10 @@ class Probe { } /** - * @brief Poll the noscrape page (Friendica specific) + * @brief Poll the Friendica specific noscrape page. + * + * "noscrape" is a faster alternative to fetch the data from the hcard. + * This functionality was originally created for the directory. * * @param string $noscrape Link to the noscrape page * @param array $data The already fetched data @@ -543,7 +559,7 @@ class Probe { } /** - * @brief Fetch data from a DFRN profile page + * @brief Fetch data from a DFRN profile page and via "noscrape" * * @param string $profile Link to the profile page * @@ -553,6 +569,8 @@ class Probe { $data = array(); + logger("Check profile ".$profile, LOGGER_DEBUG); + // Fetch data via noscrape - this is faster $noscrape = str_replace(array("/hcard/", "/profile/"), "/noscrape/", $profile); $data = self::poll_noscrape($noscrape, $data); @@ -575,6 +593,8 @@ class Probe { $prof_data["fn"] = $data["name"]; $prof_data["key"] = $data["pubkey"]; + logger("Result for profile ".$profile.": ".print_r($prof_data, true), LOGGER_DEBUG); + return $prof_data; } @@ -644,8 +664,12 @@ class Probe { */ private function poll_hcard($hcard, $data, $dfrn = false) { + $content = fetch_url($hcard); + if (!$content) + return false; + $doc = new DOMDocument(); - if (!@$doc->loadHTMLFile($hcard)) + if (!@$doc->loadHTML($content)) return false; $xpath = new DomXPath($doc); @@ -654,40 +678,39 @@ class Probe { if (!is_object($vcards)) return false; - if ($vcards->length == 0) - return false; + if ($vcards->length > 0) { + $vcard = $vcards->item(0); - $vcard = $vcards->item(0); + // We have to discard the guid from the hcard in favour of the guid from lrdd + // Reason: Hubzilla doesn't use the value "uid" in the hcard like Diaspora does. + $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' uid ')]", $vcard); // */ + if (($search->length > 0) AND ($data["guid"] == "")) + $data["guid"] = $search->item(0)->nodeValue; - // We have to discard the guid from the hcard in favour of the guid from lrdd - // Reason: Hubzilla doesn't use the value "uid" in the hcard like Diaspora does. - $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' uid ')]", $vcard); // */ - if (($search->length > 0) AND ($data["guid"] == "")) - $data["guid"] = $search->item(0)->nodeValue; + $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' nickname ')]", $vcard); // */ + if ($search->length > 0) + $data["nick"] = $search->item(0)->nodeValue; - $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' nickname ')]", $vcard); // */ - if ($search->length > 0) - $data["nick"] = $search->item(0)->nodeValue; + $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' fn ')]", $vcard); // */ + if ($search->length > 0) + $data["name"] = $search->item(0)->nodeValue; - $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' fn ')]", $vcard); // */ - if ($search->length > 0) - $data["name"] = $search->item(0)->nodeValue; + $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' searchable ')]", $vcard); // */ + if ($search->length > 0) + $data["searchable"] = $search->item(0)->nodeValue; - $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' searchable ')]", $vcard); // */ - if ($search->length > 0) - $data["searchable"] = $search->item(0)->nodeValue; + $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' key ')]", $vcard); // */ + if ($search->length > 0) { + $data["pubkey"] = $search->item(0)->nodeValue; + if (strstr($data["pubkey"], 'RSA ')) + $data["pubkey"] = rsatopem($data["pubkey"]); + } - $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' key ')]", $vcard); // */ - if ($search->length > 0) { - $data["pubkey"] = $search->item(0)->nodeValue; - if (strstr($data["pubkey"], 'RSA ')) - $data["pubkey"] = rsatopem($data["pubkey"]); + $search = $xpath->query("//*[@id='pod_location']", $vcard); // */ + if ($search->length > 0) + $data["baseurl"] = trim($search->item(0)->nodeValue, "/"); } - $search = $xpath->query("//*[@id='pod_location']", $vcard); // */ - if ($search->length > 0) - $data["baseurl"] = trim($search->item(0)->nodeValue, "/"); - $avatar = array(); $photos = $xpath->query("//*[contains(concat(' ', @class, ' '), ' photo ') or contains(concat(' ', @class, ' '), ' avatar ')]", $vcard); // */ foreach ($photos AS $photo) { @@ -781,6 +804,9 @@ class Probe { isset($data["pubkey"]) AND ($hcard != "")) { $data["network"] = NETWORK_DIASPORA; + // The Diaspora handle must always be lowercase + $data["addr"] = strtolower($data["addr"]); + // 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"; @@ -805,6 +831,9 @@ class Probe { if (strstr($alias, "@")) $data["addr"] = str_replace('acct:', '', $alias); + if (is_string($webfinger["subject"]) AND strstr($webfinger["subject"], "@")) + $data["addr"] = str_replace('acct:', '', $webfinger["subject"]); + $pubkey = ""; foreach ($webfinger["links"] AS $link) { if (($link["rel"] == "http://webfinger.net/rel/profile-page") AND @@ -822,7 +851,7 @@ class Probe { $pubkey = substr($pubkey, strpos($pubkey, ',') + 1); else $pubkey = substr($pubkey, 5); - } else + } elseif (normalise_link($pubkey) == 'http://') $pubkey = fetch_url($pubkey); $key = explode(".", $pubkey); @@ -1055,7 +1084,7 @@ class Probe { $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval($uid)); - if(count($x) && count($r)) { + if (dbm::is_result($x) && dbm::is_result($r)) { $mailbox = construct_mailbox_name($r[0]); $password = ''; openssl_private_decrypt(hex2bin($r[0]['pass']), $password,$x[0]['prvkey']);