X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdiaspora.php;h=846a89ba9ced9a50607f17a567913c9ace789b8d;hb=0dfa57948f152a90a4d8093419a2ea5ced07349c;hp=dcce9b3510767fea348e71104cf3992f5e21d3d1;hpb=80d787d990c83addcba9dd4cd1e35e05197ededb;p=friendica.git diff --git a/include/diaspora.php b/include/diaspora.php index dcce9b3510..846a89ba9c 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -11,6 +11,9 @@ use Friendica\App; use Friendica\Core\System; use Friendica\Core\Config; +use Friendica\Core\PConfig; +use Friendica\Core\Worker; +use Friendica\Network\Probe; require_once 'include/items.php'; require_once 'include/bb2diaspora.php'; @@ -39,7 +42,7 @@ class Diaspora { */ public static function relay_list() { - $serverdata = get_config("system", "relay_server"); + $serverdata = Config::get("system", "relay_server"); if ($serverdata == "") return array(); @@ -118,7 +121,7 @@ class Diaspora { */ private static function verify_magic_envelope($envelope) { - $basedom = parse_xml_string($envelope, false); + $basedom = parse_xml_string($envelope); if (!is_object($basedom)) { logger("Envelope is no XML file"); @@ -227,7 +230,7 @@ class Diaspora { $basedom = parse_xml_string($xml); if (!is_object($basedom)) { - logger('Received data does not seem to be an XML. Discarding.'); + logger('Received data does not seem to be an XML. Discarding. '.$xml); http_status_exit(400); } @@ -287,6 +290,11 @@ class Diaspora { $public = true; $author_link = str_replace('acct:','',$children->header->author_id); } else { + // This happens with posts from a relais + if (!$importer) { + logger("This is no private post in the old format", LOGGER_DEBUG); + return false; + } $encrypted_header = json_decode(base64_decode($children->encrypted_header)); @@ -304,7 +312,7 @@ class Diaspora { $decrypted = self::aes_decrypt($outer_key, $outer_iv, $ciphertext); logger('decrypted: '.$decrypted, LOGGER_DEBUG); - $idom = parse_xml_string($decrypted,false); + $idom = parse_xml_string($decrypted); $inner_iv = base64_decode($idom->iv); $inner_aes_key = base64_decode($idom->aes_key); @@ -403,7 +411,7 @@ class Diaspora { */ public static function dispatch_public($msg) { - $enabled = intval(get_config("system", "diaspora_enabled")); + $enabled = intval(Config::get("system", "diaspora_enabled")); if (!$enabled) { logger("diaspora is disabled"); return false; @@ -492,6 +500,9 @@ class Diaspora { logger("Received message type ".$type." from ".$sender." for user ".$importer["uid"], LOGGER_DEBUG); switch ($type) { + case "account_migration": + return self::receiveAccountMigration($importer, $fields); + case "account_deletion": return self::receive_account_deletion($importer, $fields); @@ -551,7 +562,7 @@ class Diaspora { */ private static function valid_posting($msg) { - $data = parse_xml_string($msg["message"], false); + $data = parse_xml_string($msg["message"]); if (!is_object($data)) { logger("No valid XML ".$msg["message"], LOGGER_DEBUG); @@ -729,7 +740,7 @@ class Diaspora { if (!$person || $update) { logger("create or refresh", LOGGER_DEBUG); - $r = probe_url($handle, PROBE_DIASPORA); + $r = Probe::uri($handle, NETWORK_DIASPORA); // Note that Friendica contacts will return a "Diaspora person" // if Diaspora connectivity is enabled on their server @@ -1124,7 +1135,8 @@ class Diaspora { return false; // This will work for new Diaspora servers and Friendica servers from 3.5 - $source_url = $server."/fetch/post/".$guid; + $source_url = $server."/fetch/post/".urlencode($guid); + logger("Fetch post from ".$source_url, LOGGER_DEBUG); $envelope = fetch_url($source_url); @@ -1140,7 +1152,7 @@ class Diaspora { // This will work for older Diaspora and Friendica servers if (!$x) { - $source_url = $server."/p/".$guid.".xml"; + $source_url = $server."/p/".urlencode($guid).".xml"; logger("Fetch post from ".$source_url, LOGGER_DEBUG); $x = fetch_url($source_url); @@ -1148,7 +1160,7 @@ class Diaspora { return false; } - $source_xml = parse_xml_string($x, false); + $source_xml = parse_xml_string($x); if (!is_object($source_xml)) return false; @@ -1312,6 +1324,91 @@ class Diaspora { } } + /** + * @brief Receives account migration + * + * @param array $importer Array of the importer user + * @param object $data The message object + * + * @return bool Success + */ + private static function receiveAccountMigration($importer, $data) { + $old_handle = notags(unxmlify($data->author)); + $new_handle = notags(unxmlify($data->profile->author)); + $signature = notags(unxmlify($data->signature)); + + $contact = self::contact_by_handle($importer["uid"], $old_handle); + if (!$contact) { + logger("cannot find contact for sender: ".$old_handle." and user ".$importer["uid"]); + return false; + } + + logger("Got migration for ".$old_handle.", to ".$new_handle." with user ".$importer["uid"]); + + // Check signature + $signed_text = 'AccountMigration:'.$old_handle.':'.$new_handle; + $key = self::key($old_handle); + if (!rsa_verify($signed_text, $signature, $key, "sha256")) { + logger('No valid signature for migration.'); + return false; + } + + // Update the profile + self::receive_profile($importer, $data->profile); + + // change the technical stuff in contact and gcontact + $data = Probe::uri($new_handle); + if ($data['network'] == NETWORK_PHANTOM) { + logger('Account for '.$new_handle." couldn't be probed."); + return false; + } + + $fields = array('url' => $data['url'], 'nurl' => normalise_link($data['url']), + 'name' => $data['name'], 'nick' => $data['nick'], + 'addr' => $data['addr'], 'batch' => $data['batch'], + 'notify' => $data['notify'], 'poll' => $data['poll'], + 'network' => $data['network']); + + dba::update('contact', $fields, array('addr' => $old_handle)); + + $fields = array('url' => $data['url'], 'nurl' => normalise_link($data['url']), + 'name' => $data['name'], 'nick' => $data['nick'], + 'addr' => $data['addr'], 'connect' => $data['addr'], + 'notify' => $data['notify'], 'photo' => $data['photo'], + 'server_url' => $data['baseurl'], 'network' => $data['network']); + + dba::update('gcontact', $fields, array('addr' => $old_handle)); + + logger('Contacts are updated.'); + + // update items + /// @todo This is an extreme performance killer + $fields = array( + 'owner-link' => array($contact["url"], $data["url"]), + 'author-link' => array($contact["url"], $data["url"]), + ); + foreach ($fields as $n=>$f) { + $r = q("SELECT `id` FROM `item` WHERE `%s` = '%s' AND `uid` = %d LIMIT 1", + $n, dbesc($f[0]), + intval($importer["uid"])); + + if (dbm::is_result($r)) { + $x = q("UPDATE `item` SET `%s` = '%s' WHERE `%s` = '%s' AND `uid` = %d", + $n, dbesc($f[1]), + $n, dbesc($f[0]), + intval($importer["uid"])); + + if ($x === false) { + return false; + } + } + } + + logger('Items are updated.'); + + return true; + } + /** * @brief Processes an account deletion * @@ -1509,7 +1606,7 @@ class Diaspora { dba::insert('sign', array('iid' => $message_id, 'signed_text' => json_encode($data))); // notify others - proc_run(PRIORITY_HIGH, "include/notifier.php", "comment-import", $message_id); + Worker::add(PRIORITY_HIGH, "notifier", "comment-import", $message_id); } return true; @@ -1819,7 +1916,7 @@ class Diaspora { dba::insert('sign', array('iid' => $message_id, 'signed_text' => json_encode($data))); // notify others - proc_run(PRIORITY_HIGH, "include/notifier.php", "comment-import", $message_id); + Worker::add(PRIORITY_HIGH, "notifier", "comment-import", $message_id); } return true; @@ -2054,7 +2151,7 @@ class Diaspora { intval($importer["uid"]) ); - if ($r && !$r[0]["hide-friends"] && !$contact["hidden"] && intval(get_pconfig($importer["uid"], "system", "post_newfriend"))) { + if ($r && !$r[0]["hide-friends"] && !$contact["hidden"] && intval(PConfig::get($importer["uid"], "system", "post_newfriend"))) { $self = q("SELECT * FROM `contact` WHERE `self` AND `uid` = %d LIMIT 1", intval($importer["uid"]) @@ -2095,7 +2192,7 @@ class Diaspora { $i = item_store($arr); if ($i) - proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i); + Worker::add(PRIORITY_HIGH, "notifier", "activity", $i); } } } @@ -2326,7 +2423,7 @@ class Diaspora { // 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(); - } elseif (self::is_reshare($r[0]["body"], false)) { + } elseif (self::is_reshare($r[0]["body"], false) || strstr($r[0]["body"], "[share")) { $r[0]["body"] = diaspora2bb(bb2diaspora($r[0]["body"])); $r[0]["body"] = self::replace_people_guid($r[0]["body"], $r[0]["author-link"]); @@ -2479,7 +2576,7 @@ class Diaspora { } // Fetch items that are about to be deleted - $fields = array('uid', 'id', 'parent', 'parent-uri'); + $fields = array('uid', 'id', 'parent', 'parent-uri', 'author-link'); // When we receive a public retraction, we delete every item that we find. if ($importer['uid'] == 0) { @@ -2518,7 +2615,7 @@ class Diaspora { // Now check if the retraction needs to be relayed by us if ($parent["origin"]) { // notify others - proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $item["id"]); + Worker::add(PRIORITY_HIGH, "notifier", "drop", $item["id"]); } } @@ -2845,7 +2942,7 @@ class Diaspora { $a = get_app(); - $enabled = intval(get_config("system", "diaspora_enabled")); + $enabled = intval(Config::get("system", "diaspora_enabled")); if (!$enabled) return 200; @@ -2861,7 +2958,7 @@ class Diaspora { if (!$queue_run && was_recently_delayed($contact["id"])) { $return_code = 0; } else { - if (!intval(get_config("system", "diaspora_test"))) { + if (!intval(Config::get("system", "diaspora_test"))) { $content_type = (($public_batch) ? "application/magic-envelope+xml" : "application/json"); post_url($dest_url."/", $envelope, array("Content-Type: ".$content_type)); @@ -2953,6 +3050,32 @@ class Diaspora { return $return_code; } + /** + * @brief sends an account migration + * + * @param array $owner the array of the item owner + * @param array $contact Target of the communication + * @param int $uid User ID + * + * @return int The result of the transmission + */ + public static function sendAccountMigration($owner, $contact, $uid) { + + $old_handle = PConfig::get($uid, 'system', 'previous_addr'); + $profile = self::createProfileData($uid); + + $signed_text = 'AccountMigration:'.$old_handle.':'.$profile['author']; + $signature = base64_encode(rsa_sign($signed_text, $owner["uprvkey"], "sha256")); + + $message = array("author" => $old_handle, + "profile" => $profile, + "signature" => $signature); + + logger("Send account migration ".print_r($message, true), LOGGER_DEBUG); + + return self::build_and_transmit($owner, $contact, "account_migration", $message); + } + /** * @brief Sends a "share" message * @@ -3447,11 +3570,11 @@ class Diaspora { // Split the signed text $signed_parts = explode(";", $signature['signed_text']); - if ($item["deleted"]) + if ($item["deleted"]) { $message = array("author" => $signature['signer'], "target_guid" => $signed_parts[0], "target_type" => $signed_parts[1]); - elseif ($item['verb'] === ACTIVITY_LIKE) + } elseif (in_array($item["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) { $message = array("author" => $signed_parts[4], "guid" => $signed_parts[1], "parent_guid" => $signed_parts[3], @@ -3459,7 +3582,7 @@ class Diaspora { "positive" => $signed_parts[0], "author_signature" => $signature['signature'], "parent_author_signature" => ""); - else { + } else { // Remove the comment guid $guid = array_shift($signed_parts); @@ -3494,12 +3617,13 @@ class Diaspora { */ public static function send_relay($item, $owner, $contact, $public_batch = false) { - if ($item["deleted"]) + if ($item["deleted"]) { return self::send_retraction($item, $owner, $contact, $public_batch, true); - elseif ($item['verb'] === ACTIVITY_LIKE) + } elseif (in_array($item["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) { $type = "like"; - else + } else { $type = "comment"; + } logger("Got relayable data ".$type." for item ".$item["guid"]." (".$item["id"].")", LOGGER_DEBUG); @@ -3566,7 +3690,7 @@ class Diaspora { if ($item['id'] == $item['parent']) { $target_type = "Post"; - } elseif ($item["verb"] == ACTIVITY_LIKE) { + } elseif (in_array($item["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) { $target_type = "Like"; } else { $target_type = "Comment"; @@ -3643,25 +3767,13 @@ class Diaspora { } /** - * @brief Sends profile data + * @brief Create profile data * * @param int $uid The user id + * + * @return array The profile data */ - public static function send_profile($uid, $recips = false) { - - if (!$uid) - return; - - if (!$recips) - $recips = q("SELECT `id`,`name`,`network`,`pubkey`,`notify` FROM `contact` WHERE `network` = '%s' - AND `uid` = %d AND `rel` != %d", - dbesc(NETWORK_DIASPORA), - intval($uid), - intval(CONTACT_IS_SHARING) - ); - if (!$recips) - return; - + private static function createProfileData($uid) { $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.*, `user`.`prvkey` AS `uprvkey`, `contact`.`addr` FROM `profile` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid` @@ -3670,8 +3782,9 @@ class Diaspora { intval($uid) ); - if (!$r) - return; + if (!$r) { + return array(); + } $profile = $r[0]; @@ -3709,7 +3822,7 @@ class Diaspora { $tags = trim($tags); } - $message = array("author" => $handle, + return array("author" => $handle, "first_name" => $first, "last_name" => $last, "image_url" => $large, @@ -3722,6 +3835,29 @@ class Diaspora { "searchable" => $searchable, "nsfw" => "false", "tag_string" => $tags); + } + + /** + * @brief Sends profile data + * + * @param int $uid The user id + */ + public static function send_profile($uid, $recips = false) { + + if (!$uid) + return; + + if (!$recips) + $recips = q("SELECT `id`,`name`,`network`,`pubkey`,`notify` FROM `contact` WHERE `network` = '%s' + AND `uid` = %d AND `rel` != %d", + dbesc(NETWORK_DIASPORA), + intval($uid), + intval(CONTACT_IS_SHARING) + ); + if (!$recips) + return; + + $message = self::createProfileData($uid); foreach ($recips as $recip) { logger("Send updated profile data for user ".$uid." to contact ".$recip["id"], LOGGER_DEBUG);