X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FDFRN.php;h=7dee12b56ca498d0bdb61f9c177a0f774b59859c;hb=c07cb2c8f31154cc424e99c95740d753501e09b7;hp=01159b1baeea7c8cfea232462be993b0c78acaa3;hpb=e557457158bfbcf773f497bd564dbde4c9588c71;p=friendica.git diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index 01159b1bae..7dee12b56c 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -11,6 +11,7 @@ namespace Friendica\Protocol; use DOMDocument; use DOMXPath; use Friendica\App; +use Friendica\App\BaseURL; use Friendica\Content\OEmbed; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; @@ -19,6 +20,7 @@ use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\System; +use Friendica\Core\Session; use Friendica\Database\DBA; use Friendica\Model\Contact; use Friendica\Model\Conversation; @@ -29,8 +31,8 @@ use Friendica\Model\Mail; use Friendica\Model\PermissionSet; use Friendica\Model\Profile; use Friendica\Model\User; +use Friendica\Network\Probe; use Friendica\Object\Image; -use Friendica\Util\BaseURL; use Friendica\Util\Crypto; use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; @@ -257,7 +259,7 @@ class DFRN STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` WHERE `item`.`uid` = %d AND `item`.`wall` AND `item`.`changed` > '%s' AND `item`.`visible` $sql_extra - ORDER BY `item`.`parent` ".$sort.", `item`.`created` ASC LIMIT 0, 300", + ORDER BY `item`.`parent` ".$sort.", `item`.`received` ASC LIMIT 0, 300", intval($owner_id), DBA::escape($check_date), DBA::escape($sort) @@ -1176,23 +1178,13 @@ class DFRN * @param string $atom Content that will be transmitted * @param bool $dissolve (to be documented) * - * @param bool $legacy_transport * @return int Deliver status. Negative values mean an error. * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException * @todo Add array type-hint for $owner, $contact */ - public static function deliver($owner, $contact, $atom, $dissolve = false, $legacy_transport = false) + public static function deliver($owner, $contact, $atom, $dissolve = false) { - // At first try the Diaspora transport layer - if (!$dissolve && !$legacy_transport) { - $curlResult = self::transmit($owner, $contact, $atom); - if ($curlResult >= 200) { - Logger::log('Delivery via Diaspora transport layer was successful with status ' . $curlResult); - return $curlResult; - } - } - $idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']); if ($contact['duplex'] && $contact['dfrn-id']) { @@ -1229,7 +1221,6 @@ class DFRN $curlResult = Network::curl($url); if ($curlResult->isTimeout()) { - Contact::markForArchival($contact); return -2; // timed out } @@ -1237,29 +1228,24 @@ class DFRN $curl_stat = $curlResult->getReturnCode(); if (empty($curl_stat)) { - Contact::markForArchival($contact); return -3; // timed out } Logger::log('dfrn_deliver: ' . $xml, Logger::DATA); if (empty($xml)) { - Contact::markForArchival($contact); return 3; } if (strpos($xml, 'status) != 0) || !strlen($res->challenge) || !strlen($res->dfrn_id)) { - Contact::markForArchival($contact); - if (empty($res->status)) { $status = 3; } else { @@ -1315,7 +1301,6 @@ class DFRN if ($final_dfrn_id != $orig_id) { Logger::log('dfrn_deliver: wrong dfrn_id.'); // did not decode properly - cannot trust this site - Contact::markForArchival($contact); return 3; } @@ -1351,7 +1336,6 @@ class DFRN default: Logger::log("rino: invalid requested version '$rino_remote_version'"); - Contact::markForArchival($contact); return -8; } @@ -1391,26 +1375,22 @@ class DFRN $curl_stat = $postResult->getReturnCode(); if (empty($curl_stat) || empty($xml)) { - Contact::markForArchival($contact); return -9; // timed out } if (($curl_stat == 503) && stristr($postResult->getHeader(), 'retry-after')) { - Contact::markForArchival($contact); return -10; } if (strpos($xml, 'status)) { - Contact::markForArchival($contact); return -11; } @@ -1423,10 +1403,6 @@ class DFRN Logger::log('Delivery returned status '.$res->status.' - '.$res->message, Logger::DEBUG); } - if (($res->status >= 200) && ($res->status <= 299)) { - Contact::unmarkForArchival($contact); - } - return intval($res->status); } @@ -1454,7 +1430,6 @@ class DFRN if (empty($contact['addr'])) { Logger::log('Unable to find contact handle for ' . $contact['id'] . ' - ' . $contact['url']); - Contact::markForArchival($contact); return -21; } } @@ -1462,7 +1437,6 @@ class DFRN $fcontact = Diaspora::personByHandle($contact['addr']); if (empty($fcontact)) { Logger::log('Unable to find contact details for ' . $contact['id'] . ' - ' . $contact['addr']); - Contact::markForArchival($contact); return -22; } $pubkey = $fcontact['pubkey']; @@ -1483,6 +1457,11 @@ class DFRN $dest_url = ($public_batch ? $contact["batch"] : $contact["notify"]); + if (empty($dest_url)) { + Logger::info('Empty destination', ['public' => $public_batch, 'contact' => $contact]); + return -24; + } + $content_type = ($public_batch ? "application/magic-envelope+xml" : "application/json"); $postResult = Network::post($dest_url, $envelope, ["Content-Type: ".$content_type]); @@ -1491,26 +1470,22 @@ class DFRN $curl_stat = $postResult->getReturnCode(); if (empty($curl_stat) || empty($xml)) { Logger::log('Empty answer from ' . $contact['id'] . ' - ' . $dest_url); - Contact::markForArchival($contact); return -9; // timed out } if (($curl_stat == 503) && (stristr($postResult->getHeader(), 'retry-after'))) { - Contact::markForArchival($contact); return -10; } if (strpos($xml, 'status)) { - Contact::markForArchival($contact); return -23; } @@ -1518,10 +1493,6 @@ class DFRN Logger::log('Transmit to ' . $dest_url . ' returned status '.$res->status.' - '.$res->message, Logger::DEBUG); } - if (($res->status >= 200) && ($res->status <= 299)) { - Contact::unmarkForArchival($contact); - } - return intval($res->status); } @@ -1720,64 +1691,26 @@ class DFRN Event::createBirthday($contact, $birthday); } - // Get all field names - $fields = []; - foreach ($contact_old as $field => $data) { - $fields[$field] = $data; - } + $fields = ['name' => $contact['name'], 'nick' => $contact['nick'], 'about' => $contact['about'], + 'location' => $contact['location'], 'addr' => $contact['addr'], 'keywords' => $contact['keywords'], + 'bdyear' => $contact['bdyear'], 'bd' => $contact['bd'], 'hidden' => $contact['hidden'], + 'xmpp' => $contact['xmpp'], 'name-date' => DateTimeFormat::utc($contact['name-date']), + 'unsearchable' => $contact['hidden'], 'uri-date' => DateTimeFormat::utc($contact['uri-date'])]; - unset($fields["id"]); - unset($fields["uid"]); - unset($fields["url"]); - unset($fields["avatar-date"]); - unset($fields["avatar"]); - unset($fields["name-date"]); - unset($fields["uri-date"]); + DBA::update('contact', $fields, ['id' => $contact['id'], 'network' => $contact['network']], $contact_old); - $update = false; - // Update check for this field has to be done differently - $datefields = ["name-date", "uri-date"]; - foreach ($datefields as $field) { - // The date fields arrives as '2018-07-17T10:44:45Z' - the database return '2018-07-17 10:44:45' - // The fields have to be in the same format to be comparable, since strtotime does add timezones. - $contact[$field] = DateTimeFormat::utc($contact[$field]); + // Update the public contact. Don't set the "hidden" value, this is used differently for public contacts + unset($fields['hidden']); + $condition = ['uid' => 0, 'nurl' => Strings::normaliseLink($contact_old['url'])]; + DBA::update('contact', $fields, $condition, true); - if (strtotime($contact[$field]) > strtotime($contact_old[$field])) { - Logger::log("Difference for contact " . $contact["id"] . " in field '" . $field . "'. New value: '" . $contact[$field] . "', old value '" . $contact_old[$field] . "'", Logger::DEBUG); - $update = true; - } - } + Contact::updateAvatar($author['avatar'], $importer['importer_uid'], $contact['id']); - foreach ($fields as $field => $data) { - if ($contact[$field] != $contact_old[$field]) { - Logger::log("Difference for contact " . $contact["id"] . " in field '" . $field . "'. New value: '" . $contact[$field] . "', old value '" . $contact_old[$field] . "'", Logger::DEBUG); - $update = true; - } - } - - if ($update) { - Logger::log("Update contact data for contact " . $contact["id"] . " (" . $contact["nick"] . ")", Logger::DEBUG); - - q( - "UPDATE `contact` SET `name` = '%s', `nick` = '%s', `about` = '%s', `location` = '%s', - `addr` = '%s', `keywords` = '%s', `bdyear` = '%s', `bd` = '%s', `hidden` = %d, - `xmpp` = '%s', `name-date` = '%s', `uri-date` = '%s' - WHERE `id` = %d AND `network` = '%s'", - DBA::escape($contact["name"]), DBA::escape($contact["nick"]), DBA::escape($contact["about"]), DBA::escape($contact["location"]), - DBA::escape($contact["addr"]), DBA::escape($contact["keywords"]), DBA::escape($contact["bdyear"]), - DBA::escape($contact["bd"]), intval($contact["hidden"]), DBA::escape($contact["xmpp"]), - DBA::escape(DateTimeFormat::utc($contact["name-date"])), DBA::escape(DateTimeFormat::utc($contact["uri-date"])), - intval($contact["id"]), DBA::escape($contact["network"]) - ); + $pcid = Contact::getIdForURL($contact_old['url']); + if (!empty($pcid)) { + Contact::updateAvatar($author['avatar'], 0, $pcid); } - Contact::updateAvatar( - $author['avatar'], - $importer['importer_uid'], - $contact['id'], - (strtotime($contact['avatar-date']) > strtotime($contact_old['avatar-date']) || ($author['avatar'] != $contact_old['avatar'])) - ); - /* * The generation is a sign for the reliability of the provided data. * It is used in the socgraph.php to prevent that old contact data @@ -2242,11 +2175,10 @@ class DFRN { Logger::log("Process verb ".$item["verb"]." and object-type ".$item["object-type"]." for entrytype ".$entrytype, Logger::DEBUG); - if (($entrytype == DFRN::TOP_LEVEL)) { + if (($entrytype == DFRN::TOP_LEVEL) && !empty($importer['id'])) { // The filling of the the "contact" variable is done for legcy reasons // The functions below are partly used by ostatus.php as well - where we have this variable - $r = q("SELECT * FROM `contact` WHERE `id` = %d", intval($importer["id"])); - $contact = $r[0]; + $contact = Contact::selectFirst([], ['id' => $importer['id']]); // Big question: Do we need these functions? They were part of the "consume_feed" function. // This function once was responsible for DFRN and OStatus. @@ -2917,97 +2849,6 @@ class DFRN return 200; } - /** - * @param App $a App - * @param string $contact_nick contact nickname - * @throws \Friendica\Network\HTTPException\InternalServerErrorException - */ - public static function autoRedir(App $a, $contact_nick) - { - // prevent looping - if (!empty($_REQUEST['redir'])) { - return; - } - - if ((! $contact_nick) || ($contact_nick === $a->user['nickname'])) { - return; - } - - if (local_user()) { - // We need to find out if $contact_nick is a user on this hub, and if so, if I - // am a contact of that user. However, that user may have other contacts with the - // same nickname as me on other hubs or other networks. Exclude these by requiring - // that the contact have a local URL. I will be the only person with my nickname at - // this URL, so if a result is found, then I am a contact of the $contact_nick user. - // - // We also have to make sure that I'm a legitimate contact--I'm not blocked or pending. - - $baseurl = System::baseUrl(); - $domain_st = strpos($baseurl, "://"); - if ($domain_st === false) { - return; - } - $baseurl = substr($baseurl, $domain_st + 3); - $nurl = Strings::normaliseLink($baseurl); - - /// @todo Why is there a query for "url" *and* "nurl"? Especially this normalising is strange. - $r = q("SELECT `id` FROM `contact` WHERE `uid` = (SELECT `uid` FROM `user` WHERE `nickname` = '%s' LIMIT 1) - AND `nick` = '%s' AND NOT `self` AND (`url` LIKE '%%%s%%' OR `nurl` LIKE '%%%s%%') AND NOT `blocked` AND NOT `pending` LIMIT 1", - DBA::escape($contact_nick), - DBA::escape($a->user['nickname']), - DBA::escape($baseurl), - DBA::escape($nurl) - ); - if ((! DBA::isResult($r)) || $r[0]['id'] == remote_user()) { - return; - } - - $r = q("SELECT * FROM contact WHERE nick = '%s' - AND network = '%s' AND uid = %d AND url LIKE '%%%s%%' LIMIT 1", - DBA::escape($contact_nick), - DBA::escape(Protocol::DFRN), - intval(local_user()), - DBA::escape($baseurl) - ); - if (! DBA::isResult($r)) { - return; - } - - $cid = $r[0]['id']; - - $dfrn_id = (($r[0]['issued-id']) ? $r[0]['issued-id'] : $r[0]['dfrn-id']); - - if ($r[0]['duplex'] && $r[0]['issued-id']) { - $orig_id = $r[0]['issued-id']; - $dfrn_id = '1:' . $orig_id; - } - if ($r[0]['duplex'] && $r[0]['dfrn-id']) { - $orig_id = $r[0]['dfrn-id']; - $dfrn_id = '0:' . $orig_id; - } - - // ensure that we've got a valid ID. There may be some edge cases with forums and non-duplex mode - // that may have triggered some of the "went to {profile/intro} and got an RSS feed" issues - - if (strlen($dfrn_id) < 3) { - return; - } - - $sec = Strings::getRandomHex(); - - DBA::insert('profile_check', ['uid' => local_user(), 'cid' => $cid, 'dfrn_id' => $dfrn_id, 'sec' => $sec, 'expire' => time() + 45]); - - $url = curPageURL(); - - Logger::log('auto_redir: ' . $r[0]['name'] . ' ' . $sec, Logger::DEBUG); - $dest = (($url) ? '&destination_url=' . $url : ''); - System::externalRedirect($r[0]['poll'] . '?dfrn_id=' . $dfrn_id - . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest); - } - - return; - } - /** * @brief Returns the activity verb * @@ -3093,4 +2934,19 @@ class DFRN return (strcmp($existing_edited, $update_edited) < 0); } + + /** + * Checks if the given contact url does support DFRN + * + * @param string $url profile url + * @param boolean $update Update the profile + * @return boolean + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException + */ + public static function isSupportedByContactUrl($url, $update = false) + { + $probe = Probe::uri($url, Protocol::DFRN, 0, !$update); + return $probe['network'] == Protocol::DFRN; + } }