* @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;
+use Friendica\Core\System;
use Friendica\Core\Config;
require_once 'include/items.php';
*/
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");
$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);
}
$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));
$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);
}
}
+ // Process item retractions. This has to be done separated from the other stuff,
+ // since retractions for comments could come even from non followers.
+ if (!empty($fields) && in_array($fields->getName(), array('retraction'))) {
+ $target = notags(unxmlify($fields->target_type));
+ if (in_array($target, array("Comment", "Like", "Post", "Reshare", "StatusMessage"))) {
+ logger('processing retraction for '.$target, LOGGER_DEBUG);
+ $importer = array("uid" => 0, "page-flags" => PAGE_FREELOVE);
+ $message_id = self::dispatch($importer, $msg, $fields);
+ return $message_id;
+ }
+ }
+
// Now distribute it to the followers
$r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN
(SELECT `contact`.`uid` FROM `contact` WHERE `contact`.`network` = '%s' AND `contact`.`addr` = '%s')
*/
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);
if (dbm::is_result($r)) {
return $r[0];
} else {
- // We haven't found it?
- // We use another function for it that will possibly create a contact entry
+ /*
+ * We haven't found it?
+ * We use another function for it that will possibly create a contact entry.
+ */
$cid = get_contact($handle, $uid);
if ($cid > 0) {
+ /// @TODO Contact retrieval should be encapsulated into an "entity" class like `Contact`
$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", intval($cid));
if (dbm::is_result($r)) {
*/
private static function post_allow($importer, $contact, $is_comment = false) {
- // perhaps we were already sharing with this person. Now they're sharing with us.
- // That makes us friends.
- // Normally this should have handled by getting a request - but this could get lost
+ /*
+ * Perhaps we were already sharing with this person. Now they're sharing with us.
+ * That makes us friends.
+ * Normally this should have handled by getting a request - but this could get lost
+ */
if ($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) {
- q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d",
- intval(CONTACT_IS_FRIEND),
- intval($contact["id"]),
- intval($importer["uid"])
- );
+ dba::update('contact', array('rel' => CONTACT_IS_FRIEND, 'writable' => true),
+ array('id' => $contact["id"], 'uid' => $contact["uid"]));
+
$contact["rel"] = CONTACT_IS_FRIEND;
logger("defining user ".$contact["nick"]." as friend");
}
// We don't seem to like that person
if ($contact["blocked"] || $contact["readonly"] || $contact["archive"]) {
+ // Maybe blocked, don't accept.
return false;
- // We are following this person? Then it is okay
+ // We are following this person?
} elseif (($contact["rel"] == CONTACT_IS_SHARING) || ($contact["rel"] == CONTACT_IS_FRIEND)) {
+ // Yes, then it is fine.
return true;
- // Is it a post to a community? That's good
+ // Is it a post to a community?
} elseif (($contact["rel"] == CONTACT_IS_FOLLOWER) && ($importer["page-flags"] == PAGE_COMMUNITY)) {
+ // That's good
return true;
- }
- // Messages for the global users and comments are always accepted
- if (($importer["uid"] == 0) || $is_comment) {
+ // Is the message a global user or a comment?
+ } elseif (($importer["uid"] == 0) || $is_comment) {
+ // Messages for the global users and comments are always accepted
return true;
}
* @param array $item The item array
*/
private static function fetch_guid($item) {
+ $expression = "=diaspora://.*?/post/([0-9A-Za-z\-_@.:]{15,254}[0-9A-Za-z])=ism";
+ preg_replace_callback($expression,
+ function ($match) use ($item) {
+ return self::fetch_guid_sub($match, $item);
+ }, $item["body"]);
+
preg_replace_callback("&\[url=/posts/([^\[\]]*)\](.*)\[\/url\]&Usi",
- function ($match) use ($item){
- return(self::fetch_guid_sub($match, $item));
- },$item["body"]);
+ function ($match) use ($item) {
+ return self::fetch_guid_sub($match, $item);
+ }, $item["body"]);
}
/**
*
* @return the replaced string
*/
- public function replace_people_guid($body, $author_link) {
+ public static function replace_people_guid($body, $author_link) {
$return = preg_replace_callback("&\[url=/people/([^\[\]]*)\](.*)\[\/url\]&Usi",
function ($match) use ($author_link) {
// $match
return false;
}
- $source_xml = parse_xml_string($x, false);
+ $source_xml = parse_xml_string($x);
if (!is_object($source_xml))
return false;
* @return array the item record
*/
private static function parent_item($uid, $guid, $author, $contact) {
- $r = q("SELECT `id`, `body`, `wall`, `uri`, `private`, `origin`,
+ $r = q("SELECT `id`, `parent`, `body`, `wall`, `uri`, `guid`, `private`, `origin`,
`author-name`, `author-link`, `author-avatar`,
`owner-name`, `owner-link`, `owner-avatar`
FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
*
* @return string the post link
*/
- private static function plink($addr, $guid) {
+ private static function plink($addr, $guid, $parent_guid = '') {
$r = q("SELECT `url`, `nick`, `network` FROM `fcontact` WHERE `addr`='%s' LIMIT 1", dbesc($addr));
// Fallback
- if (!$r)
- return "https://".substr($addr,strpos($addr,"@")+1)."/posts/".$guid;
+ if (!dbm::is_result($r)) {
+ if ($parent_guid != '') {
+ return "https://".substr($addr,strpos($addr,"@") + 1)."/posts/".$parent_guid."#".$guid;
+ } else {
+ return "https://".substr($addr,strpos($addr,"@") + 1)."/posts/".$guid;
+ }
+ }
// Friendica contacts are often detected as Diaspora contacts in the "fcontact" table
// So we try another way as well.
$s = q("SELECT `network` FROM `gcontact` WHERE `nurl`='%s' LIMIT 1", dbesc(normalise_link($r[0]["url"])));
- if ($s)
+ if (dbm::is_result($s)) {
$r[0]["network"] = $s[0]["network"];
+ }
- if ($r[0]["network"] == NETWORK_DFRN)
- return(str_replace("/profile/".$r[0]["nick"]."/", "/display/".$guid, $r[0]["url"]."/"));
+ if ($r[0]["network"] == NETWORK_DFRN) {
+ return str_replace("/profile/".$r[0]["nick"]."/", "/display/".$guid, $r[0]["url"]."/");
+ }
- if (self::is_redmatrix($r[0]["url"]))
+ if (self::is_redmatrix($r[0]["url"])) {
return $r[0]["url"]."/?f=&mid=".$guid;
+ }
- return "https://".substr($addr,strpos($addr,"@")+1)."/posts/".$guid;
+ if ($parent_guid != '') {
+ return "https://".substr($addr,strpos($addr,"@")+1)."/posts/".$parent_guid."#".$guid;
+ } else {
+ return "https://".substr($addr,strpos($addr,"@")+1)."/posts/".$guid;
+ }
}
/**
$datarray["changed"] = $datarray["created"] = $datarray["edited"] = $created_at;
+ $datarray["plink"] = self::plink($author, $guid, $parent_item['guid']);
+
$body = diaspora2bb($text);
$datarray["body"] = self::replace_people_guid($body, $person["url"]);
// Formerly we stored the signed text, the signature and the author in different fields.
// We now store the raw data so that we are more flexible.
- q("INSERT INTO `sign` (`iid`,`signed_text`) VALUES (%d,'%s')",
- intval($message_id),
- dbesc(json_encode($data))
- );
+ 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);
$person = self::person_by_handle($msg_author);
+ dba::lock('mail');
+
$r = q("SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
dbesc($msg_guid),
intval($importer["uid"])
dbesc($msg_created_at)
);
- q("UPDATE `conv` SET `updated` = '%s' WHERE `id` = %d",
- dbesc(datetime_convert()),
- intval($conversation["id"])
- );
+ dba::unlock();
+
+ dba::update('conv', array('updated' => datetime_convert()), array('id' => $conversation["id"]));
notification(array(
"type" => NOTIFY_MAIL,
$ulink = "[url=".$contact["url"]."]".$contact["name"]."[/url]";
$alink = "[url=".$parent_item["author-link"]."]".$parent_item["author-name"]."[/url]";
- $plink = "[url=".App::get_baseurl()."/display/".urlencode($guid)."]".t("status")."[/url]";
+ $plink = "[url=".System::baseUrl()."/display/".urlencode($guid)."]".t("status")."[/url]";
return sprintf($bodyverb, $ulink, $alink, $plink);
}
*/
private static function construct_like_object($importer, $parent_item) {
$objtype = ACTIVITY_OBJ_NOTE;
- $link = '<link rel="alternate" type="text/html" href="'.App::get_baseurl()."/display/".$importer["nickname"]."/".$parent_item["id"].'" />';
+ $link = '<link rel="alternate" type="text/html" href="'.System::baseUrl()."/display/".$importer["nickname"]."/".$parent_item["id"].'" />';
$parent_body = $parent_item["body"];
$xmldata = array("object" => array("type" => $objtype,
logger("Stored like ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG);
}
+ // like on comments have the comment as parent. So we need to fetch the toplevel parent
+ if ($parent_item["id"] != $parent_item["parent"]) {
+ $toplevel = dba::select('item', array('origin'), array('id' => $parent_item["parent"]), array('limit' => 1));
+ $origin = $toplevel["origin"];
+ } else {
+ $origin = $parent_item["origin"];
+ }
+
// If we are the origin of the parent we store the original data and notify our followers
- if ($message_id && $parent_item["origin"]) {
+ if ($message_id && $origin) {
// Formerly we stored the signed text, the signature and the author in different fields.
// We now store the raw data so that we are more flexible.
- q("INSERT INTO `sign` (`iid`,`signed_text`) VALUES (%d,'%s')",
- intval($message_id),
- dbesc(json_encode($data))
- );
+ 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);
return false;
}
+ $body = diaspora2bb($text);
+
+ $body = self::replace_people_guid($body, $person["url"]);
+
+ dba::lock('mail');
+
$r = q("SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
dbesc($guid),
intval($importer["uid"])
return false;
}
- $body = diaspora2bb($text);
-
- $body = self::replace_people_guid($body, $person["url"]);
-
q("INSERT INTO `mail` (`uid`, `guid`, `convid`, `from-name`,`from-photo`,`from-url`,`contact-id`,`title`,`body`,`seen`,`reply`,`uri`,`parent-uri`,`created`)
VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s','%s','%s')",
intval($importer["uid"]),
dbesc($created_at)
);
- q("UPDATE `conv` SET `updated` = '%s' WHERE `id` = %d",
- dbesc(datetime_convert()),
- intval($conversation["id"])
- );
+ dba::unlock();
+ dba::update('conv', array('updated' => datetime_convert()), array('id' => $conversation["id"]));
return true;
}
$a = get_app();
- if ($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) {
- q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d",
- intval(CONTACT_IS_FRIEND),
- intval($contact["id"]),
- intval($importer["uid"])
- );
+ if ($contact["rel"] == CONTACT_IS_SHARING) {
+ dba::update('contact', array('rel' => CONTACT_IS_FRIEND, 'writable' => true),
+ array('id' => $contact["id"], 'uid' => $importer["uid"]));
}
// send notification
// perhaps we were already sharing with this person. Now they're sharing with us.
// That makes us friends.
if ($contact) {
- if ($following && $sharing) {
- logger("Author ".$author." (Contact ".$contact["id"].") wants to have a bidirectional conection.", LOGGER_DEBUG);
+ if ($following) {
+ logger("Author ".$author." (Contact ".$contact["id"].") wants to follow us.", LOGGER_DEBUG);
self::receive_request_make_friend($importer, $contact);
// refetch the contact array
// If we are now friends, we are sending a share message.
// Normally we needn't to do so, but the first message could have been vanished.
- if (in_array($contact["rel"], array(CONTACT_IS_FRIEND, CONTACT_IS_FOLLOWER))) {
+ if (in_array($contact["rel"], array(CONTACT_IS_FRIEND))) {
$u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer["uid"]));
if ($u) {
logger("Sending share message to author ".$author." - Contact: ".$contact["id"]." - User: ".$importer["uid"], LOGGER_DEBUG);
}
}
return true;
- } else { /// @todo Handle all possible variations of adding and retracting of permissions
- logger("Author ".$author." (Contact ".$contact["id"].") wants to change the relationship: Following: ".$following." - sharing: ".$sharing. "(By now unsupported)", LOGGER_DEBUG);
- return false;
+ } else {
+ logger("Author ".$author." doesn't want to follow us anymore.", LOGGER_DEBUG);
+ lose_follower($importer, $contact);
+ return true;
}
}
// 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"]);
return false;
}
- $orig_url = App::get_baseurl()."/display/".$original_item["guid"];
+ $orig_url = System::baseUrl()."/display/".$original_item["guid"];
$datarray = array();
return false;
}
- if (!isset($contact["url"])) {
+ if (empty($contact["url"])) {
$contact["url"] = $person["url"];
}
- $r = q("SELECT `id`, `parent`, `parent-uri`, `author-link` FROM `item` WHERE `guid` = '%s' AND `uid` = %d AND NOT `file` LIKE '%%[%%' LIMIT 1",
- dbesc($target_guid),
- intval($importer["uid"])
- );
- if (!$r) {
- logger("Target guid ".$target_guid." was not found for user ".$importer["uid"]);
+ // Fetch items that are about to be deleted
+ $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) {
+ $condition = array("`guid` = ? AND NOT `file` LIKE '%%[%%' AND NOT `deleted`", $target_guid);
+ } else {
+ $condition = array("`guid` = ? AND `uid` = ? AND NOT `file` LIKE '%%[%%' AND NOT `deleted`", $target_guid, $importer['uid']);
+ }
+ $r = dba::select('item', $fields, $condition);
+ if (!dbm::is_result($r)) {
+ logger("Target guid ".$target_guid." was not found on this system for user ".$importer['uid'].".");
return false;
}
- // Check if the sender is the thread owner
- $p = q("SELECT `id`, `author-link`, `origin` FROM `item` WHERE `id` = %d",
- intval($r[0]["parent"]));
+ while ($item = dba::fetch($r)) {
+ // Fetch the parent item
+ $parent = dba::select('item', array('author-link', 'origin'), array('id' => $item["parent"]), array('limit' => 1));
- // Only delete it if the parent author really fits
- if (!link_compare($p[0]["author-link"], $contact["url"]) && !link_compare($r[0]["author-link"], $contact["url"])) {
- logger("Thread author ".$p[0]["author-link"]." and item author ".$r[0]["author-link"]." don't fit to expected contact ".$contact["url"], LOGGER_DEBUG);
- return false;
- }
+ // Only delete it if the parent author really fits
+ if (!link_compare($parent["author-link"], $contact["url"]) && !link_compare($item["author-link"], $contact["url"])) {
+ logger("Thread author ".$parent["author-link"]." and item author ".$item["author-link"]." don't fit to expected contact ".$contact["url"], LOGGER_DEBUG);
+ continue;
+ }
- // Currently we don't have a central deletion function that we could use in this case. The function "item_drop" doesn't work for that case
- q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s', `body` = '' , `title` = '' WHERE `id` = %d",
- dbesc(datetime_convert()),
- dbesc(datetime_convert()),
- intval($r[0]["id"])
- );
- delete_thread($r[0]["id"], $r[0]["parent-uri"]);
+ // Currently we don't have a central deletion function that we could use in this case. The function "item_drop" doesn't work for that case
+ dba::update('item', array('deleted' => true, 'title' => '', 'body' => '',
+ 'edited' => datetime_convert(), 'changed' => datetime_convert()),
+ array('id' => $item["id"]));
- logger("Deleted target ".$target_guid." (".$r[0]["id"].") from user ".$importer["uid"]." parent: ".$p[0]["id"], LOGGER_DEBUG);
+ // Delete the thread - if it is a starting post and not a comment
+ if ($target_type != 'Comment') {
+ delete_thread($item["id"], $item["parent-uri"]);
+ }
- // Now check if the retraction needs to be relayed by us
- if ($p[0]["origin"]) {
- // notify others
- proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $r[0]["id"]);
+ logger("Deleted target ".$target_guid." (".$item["id"].") from user ".$item["uid"]." parent: ".$item["parent"], LOGGER_DEBUG);
+
+ // 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"]);
+ }
}
return true;
$nick = $contact["nick"];
}
- return $nick."@".substr(App::get_baseurl(), strpos(App::get_baseurl(),"://") + 3);
+ return $nick."@".substr(System::baseUrl(), strpos(System::baseUrl(),"://") + 3);
}
- /**
- * @brief Creates the envelope for the "fetch" endpoint
- *
- * @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);
- $data = str_replace(array("\n", "\r", " ", "\t"), array("", "", "", ""), $b64url_data);
-
- $key_id = base64url_encode(self::my_handle($user));
- $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, $user["prvkey"]);
- $sig = base64url_encode($signature);
-
- $xmldata = array("me:env" => array("me:data" => $data,
- "@attributes" => array("type" => $type),
- "me:encoding" => $encoding,
- "me:alg" => $alg,
- "me:sig" => $sig,
- "@attributes2" => array("key_id" => $key_id)));
-
- $namespaces = array("me" => "http://salmon-protocol.org/ns/magic-env");
-
- return xml::from_array($xmldata, $xml, false, $namespaces);
- }
/**
- * @brief Creates the envelope for a public message
+ * @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 string $prvkey The private key of the sender
* @param string $pubkey The public key of the receiver
*
- * @return string The envelope
+ * @return string The encrypted data
*/
- private static function build_public_message($msg, $user, $contact, $prvkey, $pubkey) {
+ public static function encode_private_data($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";
+ // without a public key nothing will work
+ if (!$pubkey) {
+ logger("pubkey missing: contact id: ".$contact["id"]);
+ return false;
+ }
- $signable_data = $data.".".base64url_encode($type).".".base64url_encode($encoding).".".base64url_encode($alg);
+ $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);
- $signature = rsa_sign($signable_data,$prvkey);
- $sig = base64url_encode($signature);
+ $ciphertext = self::aes_encrypt($aes_key, $iv, $msg);
- $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)));
+ $json = json_encode(array("iv" => $b_iv, "key" => $b_aes_key));
- $namespaces = array("" => "https://joindiaspora.com/protocol",
- "me" => "http://salmon-protocol.org/ns/magic-env");
+ $encrypted_key_bundle = "";
+ openssl_public_encrypt($json, $encrypted_key_bundle, $pubkey);
- $magic_env = xml::from_array($xmldata, $xml, false, $namespaces);
+ $json_object = json_encode(array("aes_key" => base64_encode($encrypted_key_bundle),
+ "encrypted_magic_envelope" => base64_encode($ciphertext)));
- logger("magic_env: ".$magic_env, LOGGER_DATA);
- return $magic_env;
+ return $json_object;
}
/**
- * @brief Creates the envelope for a private message
+ * @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
- * @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);
-
+ public static function build_magic_envelope($msg, $user) {
- $b64url_data = base64url_encode($b64_data);
+ $b64url_data = base64url_encode($msg);
$data = str_replace(array("\n", "\r", " ", "\t"), array("", "", "", ""), $b64url_data);
+ $key_id = base64url_encode(self::my_handle($user));
$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);
+ // Fallback if the private key wasn't transmitted in the expected field
+ if ($user['uprvkey'] == "")
+ $user['uprvkey'] = $user['prvkey'];
- $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)));
+ $signature = rsa_sign($signable_data, $user["uprvkey"]);
+ $sig = base64url_encode($signature);
- $namespaces = array("" => "https://joindiaspora.com/protocol",
- "me" => "http://salmon-protocol.org/ns/magic-env");
+ $xmldata = array("me:env" => array("me:data" => $data,
+ "@attributes" => array("type" => $type),
+ "me:encoding" => $encoding,
+ "me:alg" => $alg,
+ "me:sig" => $sig,
+ "@attributes2" => array("key_id" => $key_id)));
- $magic_env = xml::from_array($xmldata, $xml, false, $namespaces);
+ $namespaces = array("me" => "http://salmon-protocol.org/ns/magic-env");
- logger("magic_env: ".$magic_env, LOGGER_DATA);
- return $magic_env;
+ return xml::from_array($xmldata, $xml, false, $namespaces);
}
/**
*/
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 ($public)
- $magic_env = self::build_public_message($msg,$user,$contact,$prvkey,$pubkey);
- else
- $magic_env = self::build_private_message($msg,$user,$contact,$prvkey,$pubkey);
+ // 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);
+ }
- // The data that will be transmitted is double encoded via "urlencode", strange ...
- $slap = "xml=".urlencode(urlencode($magic_env));
- return $slap;
+ return $envelope;
}
/**
*
* @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();
$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");
$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);
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);
*
* @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"
+ * 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;
+ }
+ */
- /// @todo support the different possible combinations of "following" and "sharing"
$message = array("author" => self::my_handle($owner),
"recipient" => $contact["addr"],
"following" => "true",
*
* @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);
}
/**
$itemaddr = self::handle_from_contact($item["contact-id"], $item["gcontact-id"]);
$msg_type = "retraction";
- $target_type = "Post";
+
+ if ($item['id'] == $item['parent']) {
+ $target_type = "Post";
+ } elseif ($item["verb"] == ACTIVITY_LIKE) {
+ $target_type = "Like";
+ } else {
+ $target_type = "Comment";
+ }
$message = array("author" => $itemaddr,
"target_guid" => $item['guid'],
$first = ((strpos($profile['name'],' ')
? trim(substr($profile['name'],0,strpos($profile['name'],' '))) : $profile['name']));
$last = (($first === $profile['name']) ? '' : trim(substr($profile['name'], strlen($first))));
- $large = App::get_baseurl().'/photo/custom/300/'.$profile['uid'].'.jpg';
- $medium = App::get_baseurl().'/photo/custom/100/'.$profile['uid'].'.jpg';
- $small = App::get_baseurl().'/photo/custom/50/' .$profile['uid'].'.jpg';
+ $large = System::baseUrl().'/photo/custom/300/'.$profile['uid'].'.jpg';
+ $medium = System::baseUrl().'/photo/custom/100/'.$profile['uid'].'.jpg';
+ $small = System::baseUrl().'/photo/custom/50/' .$profile['uid'].'.jpg';
$searchable = (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false');
if ($searchable === 'true') {
* Now store the signature more flexible to dynamically support new fields.
* This will break Diaspora compatibility with Friendica versions prior to 3.5.
*/
- q("INSERT INTO `sign` (`iid`,`signed_text`) VALUES (%d,'%s')",
- intval($message_id),
- dbesc(json_encode($message))
- );
+ dba::insert('sign', array('iid' => $post_id, 'signed_text' => json_encode($message)));
logger('Stored diaspora like signature');
return true;
* Now store the signature more flexible to dynamically support new fields.
* This will break Diaspora compatibility with Friendica versions prior to 3.5.
*/
- q("INSERT INTO `sign` (`iid`, `signed_text`) VALUES (%d, '%s')",
- intval($message_id),
- dbesc(json_encode($message))
- );
+ dba::insert('sign', array('iid' => $message_id, 'signed_text' => json_encode($message)));
logger('Stored diaspora comment signature');
return true;
projects / friendica.git / blobdiff