X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdiaspora.php;h=3a211302460a866f483ac5e26f4331f7e5acc455;hb=683cdcc19ef261f5fe632838a1e14567fc874ba2;hp=59bad946e2fb14bb83da410d73b4555802a93e46;hpb=d676ae0f32a33e0f75c28d31f32f3d9476b4efd6;p=friendica.git diff --git a/include/diaspora.php b/include/diaspora.php index 59bad946e2..3a21130246 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -2,43 +2,11 @@ /** * @file include/diaspora.php * @brief The implementation of the diaspora protocol - * - * Checklist: - * - * Checked: - * - send status - * - send comment - * - send like - * - send mail - * - send status retraction - * - send comment retraction on own post - * - send like retraction on own post - * - send comment retraction on diaspora post - * - send like retraction on diaspora post - * - receive status - * - receive reshare - * - receive comment - * - receive like - * - receive connect request - * - receive profile data - * - receive mail - * - receive comment retraction - * - receive like retraction - * - relay comment - * - relay like - * - relay comment retraction from diaspora - * - relay comment retraction from friendica - * - relay like retraction from diaspora - * - relay like retraction from friendica - * - send share - * - * Should work: - * - receive account deletion - * - send unshare - * - * Unchecked: */ +/// @todo reshare of some reshare doesn't work well, see guid c1d534b0ed19013358694860008dbc6c +// 14f571c0f244013358694860008dbc6c + require_once("include/items.php"); require_once("include/bb2diaspora.php"); require_once("include/Scrape.php"); @@ -116,9 +84,9 @@ class diaspora { * @param string $handle The handle of the signature owner * @param integer $level This value is only set inside this function to avoid endless loops * - * @return the repaired signature + * @return string the repaired signature */ - function repair_signature($signature, $handle = "", $level = 1) { + private function repair_signature($signature, $handle = "", $level = 1) { if ($signature == "") return ($signature); @@ -146,7 +114,7 @@ class diaspora { * 'author' -> author diaspora handle * 'key' -> author public key (converted to pkcs#8) */ - function decode($importer, $xml) { + public static function decode($importer, $xml) { $public = false; $basedom = parse_xml_string($xml); @@ -179,16 +147,6 @@ class diaspora { $decrypted = pkcs5_unpad($decrypted); - /** - * $decrypted now contains something like - * - * - * 8e+G2+ET8l5BPuW0sVTnQw== - * UvSMb4puPeB14STkcDWq+4QE302Edu15oaprAQSkLKU= - * galaxor@diaspora.priateship.org - * - */ - logger('decrypted: '.$decrypted, LOGGER_DEBUG); $idom = parse_xml_string($decrypted,false); @@ -287,7 +245,7 @@ class diaspora { * * @param array $msg The post that will be dispatched * - * @return bool Was the message accepted? + * @return int The message id of the generated message, "true" or "false" if there was an error */ public static function dispatch_public($msg) { @@ -299,7 +257,7 @@ class diaspora { // Use a dummy importer to import the data for the public copy $importer = array("uid" => 0, "page-flags" => PAGE_FREELOVE); - $item_id = self::dispatch($importer,$msg); + $message_id = self::dispatch($importer,$msg); // Now distribute it to the followers $r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN @@ -316,7 +274,7 @@ class diaspora { } else logger("No subscribers for ".$msg["author"]." ".print_r($msg, true)); - return $item_id; + return $message_id; } /** @@ -325,7 +283,7 @@ class diaspora { * @param array $importer Array of the importer user * @param array $msg The post that will be dispatched * - * @return bool Was the message accepted? + * @return int The message id of the generated message, "true" or "false" if there was an error */ public static function dispatch($importer, $msg) { @@ -349,6 +307,9 @@ class diaspora { case "comment": return self::receive_comment($importer, $sender, $fields, $msg["message"]); + case "contact": + return self::receive_contact_request($importer, $fields); + case "conversation": return self::receive_conversation($importer, $msg, $fields); @@ -370,9 +331,6 @@ class diaspora { case "profile": return self::receive_profile($importer, $fields); - case "request": - return self::receive_request($importer, $fields); - case "reshare": return self::receive_reshare($importer, $fields, $msg["message"]); @@ -428,6 +386,9 @@ class diaspora { if (in_array($type, array("signed_retraction", "relayable_retraction"))) $type = "retraction"; + if ($type == "request") + $type = "contact"; + $fields = new SimpleXMLElement("<".$type."/>"); $signed_data = ""; @@ -657,7 +618,7 @@ class diaspora { if($contact['addr'] != "") $handle = $contact['addr']; - elseif(($contact['network'] === NETWORK_DFRN) || ($contact['self'] == 1)) { + else { $baseurl_start = strpos($contact['url'],'://') + 3; $baseurl_length = strpos($contact['url'],'/profile') - $baseurl_start; // allows installations in a subdirectory--not sure how Diaspora will handle $baseurl = substr($contact['url'], $baseurl_start, $baseurl_length); @@ -744,7 +705,7 @@ class diaspora { * @param string $handle The checked handle in the format user@domain.tld * @param bool $is_comment Is the check for a comment? * - * @return bool is posting allowed? + * @return array The contact data */ private function allowed_contact_by_handle($importer, $handle, $is_comment = false) { $contact = self::contact_by_handle($importer["uid"], $handle); @@ -766,7 +727,7 @@ class diaspora { * @param int $uid The user id * @param string $guid The guid of the message * - * @return bool "true" if the message already was stored into the system + * @return int|bool message id if the message already was stored into the system - or false. */ private function message_exists($uid, $guid) { $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1", @@ -776,7 +737,7 @@ class diaspora { if($r) { logger("message ".$guid." already exists for user ".$uid); - return true; + return $r[0]["id"]; } return false; @@ -795,7 +756,7 @@ class diaspora { } /** - * @brief sub function of "fetch_guid" + * @brief sub function of "fetch_guid" which checks for links in messages * * @param array $match array containing a link that has to be checked for a message link * @param array $item The item array @@ -838,7 +799,10 @@ class diaspora { * @param string $server The url of the server * @param int $level Endless loop prevention * - * @return array of message, author and public key + * @return array + * 'message' => The message XML + * 'author' => The author handle + * 'key' => The public key of the author */ private function message($guid, $server, $level = 0) { @@ -935,7 +899,9 @@ class diaspora { * @param array $person The record of the person * @param int $uid The user id * - * @return array of contact id and network type + * @return array + * 'cid' => contact id + * 'network' => network type */ private function author_contact_by_url($contact, $person, $uid) { @@ -1002,6 +968,9 @@ class diaspora { * @return bool Success */ private function receive_account_deletion($importer, $data) { + + /// @todo Account deletion should remove the contact from the global contacts as well + $author = notags(unxmlify($data->author)); $contact = self::contact_by_handle($importer["uid"], $author); @@ -1035,8 +1004,9 @@ class diaspora { if (!$contact) return false; - if (self::message_exists($importer["uid"], $guid)) - return false; + $message_id = self::message_exists($importer["uid"], $guid); + if ($message_id) + return $message_id; $parent_item = self::parent_item($importer["uid"], $parent_guid, $author, $contact); if (!$parent_item) @@ -1364,8 +1334,9 @@ class diaspora { if (!$contact) return false; - if (self::message_exists($importer["uid"], $guid)) - return false; + $message_id = self::message_exists($importer["uid"], $guid); + if ($message_id) + return $message_id; $parent_item = self::parent_item($importer["uid"], $parent_guid, $author, $contact); if (!$parent_item) @@ -1382,7 +1353,7 @@ class diaspora { // "positive" = "false" would be a Dislike - wich isn't currently supported by Diaspora // We would accept this anyhow. - if ($positive === "true") + if ($positive == "true") $verb = ACTIVITY_LIKE; else $verb = ACTIVITY_DISLIKE; @@ -1699,11 +1670,8 @@ class diaspora { $BPhoto = "[url=".$contact["url"]."][img]".$contact["thumb"]."[/img][/url]"; $arr["body"] = sprintf(t("%1$s is now friends with %2$s"), $A, $B)."\n\n\n".$Bphoto; - $arr["object"] = "".ACTIVITY_OBJ_PERSON."".$contact["name"]."" - ."".$contact["url"]."/".$contact["name"].""; - $arr["object"] .= "".xmlify(''."\n"); - $arr["object"] .= xmlify(''."\n"); - $arr["object"] .= "\n"; + $arr["object"] = self::construct_new_friend_object($contact); + $arr["last-child"] = 1; $arr["allow_cid"] = $user[0]["allow_cid"]; @@ -1718,6 +1686,26 @@ class diaspora { } } + /** + * @brief Creates a XML object for a "new friend" message + * + * @param array $contact Array of the contact + * + * @return string The XML + */ + private function construct_new_friend_object($contact) { + $objtype = ACTIVITY_OBJ_PERSON; + $link = ''."\n". + ''."\n"; + + $xmldata = array("object" => array("type" => $objtype, + "title" => $contact["name"], + "id" => $contact["url"]."/".$contact["name"], + "link" => $link)); + + return xml::from_array($xmldata, $xml, true); + } + /** * @brief Processes incoming sharing notification * @@ -1726,22 +1714,43 @@ class diaspora { * * @return bool Success */ - private function receive_request($importer, $data) { + private function receive_contact_request($importer, $data) { $author = unxmlify($data->author); $recipient = unxmlify($data->recipient); if (!$author || !$recipient) return false; - $contact = self::contact_by_handle($importer["uid"],$author); + // the current protocol version doesn't know these fields + // That means that we will assume their existance + if (isset($data->following)) + $following = (unxmlify($data->following) == "true"); + else + $following = true; - if($contact) { + if (isset($data->sharing)) + $sharing = (unxmlify($data->sharing) == "true"); + else + $sharing = true; - // perhaps we were already sharing with this person. Now they're sharing with us. - // That makes us friends. + $contact = self::contact_by_handle($importer["uid"],$author); - self::receive_request_make_friend($importer, $contact); - return true; + // perhaps we were already sharing with this person. Now they're sharing with us. + // That makes us friends. + if ($contact) { + if ($following AND $sharing) { + self::receive_request_make_friend($importer, $contact); + return true; + } else /// @todo Handle all possible variations of adding and retracting of permissions + return false; + } + + if (!$following AND $sharing AND in_array($importer["page-flags"], array(PAGE_SOAPBOX, PAGE_NORMAL))) { + logger("Author ".$author." wants to share with us - but doesn't want to listen. Request is ignored.", LOGGER_DEBUG); + return false; + } elseif (!$following AND !$sharing) { + logger("Author ".$author." doesn't want anything - and we don't know the author. Request is ignored.", LOGGER_DEBUG); + return false; } $ret = self::person_by_handle($author); @@ -1781,12 +1790,10 @@ class diaspora { return; } - $g = q("SELECT `def_gid` FROM `user` WHERE `uid` = %d LIMIT 1", - intval($importer["uid"]) - ); + $def_gid = get_default_group($importer['uid'], $ret["network"]); - if($g && intval($g[0]["def_gid"])) - group_add_member($importer["uid"], "", $contact_record["id"], $g[0]["def_gid"]); + if(intval($def_gid)) + group_add_member($importer["uid"], "", $contact_record["id"], $def_gid); if($importer["page-flags"] == PAGE_NORMAL) { @@ -1812,8 +1819,10 @@ class diaspora { // but if our page-type is PAGE_COMMUNITY or PAGE_SOAPBOX // we are going to change the relationship and make them a follower. - if($importer["page-flags"] == PAGE_FREELOVE) + if (($importer["page-flags"] == PAGE_FREELOVE) AND $sharing AND $following) $new_relation = CONTACT_IS_FRIEND; + elseif (($importer["page-flags"] == PAGE_FREELOVE) AND $sharing) + $new_relation = CONTACT_IS_SHARING; else $new_relation = CONTACT_IS_FOLLOWER; @@ -1860,10 +1869,18 @@ class diaspora { logger("reshared message ".$guid." already exists on system."); // Maybe it is already a reshared item? - // Then refetch the content, since there can be many side effects with reshared posts from other networks or reshares from reshares - if (self::is_reshare($r[0]["body"], false)) + // Then refetch the content, if it is a reshare from a reshare. + // If it is a reshared post from another network then reformat to avoid display problems with two share elements + if (self::is_reshare($r[0]["body"], true)) $r = array(); - else + elseif (self::is_reshare($r[0]["body"], false)) { + $r[0]["body"] = diaspora2bb(bb2diaspora($r[0]["body"])); + + // Add OEmbed and other information to the body + $r[0]["body"] = add_page_info_to_body($r[0]["body"], false, true); + + return $r[0]; + } else return $r[0]; } @@ -1925,8 +1942,9 @@ class diaspora { if (!$contact) return false; - if (self::message_exists($importer["uid"], $guid)) - return false; + $message_id = self::message_exists($importer["uid"], $guid); + if ($message_id) + return $message_id; $original_item = self::original_item($root_guid, $root_author, $author); if (!$original_item) @@ -2068,10 +2086,11 @@ class diaspora { case "StatusMessage": return self::item_retraction($importer, $contact, $data);; + case "Contact": case "Person": /// @todo What should we do with an "unshare"? // Removing the contact isn't correct since we still can read the public items - //contact_remove($contact["id"]); + contact_remove($contact["id"]); return true; default: @@ -2109,8 +2128,9 @@ class diaspora { if (!$contact) return false; - if (self::message_exists($importer["uid"], $guid)) - return false; + $message_id = self::message_exists($importer["uid"], $guid); + if ($message_id) + return $message_id; $address = array(); if ($data->location) @@ -2121,6 +2141,7 @@ class diaspora { $datarray = array(); + // Attach embedded pictures to the body if ($data->photo) { foreach ($data->photo AS $photo) $body = "[img]".unxmlify($photo->remote_photo_path). @@ -2179,9 +2200,9 @@ class diaspora { return $message_id; } - /****************************************************************************************** + /* ************************************************************************************** * * Here are all the functions that are needed to transmit data with the Diaspora protocol * - ******************************************************************************************/ + * ************************************************************************************** */ /** * @brief returnes the handle of a contact @@ -2588,8 +2609,9 @@ class diaspora { $link = $matches[1]; $ret["root_guid"] = preg_replace("=https?://(.*)/posts/(.*)=ism", "$2", $link); - if (($ret["root_guid"] == $link) OR ($ret["root_guid"] == "")) + if (($ret["root_guid"] == $link) OR (trim($ret["root_guid"]) == "")) return(false); + return($ret); } @@ -3066,13 +3088,7 @@ class diaspora { * * @return bool Success */ - function store_like_signature($contact, $post_id) { - - $enabled = intval(get_config('system','diaspora_enabled')); - if (!$enabled) { - logger('Diaspora support disabled, not storing like signature', LOGGER_DEBUG); - return false; - } + public static function store_like_signature($contact, $post_id) { // Is the contact the owner? Then fetch the private key if (!$contact['self'] OR ($contact['uid'] == 0)) { @@ -3130,19 +3146,13 @@ class diaspora { * * @return bool Success */ - function store_comment_signature($item, $contact, $uprvkey, $message_id) { + public static function store_comment_signature($item, $contact, $uprvkey, $message_id) { if ($uprvkey == "") { logger('No private key, so not storing comment signature', LOGGER_DEBUG); return false; } - $enabled = intval(get_config('system','diaspora_enabled')); - if (!$enabled) { - logger('Diaspora support disabled, not storing comment signature', LOGGER_DEBUG); - return false; - } - $contact["uprvkey"] = $uprvkey; $message = self::construct_comment($item, $contact);