From 648249500116ea0ce9484b15f73c1440fd3bf5c8 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 15 Jun 2017 20:50:53 +0000 Subject: [PATCH 1/8] We now use the new Diaspora format while sending --- include/diaspora.php | 81 +++++++++++++++++++++++++++----------------- 1 file changed, 50 insertions(+), 31 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index 62c77f5b2..49871fb59 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -29,6 +29,8 @@ require_once 'include/cache.php'; */ class Diaspora { + private static $new = false; + /** * @brief Return a list of relay servers * @@ -2949,7 +2951,11 @@ class Diaspora { */ public static function build_post_xml($type, $message) { - $data = array("XML" => array("post" => array($type => $message))); + if (!self::$new) { + $data = array("XML" => array("post" => array($type => $message))); + } else { + $data = array($type => $message); + } return xml::from_array($data, $xml); } @@ -3193,6 +3199,8 @@ class Diaspora { */ public static function build_status($item, $owner) { + self::$new = true; + $cachekey = "diaspora:build_status:".$item['guid']; $result = Cache::get($cachekey); @@ -3206,15 +3214,17 @@ class Diaspora { $created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d\TH:i:s\Z'); + //self::$new = Config::get('system', 'new_diaspora', null, true); + // Detect a share element and do a reshare if (!$item['private'] && ($ret = self::is_reshare($item["body"]))) { - $message = array("root_diaspora_id" => $ret["root_handle"], - "root_guid" => $ret["root_guid"], + $message = array("author" => $myaddr, "guid" => $item["guid"], - "diaspora_handle" => $myaddr, - "public" => $public, "created_at" => $created, - "provider_display_name" => $item["app"]); + "root_author" => $ret["root_handle"], + "root_guid" => $ret["root_guid"], + "provider_display_name" => $item["app"], + "public" => $public); $type = "reshare"; } else { @@ -3248,13 +3258,13 @@ class Diaspora { $location["lng"] = $coord[1]; } - $message = array("raw_message" => $body, - "location" => $location, + $message = array("author" => $myaddr, "guid" => $item["guid"], - "diaspora_handle" => $myaddr, - "public" => $public, "created_at" => $created, - "provider_display_name" => $item["app"]); + "public" => $public, + "text" => $body, + "provider_display_name" => $item["app"], + "location" => $location); // Diaspora rejects messages when they contain a location without "lat" or "lng" if (!isset($location["lat"]) || !isset($location["lng"])) { @@ -3267,7 +3277,7 @@ class Diaspora { $message['event'] = $event; /// @todo Once Diaspora supports it, we will remove the body - // $message['raw_message'] = ''; + // $message['text'] = ''; } } @@ -3308,6 +3318,8 @@ class Diaspora { */ private static function construct_like($item, $owner) { + self::$new = true; + $p = q("SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($item["thr-parent"])); if (!dbm::is_result($p)) @@ -3322,12 +3334,12 @@ class Diaspora { $positive = "false"; } - return(array("positive" => $positive, + return(array("author" => self::my_handle($owner), "guid" => $item["guid"], - "target_type" => $target_type, "parent_guid" => $parent["guid"], - "author_signature" => "", - "diaspora_handle" => self::my_handle($owner))); + "parent_type" => $target_type, + "positive" => $positive, + "author_signature" => "")); } /** @@ -3340,6 +3352,8 @@ class Diaspora { */ private static function construct_attend($item, $owner) { + self::$new = true; + $p = q("SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($item["thr-parent"])); if (!dbm::is_result($p)) @@ -3379,6 +3393,8 @@ class Diaspora { */ private static function construct_comment($item, $owner) { + self::$new = true; + $cachekey = "diaspora:construct_comment:".$item['guid']; $result = Cache::get($cachekey); @@ -3399,12 +3415,12 @@ class Diaspora { $text = html_entity_decode(bb2diaspora($item["body"])); $created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d\TH:i:s\Z'); - $comment = array("guid" => $item["guid"], + $comment = array("author" => self::my_handle($owner), + "guid" => $item["guid"], + "created_at" => $created, "parent_guid" => $parent["guid"], - "author_signature" => "", "text" => $text, - /// @todo Currently disabled until Diaspora supports it: "created_at" => $created, - "diaspora_handle" => self::my_handle($owner)); + "author_signature" => ""); // Send the thread parent guid only if it is a threaded comment if ($item['thr-parent'] != $item['parent-uri']) { @@ -3612,6 +3628,8 @@ class Diaspora { */ public static function send_mail($item, $owner, $contact) { + self::$new = true; + $myaddr = self::my_handle($owner); $r = q("SELECT * FROM `conv` WHERE `id` = %d AND `uid` = %d LIMIT 1", @@ -3626,11 +3644,11 @@ class Diaspora { $cnv = $r[0]; $conv = array( + "author" => $cnv["creator"], "guid" => $cnv["guid"], "subject" => $cnv["subject"], "created_at" => datetime_convert("UTC", "UTC", $cnv['created'], 'Y-m-d\TH:i:s\Z'), - "diaspora_handle" => $cnv["creator"], - "participant_handles" => $cnv["recips"] + "participants" => $cnv["recips"] ); $body = bb2diaspora($item["body"]); @@ -3640,26 +3658,27 @@ class Diaspora { $sig = base64_encode(rsa_sign($signed_text, $owner["uprvkey"], "sha256")); $msg = array( + "author" => $myaddr, "guid" => $item["guid"], - "parent_guid" => $cnv["guid"], - "parent_author_signature" => $sig, - "author_signature" => $sig, + "conversation_guid" => $cnv["guid"], "text" => $body, "created_at" => $created, - "diaspora_handle" => $myaddr, - "conversation_guid" => $cnv["guid"] + //"parent_guid" => $cnv["guid"], + //"parent_author_signature" => $sig, + //"author_signature" => $sig, ); if ($item["reply"]) { $message = $msg; $type = "message"; } else { - $message = array("guid" => $cnv["guid"], + $message = array( + "author" => $cnv["creator"], + "guid" => $cnv["guid"], "subject" => $cnv["subject"], "created_at" => datetime_convert("UTC", "UTC", $cnv['created'], 'Y-m-d\TH:i:s\Z'), - "message" => $msg, - "diaspora_handle" => $cnv["creator"], - "participant_handles" => $cnv["recips"]); + "participants" => $cnv["recips"], + "message" => $msg); $type = "conversation"; } From f36ffe3c0329958aa4fe190d528207301c0058e7 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 15 Jun 2017 21:20:18 +0000 Subject: [PATCH 2/8] Just some more message types --- include/diaspora.php | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index 49871fb59..ff3caa574 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -2501,7 +2501,8 @@ class Diaspora { switch ($target_type) { case "Comment": case "Like": - case "Post": // "Post" will be supported in a future version + case "Post": + return self::item_retraction($importer, $contact, $data); case "Reshare": case "StatusMessage": return self::item_retraction($importer, $contact, $data); @@ -3024,9 +3025,11 @@ class Diaspora { */ public static function send_unshare($owner,$contact) { - $message = array("post_guid" => $owner["guid"], - "diaspora_handle" => self::my_handle($owner), - "type" => "Person"); + self::$new = true; + + $message = array("author" => self::my_handle($owner), + "target_guid" => $owner["guid"], + "target_type" => "Person"); logger("Send unshare ".print_r($message, true), LOGGER_DEBUG); @@ -3589,28 +3592,16 @@ class Diaspora { */ public static function send_retraction($item, $owner, $contact, $public_batch = false, $relay = false) { + self::$new = true; + $itemaddr = self::handle_from_contact($item["contact-id"], $item["gcontact-id"]); - // Check whether the retraction is for a top-level post or whether it's a relayable - if ($item["uri"] !== $item["parent-uri"]) { - $msg_type = "relayable_retraction"; - $target_type = (($item["verb"] === ACTIVITY_LIKE) ? "Like" : "Comment"); - } else { - $msg_type = "signed_retraction"; - $target_type = "StatusMessage"; - } + $msg_type = "retraction"; + $target_type = "Post"; - if ($relay && ($item["uri"] !== $item["parent-uri"])) - $signature = "parent_author_signature"; - else - $signature = "target_author_signature"; - - $signed_text = $item["guid"].";".$target_type; - - $message = array("target_guid" => $item['guid'], - "target_type" => $target_type, - "sender_handle" => $itemaddr, - $signature => base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256'))); + $message = array("author" => $itemaddr, + "target_guid" => $item['guid'], + "target_type" => $target_type); logger("Got message ".print_r($message, true), LOGGER_DEBUG); From a453ae4f66319eda31487d49db7f7ae1b3e65fd0 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 15 Jun 2017 21:45:36 +0000 Subject: [PATCH 3/8] Removed unneeded stuff --- include/diaspora.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index ff3caa574..a134c5e25 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -2502,7 +2502,6 @@ class Diaspora { case "Comment": case "Like": case "Post": - return self::item_retraction($importer, $contact, $data); case "Reshare": case "StatusMessage": return self::item_retraction($importer, $contact, $data); @@ -3645,18 +3644,12 @@ class Diaspora { $body = bb2diaspora($item["body"]); $created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d\TH:i:s\Z'); - $signed_text = $item["guid"].";".$cnv["guid"].";".$body.";".$created.";".$myaddr.";".$cnv['guid']; - $sig = base64_encode(rsa_sign($signed_text, $owner["uprvkey"], "sha256")); - $msg = array( "author" => $myaddr, "guid" => $item["guid"], "conversation_guid" => $cnv["guid"], "text" => $body, "created_at" => $created, - //"parent_guid" => $cnv["guid"], - //"parent_author_signature" => $sig, - //"author_signature" => $sig, ); if ($item["reply"]) { From 0dc1c932f8e403fc64c390b5887598758719fd3f Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 16 Jun 2017 05:21:25 +0000 Subject: [PATCH 4/8] We now should send all data in the new format --- include/diaspora.php | 71 +++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 43 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index a134c5e25..6b899a279 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -29,8 +29,6 @@ require_once 'include/cache.php'; */ class Diaspora { - private static $new = false; - /** * @brief Return a list of relay servers * @@ -2843,6 +2841,8 @@ class Diaspora { */ private static function build_message($msg, $user, $contact, $prvkey, $pubkey, $public = false) { + //$new = Config::get('system', 'new_diaspora', null, true); + if ($public) $magic_env = self::build_public_message($msg,$user,$contact,$prvkey,$pubkey); else @@ -2951,11 +2951,8 @@ class Diaspora { */ public static function build_post_xml($type, $message) { - if (!self::$new) { - $data = array("XML" => array("post" => array($type => $message))); - } else { - $data = array($type => $message); - } + $data = array($type => $message); + return xml::from_array($data, $xml); } @@ -3006,12 +3003,15 @@ class Diaspora { */ public static function send_share($owner,$contact) { - $message = array("sender_handle" => self::my_handle($owner), - "recipient_handle" => $contact["addr"]); + /// @todo support the different possible combinations of "following" and "sharing" + $message = array("author" => self::my_handle($owner), + "recipient" => $contact["addr"], + "following" => "true", + "sharing" => "true"); logger("Send share ".print_r($message, true), LOGGER_DEBUG); - return self::build_and_transmit($owner, $contact, "request", $message); + return self::build_and_transmit($owner, $contact, "contact", $message); } /** @@ -3024,8 +3024,6 @@ class Diaspora { */ public static function send_unshare($owner,$contact) { - self::$new = true; - $message = array("author" => self::my_handle($owner), "target_guid" => $owner["guid"], "target_type" => "Person"); @@ -3201,8 +3199,6 @@ class Diaspora { */ public static function build_status($item, $owner) { - self::$new = true; - $cachekey = "diaspora:build_status:".$item['guid']; $result = Cache::get($cachekey); @@ -3216,8 +3212,6 @@ class Diaspora { $created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d\TH:i:s\Z'); - //self::$new = Config::get('system', 'new_diaspora', null, true); - // Detect a share element and do a reshare if (!$item['private'] && ($ret = self::is_reshare($item["body"]))) { $message = array("author" => $myaddr, @@ -3320,8 +3314,6 @@ class Diaspora { */ private static function construct_like($item, $owner) { - self::$new = true; - $p = q("SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($item["thr-parent"])); if (!dbm::is_result($p)) @@ -3354,8 +3346,6 @@ class Diaspora { */ private static function construct_attend($item, $owner) { - self::$new = true; - $p = q("SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($item["thr-parent"])); if (!dbm::is_result($p)) @@ -3395,8 +3385,6 @@ class Diaspora { */ private static function construct_comment($item, $owner) { - self::$new = true; - $cachekey = "diaspora:construct_comment:".$item['guid']; $result = Cache::get($cachekey); @@ -3479,19 +3467,17 @@ class Diaspora { $signed_parts = explode(";", $signature['signed_text']); if ($item["deleted"]) - $message = array("parent_author_signature" => "", + $message = array("author" => $signature['signer'], "target_guid" => $signed_parts[0], - "target_type" => $signed_parts[1], - "sender_handle" => $signature['signer'], - "target_author_signature" => $signature['signature']); + "target_type" => $signed_parts[1]); elseif ($item['verb'] === ACTIVITY_LIKE) - $message = array("positive" => $signed_parts[0], + $message = array("author" => $signed_parts[4], "guid" => $signed_parts[1], - "target_type" => $signed_parts[2], "parent_guid" => $signed_parts[3], - "parent_author_signature" => "", + "parent_type" => $signed_parts[2], + "positive" => $signed_parts[0], "author_signature" => $signature['signature'], - "diaspora_handle" => $signed_parts[4]); + "parent_author_signature" => ""); else { // Remove the comment guid $guid = array_shift($signed_parts); @@ -3505,12 +3491,12 @@ class Diaspora { // Glue the parts together $text = implode(";", $signed_parts); - $message = array("guid" => $guid, + $message = array("author" => $handle, + "guid" => $guid, "parent_guid" => $parent_guid, - "parent_author_signature" => "", - "author_signature" => $signature['signature'], "text" => implode(";", $signed_parts), - "diaspora_handle" => $handle); + "author_signature" => $signature['signature'], + "parent_author_signature" => ""); } return $message; } @@ -3559,10 +3545,12 @@ class Diaspora { if (is_array($msg)) { foreach ($msg AS $field => $data) { if (!$item["deleted"]) { - if ($field == "author") - $field = "diaspora_handle"; - if ($field == "parent_type") - $field = "target_type"; + if ($field == "diaspora_handle") { + $field = "author"; + } + if ($field == "target_type") { + $field = "parent_type"; + } } $message[$field] = $data; @@ -3591,8 +3579,6 @@ class Diaspora { */ public static function send_retraction($item, $owner, $contact, $public_batch = false, $relay = false) { - self::$new = true; - $itemaddr = self::handle_from_contact($item["contact-id"], $item["gcontact-id"]); $msg_type = "retraction"; @@ -3618,8 +3604,6 @@ class Diaspora { */ public static function send_mail($item, $owner, $contact) { - self::$new = true; - $myaddr = self::my_handle($owner); $r = q("SELECT * FROM `conv` WHERE `id` = %d AND `uid` = %d LIMIT 1", @@ -3737,7 +3721,7 @@ class Diaspora { $tags = trim($tags); } - $message = array("diaspora_handle" => $handle, + $message = array("author" => $handle, "first_name" => $first, "last_name" => $last, "image_url" => $large, @@ -3748,6 +3732,7 @@ class Diaspora { "bio" => $about, "location" => $location, "searchable" => $searchable, + "nsfw" => "false", "tag_string" => $tags); foreach ($recips as $recip) { From c031482d7d12b6a20f2f7a17d09888f0182f01b1 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 16 Jun 2017 16:39:17 +0000 Subject: [PATCH 5/8] "unsharing" is now done different --- include/diaspora.php | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index 6b899a279..696a612bb 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -3001,9 +3001,15 @@ class Diaspora { * * @return int The result of the transmission */ - public static function send_share($owner,$contact) { + public static function send_share($owner, $contact) { /// @todo support the different possible combinations of "following" and "sharing" +/* + if (in_array($contact["rel"], array(CONTACT_IS_FRIEND, CONTACT_IS_FOLLOWER))) { + $new_relation = CONTACT_IS_FRIEND; + $new_relation = CONTACT_IS_SHARING; + $new_relation = CONTACT_IS_FOLLOWER; +*/ $message = array("author" => self::my_handle($owner), "recipient" => $contact["addr"], "following" => "true", @@ -3022,15 +3028,16 @@ class Diaspora { * * @return int The result of the transmission */ - public static function send_unshare($owner,$contact) { + public static function send_unshare($owner, $contact) { $message = array("author" => self::my_handle($owner), - "target_guid" => $owner["guid"], - "target_type" => "Person"); + "recipient" => $contact["addr"], + "following" => "false", + "sharing" => "false"); logger("Send unshare ".print_r($message, true), LOGGER_DEBUG); - return self::build_and_transmit($owner, $contact, "retraction", $message); + return self::build_and_transmit($owner, $contact, "contact", $message); } /** From 9c4bf6b0d5cd404b54695a1398265d21c6b3b3af Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 16 Jun 2017 20:57:35 +0000 Subject: [PATCH 6/8] The new envelope could work now --- include/diaspora.php | 90 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 76 insertions(+), 14 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index 696a612bb..b8462f663 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -2659,15 +2659,54 @@ class Diaspora { return $nick."@".substr(App::get_baseurl(), strpos(App::get_baseurl(),"://") + 3); } + /** - * @brief Creates the envelope for the "fetch" endpoint + * @brief Creates the data for a private message in the new format + * + * @param string $msg The message that is to be transmitted + * @param array $user The record of the sender + * @param array $contact Target of the communication + * @param string $prvkey The private key of the sender + * @param string $pubkey The public key of the receiver + * + * @return string The encrypted data + */ + public static function encode_private_data($msg, $user, $contact, $prvkey, $pubkey) { + + logger("Message: ".$msg, LOGGER_DATA); + + // without a public key nothing will work + if (!$pubkey) { + logger("pubkey missing: contact id: ".$contact["id"]); + return false; + } + + $aes_key = openssl_random_pseudo_bytes(32); + $b_aes_key = base64_encode($aes_key); + $iv = openssl_random_pseudo_bytes(16); + $b_iv = base64_encode($iv); + + $ciphertext = self::aes_encrypt($aes_key, $iv, $msg); + + $json = json_encode(array("iv" => $b_iv, "key" => $b_aes_key)); + + $encrypted_key_bundle = ""; + openssl_public_encrypt($json, $encrypted_key_bundle, $pubkey); + + $json_object = json_encode(array("aes_key" => base64_encode($encrypted_key_bundle), + "encrypted_magic_envelope" => base64_encode($ciphertext))); + + return $json_object; + } + + /** + * @brief Creates the envelope for the "fetch" endpoint and for the new format * * @param string $msg The message that is to be transmitted * @param array $user The record of the sender * * @return string The envelope */ - public static function build_magic_envelope($msg, $user) { $b64url_data = base64url_encode($msg); @@ -2841,13 +2880,22 @@ class Diaspora { */ private static function build_message($msg, $user, $contact, $prvkey, $pubkey, $public = false) { - //$new = Config::get('system', 'new_diaspora', null, true); + $new = Config::get('system', 'new_diaspora', null, true); - if ($public) - $magic_env = self::build_public_message($msg,$user,$contact,$prvkey,$pubkey); - else - $magic_env = self::build_private_message($msg,$user,$contact,$prvkey,$pubkey); + if ($new) { + if ($public) { + $msg = Diaspora::encode_private_data($msg, $user, $contact, $prvkey, $pubkey); + } + $slap = Diaspora::build_magic_envelope($msg, $user); + return $slap; + } + + if ($public) { + $magic_env = self::build_public_message($msg, $user, $contact, $prvkey, $pubkey); + } else { + $magic_env = self::build_private_message($msg, $user, $contact, $prvkey, $pubkey); + } // The data that will be transmitted is double encoded via "urlencode", strange ... $slap = "xml=".urlencode(urlencode($magic_env)); return $slap; @@ -3003,13 +3051,27 @@ class Diaspora { */ public static function send_share($owner, $contact) { - /// @todo support the different possible combinations of "following" and "sharing" -/* - if (in_array($contact["rel"], array(CONTACT_IS_FRIEND, CONTACT_IS_FOLLOWER))) { - $new_relation = CONTACT_IS_FRIEND; - $new_relation = CONTACT_IS_SHARING; - $new_relation = CONTACT_IS_FOLLOWER; -*/ + /** + * @todo support the different possible combinations of "following" and "sharing" + * Currently, Diaspora only interprets the "sharing" field + * + * Before switching this code productive, we have to check all "send_share" calls if "rel" is set correctly + */ + + /* + switch ($contact["rel"]) { + case CONTACT_IS_FRIEND: + $following = true; + $sharing = true; + case CONTACT_IS_SHARING: + $following = false; + $sharing = true; + case CONTACT_IS_FOLLOWER: + $following = true; + $sharing = false; + } + */ + $message = array("author" => self::my_handle($owner), "recipient" => $contact["addr"], "following" => "true", From 2ee8d1694f85c15bf4f331c048b7c67045db734f Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 16 Jun 2017 21:01:56 +0000 Subject: [PATCH 7/8] Added documentation --- include/diaspora.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index b8462f663..ac87bcacb 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -4,8 +4,8 @@ * @brief The implementation of the diaspora protocol * * The new protocol is described here: http://diaspora.github.io/diaspora_federation/index.html - * Currently this implementation here interprets the old and the new protocol and sends the old one. - * This will change in the future. + * This implementation here interprets the old and the new protocol and sends the new one. + * In the future we will remove most stuff from "valid_posting" and interpret only the new protocol. */ use Friendica\App; @@ -2883,7 +2883,7 @@ class Diaspora { $new = Config::get('system', 'new_diaspora', null, true); if ($new) { - if ($public) { + if (!$public) { $msg = Diaspora::encode_private_data($msg, $user, $contact, $prvkey, $pubkey); } From e33ac224b00e243601d37dd622d7c5fc3a172be3 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 17 Jun 2017 08:58:28 +0000 Subject: [PATCH 8/8] Now the Salmons flys --- include/diaspora.php | 181 ++++++------------------------------------- 1 file changed, 22 insertions(+), 159 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index ac87bcacb..671bb34ae 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -2717,7 +2717,12 @@ class Diaspora { $encoding = "base64url"; $alg = "RSA-SHA256"; $signable_data = $data.".".base64url_encode($type).".".base64url_encode($encoding).".".base64url_encode($alg); - $signature = rsa_sign($signable_data, $user["prvkey"]); + + // Fallback if the private key wasn't transmitted in the expected field + if ($user['uprvkey'] == "") + $user['uprvkey'] = $user['prvkey']; + + $signature = rsa_sign($signable_data, $user["uprvkey"]); $sig = base64url_encode($signature); $xmldata = array("me:env" => array("me:data" => $data, @@ -2732,140 +2737,6 @@ class Diaspora { return xml::from_array($xmldata, $xml, false, $namespaces); } - /** - * @brief Creates the envelope for a public message - * - * @param string $msg The message that is to be transmitted - * @param array $user The record of the sender - * @param array $contact Target of the communication - * @param string $prvkey The private key of the sender - * @param string $pubkey The public key of the receiver - * - * @return string The envelope - */ - private static function build_public_message($msg, $user, $contact, $prvkey, $pubkey) { - - logger("Message: ".$msg, LOGGER_DATA); - - $handle = self::my_handle($user); - - $b64url_data = base64url_encode($msg); - - $data = str_replace(array("\n", "\r", " ", "\t"), array("", "", "", ""), $b64url_data); - - $type = "application/xml"; - $encoding = "base64url"; - $alg = "RSA-SHA256"; - - $signable_data = $data.".".base64url_encode($type).".".base64url_encode($encoding).".".base64url_encode($alg); - - $signature = rsa_sign($signable_data,$prvkey); - $sig = base64url_encode($signature); - - $xmldata = array("diaspora" => array("header" => array("author_id" => $handle), - "me:env" => array("me:encoding" => $encoding, - "me:alg" => $alg, - "me:data" => $data, - "@attributes" => array("type" => $type), - "me:sig" => $sig))); - - $namespaces = array("" => "https://joindiaspora.com/protocol", - "me" => "http://salmon-protocol.org/ns/magic-env"); - - $magic_env = xml::from_array($xmldata, $xml, false, $namespaces); - - logger("magic_env: ".$magic_env, LOGGER_DATA); - return $magic_env; - } - - /** - * @brief Creates the envelope for a private message - * - * @param string $msg The message that is to be transmitted - * @param array $user The record of the sender - * @param array $contact Target of the communication - * @param string $prvkey The private key of the sender - * @param string $pubkey The public key of the receiver - * - * @return string The envelope - */ - private static function build_private_message($msg, $user, $contact, $prvkey, $pubkey) { - - logger("Message: ".$msg, LOGGER_DATA); - - // without a public key nothing will work - - if (!$pubkey) { - logger("pubkey missing: contact id: ".$contact["id"]); - return false; - } - - $inner_aes_key = openssl_random_pseudo_bytes(32); - $b_inner_aes_key = base64_encode($inner_aes_key); - $inner_iv = openssl_random_pseudo_bytes(16); - $b_inner_iv = base64_encode($inner_iv); - - $outer_aes_key = openssl_random_pseudo_bytes(32); - $b_outer_aes_key = base64_encode($outer_aes_key); - $outer_iv = openssl_random_pseudo_bytes(16); - $b_outer_iv = base64_encode($outer_iv); - - $handle = self::my_handle($user); - - $inner_encrypted = self::aes_encrypt($inner_aes_key, $inner_iv, $msg); - - $b64_data = base64_encode($inner_encrypted); - - - $b64url_data = base64url_encode($b64_data); - $data = str_replace(array("\n", "\r", " ", "\t"), array("", "", "", ""), $b64url_data); - - $type = "application/xml"; - $encoding = "base64url"; - $alg = "RSA-SHA256"; - - $signable_data = $data.".".base64url_encode($type).".".base64url_encode($encoding).".".base64url_encode($alg); - - $signature = rsa_sign($signable_data,$prvkey); - $sig = base64url_encode($signature); - - $xmldata = array("decrypted_header" => array("iv" => $b_inner_iv, - "aes_key" => $b_inner_aes_key, - "author_id" => $handle)); - - $decrypted_header = xml::from_array($xmldata, $xml, true); - - $ciphertext = self::aes_encrypt($outer_aes_key, $outer_iv, $decrypted_header); - - $outer_json = json_encode(array("iv" => $b_outer_iv, "key" => $b_outer_aes_key)); - - $encrypted_outer_key_bundle = ""; - openssl_public_encrypt($outer_json, $encrypted_outer_key_bundle, $pubkey); - - $b64_encrypted_outer_key_bundle = base64_encode($encrypted_outer_key_bundle); - - logger("outer_bundle: ".$b64_encrypted_outer_key_bundle." key: ".$pubkey, LOGGER_DATA); - - $encrypted_header_json_object = json_encode(array("aes_key" => base64_encode($encrypted_outer_key_bundle), - "ciphertext" => base64_encode($ciphertext))); - $cipher_json = base64_encode($encrypted_header_json_object); - - $xmldata = array("diaspora" => array("encrypted_header" => $cipher_json, - "me:env" => array("me:encoding" => $encoding, - "me:alg" => $alg, - "me:data" => $data, - "@attributes" => array("type" => $type), - "me:sig" => $sig))); - - $namespaces = array("" => "https://joindiaspora.com/protocol", - "me" => "http://salmon-protocol.org/ns/magic-env"); - - $magic_env = xml::from_array($xmldata, $xml, false, $namespaces); - - logger("magic_env: ".$magic_env, LOGGER_DATA); - return $magic_env; - } - /** * @brief Create the envelope for a message * @@ -2880,25 +2751,15 @@ class Diaspora { */ private static function build_message($msg, $user, $contact, $prvkey, $pubkey, $public = false) { - $new = Config::get('system', 'new_diaspora', null, true); + // The message is put into an envelope with the sender's signature + $envelope = self::build_magic_envelope($msg, $user); - if ($new) { - if (!$public) { - $msg = Diaspora::encode_private_data($msg, $user, $contact, $prvkey, $pubkey); - } - - $slap = Diaspora::build_magic_envelope($msg, $user); - return $slap; + // Private messages are put into a second envelope, encrypted with the receivers public key + if (!$public) { + $envelope = self::encode_private_data($envelope, $user, $contact, $prvkey, $pubkey); } - if ($public) { - $magic_env = self::build_public_message($msg, $user, $contact, $prvkey, $pubkey); - } else { - $magic_env = self::build_private_message($msg, $user, $contact, $prvkey, $pubkey); - } - // The data that will be transmitted is double encoded via "urlencode", strange ... - $slap = "xml=".urlencode(urlencode($magic_env)); - return $slap; + return $envelope; } /** @@ -2924,14 +2785,14 @@ class Diaspora { * * @param array $owner the array of the item owner * @param array $contact Target of the communication - * @param string $slap The message that is to be transmitted + * @param string $envelope The message that is to be transmitted * @param bool $public_batch Is it a public post? * @param bool $queue_run Is the transmission called from the queue? * @param string $guid message guid * * @return int Result of the transmission */ - public static function transmit($owner, $contact, $slap, $public_batch, $queue_run=false, $guid = "") { + public static function transmit($owner, $contact, $envelope, $public_batch, $queue_run=false, $guid = "") { $a = get_app(); @@ -2952,7 +2813,9 @@ class Diaspora { $return_code = 0; } else { if (!intval(get_config("system", "diaspora_test"))) { - post_url($dest_url."/", $slap); + $content_type = (($public_batch) ? "application/magic-envelope+xml" : "application/json"); + + post_url($dest_url."/", $envelope, array("Content-Type: ".$content_type)); $return_code = $a->get_curl_code(); } else { logger("test_mode"); @@ -2968,14 +2831,14 @@ class Diaspora { $r = q("SELECT `id` FROM `queue` WHERE `cid` = %d AND `network` = '%s' AND `content` = '%s' AND `batch` = %d LIMIT 1", intval($contact["id"]), dbesc(NETWORK_DIASPORA), - dbesc($slap), + dbesc($envelope), intval($public_batch) ); if ($r) { logger("add_to_queue ignored - identical item already in queue"); } else { // queue message for redelivery - add_to_queue($contact["id"], NETWORK_DIASPORA, $slap, $public_batch); + add_to_queue($contact["id"], NETWORK_DIASPORA, $envelope, $public_batch); // The message could not be delivered. We mark the contact as "dead" mark_for_death($contact); @@ -3028,13 +2891,13 @@ class Diaspora { if ($owner['uprvkey'] == "") $owner['uprvkey'] = $owner['prvkey']; - $slap = self::build_message($msg, $owner, $contact, $owner['uprvkey'], $contact['pubkey'], $public_batch); + $envelope = self::build_message($msg, $owner, $contact, $owner['uprvkey'], $contact['pubkey'], $public_batch); if ($spool) { - add_to_queue($contact['id'], NETWORK_DIASPORA, $slap, $public_batch); + add_to_queue($contact['id'], NETWORK_DIASPORA, $envelope, $public_batch); return true; } else - $return_code = self::transmit($owner, $contact, $slap, $public_batch, false, $guid); + $return_code = self::transmit($owner, $contact, $envelope, $public_batch, false, $guid); logger("guid: ".$item["guid"]." result ".$return_code, LOGGER_DEBUG);