*/
class diaspora {
- public static function fetch_relay() {
+ public static function relay_list() {
$serverdata = get_config("system", "relay_server");
if ($serverdata == "")
return $relay;
}
+ function repair_signature($signature, $handle = "", $level = 1) {
+
+ if ($signature == "")
+ return ($signature);
+
+ if (base64_encode(base64_decode(base64_decode($signature))) == base64_decode($signature)) {
+ $signature = base64_decode($signature);
+ logger("Repaired double encoded signature from Diaspora/Hubzilla handle ".$handle." - level ".$level, LOGGER_DEBUG);
+
+ // Do a recursive call to be able to fix even multiple levels
+ if ($level < 10)
+ $signature = self::repair_signature($signature, $handle, ++$level);
+ }
+
+ return($signature);
+ }
+
+ /**
+ * @brief: Decodes incoming Diaspora message
+ *
+ * @param array $importer from user table
+ * @param string $xml urldecoded Diaspora salmon
+ *
+ * @return array
+ * 'message' -> decoded Diaspora XML message
+ * 'author' -> author diaspora handle
+ * 'key' -> author public key (converted to pkcs#8)
+ */
+ function decode($importer, $xml) {
+
+ $public = false;
+ $basedom = parse_xml_string($xml);
+
+ if (!is_object($basedom))
+ return false;
+
+ $children = $basedom->children('https://joindiaspora.com/protocol');
+
+ if($children->header) {
+ $public = true;
+ $author_link = str_replace('acct:','',$children->header->author_id);
+ } else {
+
+ $encrypted_header = json_decode(base64_decode($children->encrypted_header));
+
+ $encrypted_aes_key_bundle = base64_decode($encrypted_header->aes_key);
+ $ciphertext = base64_decode($encrypted_header->ciphertext);
+
+ $outer_key_bundle = '';
+ openssl_private_decrypt($encrypted_aes_key_bundle,$outer_key_bundle,$importer['prvkey']);
+
+ $j_outer_key_bundle = json_decode($outer_key_bundle);
+
+ $outer_iv = base64_decode($j_outer_key_bundle->iv);
+ $outer_key = base64_decode($j_outer_key_bundle->key);
+
+ $decrypted = mcrypt_decrypt(MCRYPT_RIJNDAEL_128, $outer_key, $ciphertext, MCRYPT_MODE_CBC, $outer_iv);
+
+
+ $decrypted = pkcs5_unpad($decrypted);
+
+ /**
+ * $decrypted now contains something like
+ *
+ * <decrypted_header>
+ * <iv>8e+G2+ET8l5BPuW0sVTnQw==</iv>
+ * <aes_key>UvSMb4puPeB14STkcDWq+4QE302Edu15oaprAQSkLKU=</aes_key>
+ * <author_id>galaxor@diaspora.priateship.org</author_id>
+ * </decrypted_header>
+ */
+
+ logger('decrypted: '.$decrypted, LOGGER_DEBUG);
+ $idom = parse_xml_string($decrypted,false);
+
+ $inner_iv = base64_decode($idom->iv);
+ $inner_aes_key = base64_decode($idom->aes_key);
+
+ $author_link = str_replace('acct:','',$idom->author_id);
+ }
+
+ $dom = $basedom->children(NAMESPACE_SALMON_ME);
+
+ // figure out where in the DOM tree our data is hiding
+
+ if($dom->provenance->data)
+ $base = $dom->provenance;
+ elseif($dom->env->data)
+ $base = $dom->env;
+ elseif($dom->data)
+ $base = $dom;
+
+ if (!$base) {
+ logger('unable to locate salmon data in xml');
+ http_status_exit(400);
+ }
+
+
+ // Stash the signature away for now. We have to find their key or it won't be good for anything.
+ $signature = base64url_decode($base->sig);
+
+ // unpack the data
+
+ // strip whitespace so our data element will return to one big base64 blob
+ $data = str_replace(array(" ","\t","\r","\n"),array("","","",""),$base->data);
+
+
+ // stash away some other stuff for later
+
+ $type = $base->data[0]->attributes()->type[0];
+ $keyhash = $base->sig[0]->attributes()->keyhash[0];
+ $encoding = $base->encoding;
+ $alg = $base->alg;
+
+
+ $signed_data = $data.'.'.base64url_encode($type).'.'.base64url_encode($encoding).'.'.base64url_encode($alg);
+
+
+ // decode the data
+ $data = base64url_decode($data);
+
+
+ if($public)
+ $inner_decrypted = $data;
+ else {
+
+ // Decode the encrypted blob
+
+ $inner_encrypted = base64_decode($data);
+ $inner_decrypted = mcrypt_decrypt(MCRYPT_RIJNDAEL_128, $inner_aes_key, $inner_encrypted, MCRYPT_MODE_CBC, $inner_iv);
+ $inner_decrypted = pkcs5_unpad($inner_decrypted);
+ }
+
+ if (!$author_link) {
+ logger('Could not retrieve author URI.');
+ http_status_exit(400);
+ }
+ // Once we have the author URI, go to the web and try to find their public key
+ // (first this will look it up locally if it is in the fcontact cache)
+ // This will also convert diaspora public key from pkcs#1 to pkcs#8
+
+ logger('Fetching key for '.$author_link);
+ $key = self::key($author_link);
+
+ if (!$key) {
+ logger('Could not retrieve author key.');
+ http_status_exit(400);
+ }
+
+ $verify = rsa_verify($signed_data,$signature,$key);
+
+ if (!$verify) {
+ logger('Message did not verify. Discarding.');
+ http_status_exit(400);
+ }
+
+ logger('Message verified.');
+
+ return array('message' => $inner_decrypted, 'author' => $author_link, 'key' => $key);
+
+ }
+
+
/**
* @brief Dispatches public messages and find the fitting receivers
*
$type = $fields->getName();
switch ($type) {
- case "account_deletion": // Done
- //return true;
+ case "account_deletion":
return self::receive_account_deletion($importer, $fields);
- case "comment": // Done
- //return true;
+ case "comment":
return self::receive_comment($importer, $sender, $fields);
- case "conversation": // Done
- //return true;
+ case "conversation":
return self::receive_conversation($importer, $msg, $fields);
- case "like": // Done
- //return true;
+ case "like":
return self::receive_like($importer, $sender, $fields);
- case "message": // Done
- //return true;
+ case "message":
return self::receive_message($importer, $fields);
case "participation": // Not implemented
return self::receive_participation($importer, $fields);
- case "photo": // Not needed
+ case "photo": // Not implemented
return self::receive_photo($importer, $fields);
case "poll_participation": // Not implemented
return self::receive_poll_participation($importer, $fields);
- case "profile": // Done
- //return true;
+ case "profile":
return self::receive_profile($importer, $fields);
case "request":
- //return true;
return self::receive_request($importer, $fields);
- case "reshare": // Done
- //return true;
+ case "reshare":
return self::receive_reshare($importer, $fields);
- case "retraction": // Done
- //return true;
+ case "retraction":
return self::receive_retraction($importer, $sender, $fields);
- case "status_message": // Done
- //return true;
+ case "status_message":
return self::receive_status_message($importer, $fields);
default:
return false;
if (isset($parent_author_signature)) {
- $key = self::get_key($msg["author"]);
+ $key = self::key($msg["author"]);
if (!rsa_verify($signed_data, $parent_author_signature, $key, "sha256"))
return false;
}
- $key = self::get_key($fields->author);
+ $key = self::key($fields->author);
return rsa_verify($signed_data, $author_signature, $key, "sha256");
}
*
* @return string The public key
*/
- private function get_key($handle) {
+ private function key($handle) {
logger("Fetching diaspora key for: ".$handle);
- $r = self::get_person_by_handle($handle);
+ $r = self::person_by_handle($handle);
if($r)
return $r["pubkey"];
*
* @return array the queried data
*/
- private function get_person_by_handle($handle) {
+ private function person_by_handle($handle) {
$r = q("SELECT * FROM `fcontact` WHERE `network` = '%s' AND `addr` = '%s' LIMIT 1",
dbesc(NETWORK_DIASPORA),
return $r;
}
- private function get_contact_by_handle($uid, $handle) {
+ public static function handle_from_contact($contact_id) {
+ $handle = False;
+
+ logger("contact id is ".$contact_id, LOGGER_DEBUG);
+
+ $r = q("SELECT `network`, `addr`, `self`, `url`, `nick` FROM `contact` WHERE `id` = %d",
+ intval($contact_id)
+ );
+ if($r) {
+ $contact = $r[0];
+
+ logger("contact 'self' = ".$contact['self']." 'url' = ".$contact['url'], LOGGER_DEBUG);
+
+ if($contact['addr'] != "")
+ $handle = $contact['addr'];
+ elseif(($contact['network'] === NETWORK_DFRN) || ($contact['self'] == 1)) {
+ $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);
+ $handle = $contact['nick'].'@'.$baseurl;
+ }
+ }
+
+ return $handle;
+ }
+
+ private function contact_by_handle($uid, $handle) {
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `addr` = '%s' LIMIT 1",
intval($uid),
dbesc($handle)
return false;
}
- private function get_allowed_contact_by_handle($importer, $handle, $is_comment = false) {
- $contact = self::get_contact_by_handle($importer["uid"], $handle);
+ private function allowed_contact_by_handle($importer, $handle, $is_comment = false) {
+ $contact = self::contact_by_handle($importer["uid"], $handle);
if (!$contact) {
logger("A Contact for handle ".$handle." and user ".$importer["uid"]." was not found");
return false;
logger("Trying to fetch item ".$guid." from ".$server, LOGGER_DEBUG);
- $msg = self::fetch_message($guid, $server);
+ $msg = self::message($guid, $server);
if (!$msg)
return false;
return self::dispatch_public($msg);
}
- private function fetch_message($guid, $server, $level = 0) {
+ private function message($guid, $server, $level = 0) {
if ($level > 5)
return false;
if ($source_xml->post->reshare) {
// Reshare of a reshare - old Diaspora version
- return self::fetch_message($source_xml->post->reshare->root_guid, $server, ++$level);
+ return self::message($source_xml->post->reshare->root_guid, $server, ++$level);
} elseif ($source_xml->getName() == "reshare") {
// Reshare of a reshare - new Diaspora version
- return self::fetch_message($source_xml->root_guid, $server, ++$level);
+ return self::message($source_xml->root_guid, $server, ++$level);
}
$author = "";
$msg = array("message" => $x, "author" => $author);
- $msg["key"] = self::get_key($msg["author"]);
+ $msg["key"] = self::key($msg["author"]);
return $msg;
}
- private function fetch_parent_item($uid, $guid, $author, $contact) {
+ private function parent_item($uid, $guid, $author, $contact) {
$r = q("SELECT `id`, `body`, `wall`, `uri`, `private`, `origin`,
`author-name`, `author-link`, `author-avatar`,
`owner-name`, `owner-link`, `owner-avatar`
$result = self::store_by_guid($guid, $contact["url"], $uid);
if (!$result) {
- $person = self::get_person_by_handle($author);
+ $person = self::person_by_handle($author);
$result = self::store_by_guid($guid, $person["url"], $uid);
}
return $r[0];
}
- private function get_author_contact_by_url($contact, $person, $uid) {
+ private function author_contact_by_url($contact, $person, $uid) {
$r = q("SELECT `id`, `network` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
dbesc(normalise_link($person["url"])), intval($uid));
private function receive_account_deletion($importer, $data) {
$author = notags(unxmlify($data->author));
- $contact = self::get_contact_by_handle($importer["uid"], $author);
+ $contact = self::contact_by_handle($importer["uid"], $author);
if (!$contact) {
logger("cannot find contact for author: ".$author);
return false;
$text = unxmlify($data->text);
$author = notags(unxmlify($data->author));
- $contact = self::get_allowed_contact_by_handle($importer, $sender, true);
+ $contact = self::allowed_contact_by_handle($importer, $sender, true);
if (!$contact)
return false;
if (self::message_exists($importer["uid"], $guid))
return false;
- $parent_item = self::fetch_parent_item($importer["uid"], $parent_guid, $author, $contact);
+ $parent_item = self::parent_item($importer["uid"], $parent_guid, $author, $contact);
if (!$parent_item)
return false;
- $person = self::get_person_by_handle($author);
+ $person = self::person_by_handle($author);
if (!is_array($person)) {
logger("unable to find author details");
return false;
}
// Fetch the contact id - if we know this contact
- $author_contact = self::get_author_contact_by_url($contact, $person, $importer["uid"]);
+ $author_contact = self::author_contact_by_url($contact, $person, $importer["uid"]);
$datarray = array();
self::fetch_guid($datarray);
$message_id = item_store($datarray);
- // print_r($datarray);
// If we are the origin of the parent we store the original data and notify our followers
if($message_id AND $parent_item["origin"]) {
$person = $contact;
$key = $msg["key"];
} else {
- $person = self::get_person_by_handle($msg_author);
+ $person = self::person_by_handle($msg_author);
if (is_array($person) && x($person, "pubkey"))
$key = $person["pubkey"];
return false;
}
- $contact = self::get_allowed_contact_by_handle($importer, $msg["author"], true);
+ $contact = self::allowed_contact_by_handle($importer, $msg["author"], true);
if (!$contact)
return false;
private function construct_like_object($importer, $parent_item) {
$objtype = ACTIVITY_OBJ_NOTE;
- $link = xmlify('<link rel="alternate" type="text/html" href="'.App::get_baseurl()."/display/".$importer["nickname"]."/".$parent_item["id"].'" />'."\n") ;
+ $link = '<link rel="alternate" type="text/html" href="'.App::get_baseurl()."/display/".$importer["nickname"]."/".$parent_item["id"].'" />';
$parent_body = $parent_item["body"];
- $obj = <<< EOT
-
- <object>
- <type>$objtype</type>
- <local>1</local>
- <id>{$parent_item["uri"]}</id>
- <link>$link</link>
- <title></title>
- <content>$parent_body</content>
- </object>
-EOT;
+ $xmldata = array("object" => array("type" => $objtype,
+ "local" => "1",
+ "id" => $parent_item["uri"],
+ "link" => $link,
+ "title" => "",
+ "content" => $parent_body));
- return $obj;
+ return xml::from_array($xmldata, $xml, true);
}
private function receive_like($importer, $sender, $data) {
if (!in_array($parent_type, array("Post", "Comment")))
return false;
- $contact = self::get_allowed_contact_by_handle($importer, $sender, true);
+ $contact = self::allowed_contact_by_handle($importer, $sender, true);
if (!$contact)
return false;
if (self::message_exists($importer["uid"], $guid))
return false;
- $parent_item = self::fetch_parent_item($importer["uid"], $parent_guid, $author, $contact);
+ $parent_item = self::parent_item($importer["uid"], $parent_guid, $author, $contact);
if (!$parent_item)
return false;
- $person = self::get_person_by_handle($author);
+ $person = self::person_by_handle($author);
if (!is_array($person)) {
logger("unable to find author details");
return false;
}
// Fetch the contact id - if we know this contact
- $author_contact = self::get_author_contact_by_url($contact, $person, $importer["uid"]);
+ $author_contact = self::author_contact_by_url($contact, $person, $importer["uid"]);
// "positive" = "false" would be a Dislike - wich isn't currently supported by Diaspora
// We would accept this anyhow.
$datarray["body"] = self::construct_like_body($contact, $parent_item, $guid);
$message_id = item_store($datarray);
- // print_r($datarray);
// If we are the origin of the parent we store the original data and notify our followers
if($message_id AND $parent_item["origin"]) {
$author = notags(unxmlify($data->author));
$conversation_guid = notags(unxmlify($data->conversation_guid));
- $contact = self::get_allowed_contact_by_handle($importer, $author, true);
+ $contact = self::allowed_contact_by_handle($importer, $author, true);
if (!$contact)
return false;
$body = diaspora2bb($text);
$message_uri = $author.":".$guid;
- $person = self::get_person_by_handle($author);
+ $person = self::person_by_handle($author);
if (!$person) {
logger("unable to find author details");
return false;
private function receive_profile($importer, $data) {
$author = notags(unxmlify($data->author));
- $contact = self::get_contact_by_handle($importer["uid"], $author);
+ $contact = self::contact_by_handle($importer["uid"], $author);
if (!$contact)
return;
if (!$author || !$recipient)
return;
- $contact = self::get_contact_by_handle($importer["uid"],$author);
+ $contact = self::contact_by_handle($importer["uid"],$author);
if($contact) {
return true;
}
- $ret = self::get_person_by_handle($author);
+ $ret = self::person_by_handle($author);
if (!$ret || ($ret["network"] != NETWORK_DIASPORA)) {
- logger("Cannot resolve diaspora handle ".$author ." for ".$recipient);
+ logger("Cannot resolve diaspora handle ".$author." for ".$recipient);
return false;
}
// find the contact record we just created
- $contact_record = self::get_contact_by_handle($importer["uid"],$author);
+ $contact_record = self::contact_by_handle($importer["uid"],$author);
if (!$contact_record) {
logger("unable to locate newly created contact record.");
$u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer["uid"]));
if($u)
- $ret = diaspora_share($u[0], $contact_record);
+ $ret = self::send_share($u[0], $contact_record);
}
return true;
}
- private function get_original_item($guid, $orig_author, $author) {
+ private function original_item($guid, $orig_author, $author) {
// Do we already have this item?
$r = q("SELECT `body`, `tag`, `app`, `created`, `object-type`, `uri`, `guid`,
$public = notags(unxmlify($data->public));
$created_at = notags(unxmlify($data->created_at));
- $contact = self::get_allowed_contact_by_handle($importer, $author, false);
+ $contact = self::allowed_contact_by_handle($importer, $author, false);
if (!$contact)
return false;
if (self::message_exists($importer["uid"], $guid))
return false;
- $original_item = self::get_original_item($root_guid, $root_author, $author);
+ $original_item = self::original_item($root_guid, $root_author, $author);
if (!$original_item)
return false;
self::fetch_guid($datarray);
$message_id = item_store($datarray);
- // print_r($datarray);
return $message_id;
}
$target_guid = notags(unxmlify($data->target_guid));
$author = notags(unxmlify($data->author));
- $person = self::get_person_by_handle($author);
+ $person = self::person_by_handle($author);
if (!is_array($person)) {
logger("unable to find author detail for ".$author);
return false;
private function receive_retraction($importer, $sender, $data) {
$target_type = notags(unxmlify($data->target_type));
- $contact = self::get_contact_by_handle($importer["uid"], $sender);
+ $contact = self::contact_by_handle($importer["uid"], $sender);
if (!$contact) {
logger("cannot find contact for sender: ".$sender." and user ".$importer["uid"]);
return false;
case "StatusMessage":
return self::item_retraction($importer, $contact, $data);;
- case "Person": /// @todo an "unshare" shouldn't remove the contact
- contact_remove($contact["id"]);
+ 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"]);
return true;
default:
// print_r($poll);
// die("poll!\n");
//}
- $contact = self::get_allowed_contact_by_handle($importer, $author, false);
+ $contact = self::allowed_contact_by_handle($importer, $author, false);
if (!$contact)
return false;
self::fetch_guid($datarray);
$message_id = item_store($datarray);
- // print_r($datarray);
logger("Stored item with message id ".$message_id, LOGGER_DEBUG);
return $message_id;
}
- /*******************************************************************************************
- * Here come all the functions that are needed to transmit data with the Diaspora protocol *
- *******************************************************************************************/
+ /******************************************************************************************
+ * Here are all the functions that are needed to transmit data with the Diaspora protocol *
+ ******************************************************************************************/
- private function get_my_handle($me) {
+ private function my_handle($me) {
if ($contact["addr"] != "")
return $contact["addr"];
logger("Message: ".$msg, LOGGER_DATA);
- $handle = self::get_my_handle($user);
+ $handle = self::my_handle($user);
$b64url_data = base64url_encode($msg);
$signature = rsa_sign($signable_data,$prvkey);
$sig = base64url_encode($signature);
-$magic_env = <<< EOT
-<?xml version='1.0' encoding='UTF-8'?>
-<diaspora xmlns="https://joindiaspora.com/protocol" xmlns:me="http://salmon-protocol.org/ns/magic-env" >
- <header>
- <author_id>$handle</author_id>
- </header>
- <me:env>
- <me:encoding>base64url</me:encoding>
- <me:alg>RSA-SHA256</me:alg>
- <me:data type="application/xml">$data</me:data>
- <me:sig>$sig</me:sig>
- </me:env>
-</diaspora>
-EOT;
+ $xmldata = array("diaspora" => array("header" => array("author_id" => $handle),
+ "me:env" => array("me:encoding" => "base64url",
+ "me:alg" => "RSA-SHA256",
+ "me:data" => $data,
+ "@attributes" => array("type" => "application/xml"),
+ "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;
$outer_iv = random_string(16);
$b_outer_iv = base64_encode($outer_iv);
- $handle = self::get_my_handle($user);
+ $handle = self::my_handle($user);
$padded_data = pkcs5_pad($msg,16);
$inner_encrypted = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $inner_aes_key, $padded_data, MCRYPT_MODE_CBC, $inner_iv);
$signature = rsa_sign($signable_data,$prvkey);
$sig = base64url_encode($signature);
-$decrypted_header = <<< EOT
-<decrypted_header>
- <iv>$b_inner_iv</iv>
- <aes_key>$b_inner_aes_key</aes_key>
- <author_id>$handle</author_id>
-</decrypted_header>
-EOT;
+ $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);
$decrypted_header = pkcs5_pad($decrypted_header,16);
$ciphertext = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $outer_aes_key, $decrypted_header, MCRYPT_MODE_CBC, $outer_iv);
"ciphertext" => base64_encode($ciphertext)));
$cipher_json = base64_encode($encrypted_header_json_object);
- $encrypted_header = "<encrypted_header>".$cipher_json."</encrypted_header>";
-
-$magic_env = <<< EOT
-<?xml version='1.0' encoding='UTF-8'?>
-<diaspora xmlns="https://joindiaspora.com/protocol" xmlns:me="http://salmon-protocol.org/ns/magic-env" >
- $encrypted_header
- <me:env>
- <me:encoding>base64url</me:encoding>
- <me:alg>RSA-SHA256</me:alg>
- <me:data type="application/xml">$data</me:data>
- <me:sig>$sig</me:sig>
- </me:env>
-</diaspora>
-EOT;
+ $xmldata = array("diaspora" => array("encrypted_header" => $cipher_json,
+ "me:env" => array("me:encoding" => "base64url",
+ "me:alg" => "RSA-SHA256",
+ "me:data" => $data,
+ "@attributes" => array("type" => "application/xml"),
+ "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;
return $slap;
}
- private function get_signature($owner, $message) {
+ private function signature($owner, $message) {
$sigmsg = $message;
unset($sigmsg["author_signature"]);
unset($sigmsg["parent_author_signature"]);
return base64_encode(rsa_sign($signed_text, $owner["uprvkey"], "sha256"));
}
- private function transmit($owner, $contact, $slap, $public_batch, $queue_run=false, $guid = "") {
+ public static function transmit($owner, $contact, $slap, $public_batch, $queue_run=false, $guid = "") {
$a = get_app();
dbesc($slap),
intval($public_batch)
);
- if(count($r)) {
+ if($r) {
logger("add_to_queue ignored - identical item already in queue");
} else {
// queue message for redelivery
}
}
-
return(($return_code) ? $return_code : (-1));
}
- public static function send_share($me,$contact) {
- $myaddr = self::get_my_handle($me);
- $theiraddr = $contact["addr"];
- $data = array("XML" => array("post" => array("request" => array(
- "sender_handle" => $myaddr,
- "recipient_handle" => $theiraddr
- ))));
+ private function build_and_transmit($owner, $contact, $type, $message, $public_batch = false, $guid = "") {
+
+ $data = array("XML" => array("post" => array($type => $message)));
$msg = xml::from_array($data, $xml);
- $slap = self::build_message($msg, $me, $contact, $me["prvkey"], $contact["pubkey"]);
+ logger('message: '.$msg, LOGGER_DATA);
+ logger('send guid '.$guid, LOGGER_DEBUG);
- return(self::transmit($owner,$contact,$slap, false));
+ $slap = self::build_message($msg, $owner, $contact, $owner['uprvkey'], $contact['pubkey'], $public_batch);
+ $return_code = self::transmit($owner, $contact, $slap, $public_batch, false, $guid);
+
+ logger("guid: ".$item["guid"]." result ".$return_code, LOGGER_DEBUG);
+
+ return $return_code;
}
- public static function send_unshare($me,$contact) {
- $myaddr = self::get_my_handle($me);
+ public static function send_share($owner,$contact) {
- $data = array("XML" => array("post" => array("retraction" => array(
- "post_guid" => $me["guid"],
- "diaspora_handle" => $myaddr,
- "type" => "Person"
- ))));
+ $message = array("sender_handle" => self::my_handle($owner),
+ "recipient_handle" => $contact["addr"]);
- $msg = xml::from_array($data, $xml);
+ return self::build_and_transmit($owner, $contact, "request", $message);
+ }
+
+ public static function send_unshare($owner,$contact) {
- $slap = self::build_message($msg, $me, $contact, $me["prvkey"], $contact["pubkey"]);
+ $message = array("post_guid" => $owner["guid"],
+ "diaspora_handle" => self::my_handle($owner),
+ "type" => "Person");
- return(self::transmit($owner,$contact,$slap, false));
+ return self::build_and_transmit($owner, $contact, "retraction", $message);
}
private function is_reshare($body) {
dbesc($guid), NETWORK_DFRN, NETWORK_DIASPORA);
if ($r) {
$ret= array();
- $ret["root_handle"] = diaspora_handle_from_contact($r[0]["contact-id"]);
+ $ret["root_handle"] = self::handle_from_contact($r[0]["contact-id"]);
$ret["root_guid"] = $guid;
return($ret);
}
public static function send_status($item, $owner, $contact, $public_batch = false) {
- $myaddr = self::get_my_handle($owner);
- $theiraddr = $contact["addr"];
-
- $title = $item["title"];
- $body = $item["body"];
-
- // convert to markdown
- $body = html_entity_decode(bb2diaspora($body));
-
- // Adding the title
- if(strlen($title))
- $body = "## ".html_entity_decode($title)."\n\n".$body;
-
- if ($item["attach"]) {
- $cnt = preg_match_all('/href=\"(.*?)\"(.*?)title=\"(.*?)\"/ism', $item["attach"], $matches, PREG_SET_ORDER);
- if(cnt) {
- $body .= "\n".t("Attachments:")."\n";
- foreach($matches as $mtch)
- $body .= "[".$mtch[3]."](".$mtch[1].")\n";
- }
- }
-
+ $myaddr = self::my_handle($owner);
$public = (($item["private"]) ? "false" : "true");
"created_at" => $created,
"provider_display_name" => $item["app"]);
- $data = array("XML" => array("post" => array("reshare" => $message)));
+ $type = "reshare";
} else {
+ $title = $item["title"];
+ $body = $item["body"];
+
+ // convert to markdown
+ $body = html_entity_decode(bb2diaspora($body));
+
+ // Adding the title
+ if(strlen($title))
+ $body = "## ".html_entity_decode($title)."\n\n".$body;
+
+ if ($item["attach"]) {
+ $cnt = preg_match_all('/href=\"(.*?)\"(.*?)title=\"(.*?)\"/ism', $item["attach"], $matches, PREG_SET_ORDER);
+ if(cnt) {
+ $body .= "\n".t("Attachments:")."\n";
+ foreach($matches as $mtch)
+ $body .= "[".$mtch[3]."](".$mtch[1].")\n";
+ }
+ }
+
$location = array();
if ($item["location"] != "")
if (count($location) == 0)
unset($message["location"]);
- $data = array("XML" => array("post" => array("status_message" => $message)));
+ $type = "status_message";
}
- $msg = xml::from_array($data, $xml);
-
- logger("status: ".$owner["username"]." -> ".$contact["name"]." base message: ".$msg, LOGGER_DATA);
- logger("send guid ".$item["guid"], LOGGER_DEBUG);
-
- $slap = self::build_message($msg, $owner, $contact, $owner["uprvkey"], $contact["pubkey"], $public_batch);
-
- $return_code = self::transmit($owner,$contact,$slap, false);
-
- logger("guid: ".$item["guid"]." result ".$return_code, LOGGER_DEBUG);
-
- return $return_code;
+ return self::build_and_transmit($owner, $contact, $type, $message, $public_batch, $item["guid"]);
}
- private function construct_like($item,$owner,$contact,$public_batch = false, $data = null) {
+ private function construct_like($item, $owner) {
- if (is_array($data))
- $message = $data;
- else {
- $myaddr = self::get_my_handle($owner);
-
- $p = q("SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1",
- dbesc($item["thr-parent"]));
- if(!$p)
- return false;
-
- $parent = $p[0];
-
- $target_type = ($parent["uri"] === $parent["parent-uri"] ? "Post" : "Comment");
- $positive = "true";
-
- $message = array("positive" => $positive,
- "guid" => $item["guid"],
- "target_type" => $target_type,
- "parent_guid" => $parent["guid"],
- "author_signature" => $authorsig,
- "diaspora_handle" => $myaddr);
- }
+ $myaddr = self::my_handle($owner);
- $authorsig = self::get_signature($owner, $message);
+ $p = q("SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1",
+ dbesc($item["thr-parent"]));
+ if(!$p)
+ return false;
- if ($message["author_signature"] == "")
- $message["author_signature"] = $authorsig;
- else
- $message["parent_author_signature"] = $authorsig;
+ $parent = $p[0];
- $data = array("XML" => array("post" => array("like" => $message)));
+ $target_type = ($parent["uri"] === $parent["parent-uri"] ? "Post" : "Comment");
+ $positive = "true";
- return xml::from_array($data, $xml);
+ return(array("positive" => $positive,
+ "guid" => $item["guid"],
+ "target_type" => $target_type,
+ "parent_guid" => $parent["guid"],
+ "author_signature" => $authorsig,
+ "diaspora_handle" => $myaddr));
}
- private function construct_comment($item,$owner,$contact,$public_batch = false, $data = null) {
+ private function construct_comment($item, $owner) {
- if (is_array($data))
- $message = $data;
- else {
- $myaddr = self::get_my_handle($owner);
+ $myaddr = self::my_handle($owner);
- $p = q("SELECT `guid` FROM `item` WHERE `parent` = %d AND `id` = %d LIMIT 1",
- intval($item["parent"]),
- intval($item["parent"])
- );
-
- if (!$p)
- return false;
-
- $parent = $p[0];
-
- $text = html_entity_decode(bb2diaspora($item["body"]));
-
- $message = array("guid" => $item["guid"],
- "parent_guid" => $parent["guid"],
- "author_signature" => "",
- "text" => $text,
- "diaspora_handle" => $myaddr);
- }
+ $p = q("SELECT `guid` FROM `item` WHERE `parent` = %d AND `id` = %d LIMIT 1",
+ intval($item["parent"]),
+ intval($item["parent"])
+ );
- $authorsig = self::get_signature($owner, $message);
+ if (!$p)
+ return false;
- if ($message["author_signature"] == "")
- $message["author_signature"] = $authorsig;
- else
- $message["parent_author_signature"] = $authorsig;
+ $parent = $p[0];
- $data = array("XML" => array("post" => array("comment" => $message)));
+ $text = html_entity_decode(bb2diaspora($item["body"]));
- return xml::from_array($data, $xml);
+ return(array("guid" => $item["guid"],
+ "parent_guid" => $parent["guid"],
+ "author_signature" => "",
+ "text" => $text,
+ "diaspora_handle" => $myaddr));
}
public static function send_followup($item,$owner,$contact,$public_batch = false) {
- if($item['verb'] === ACTIVITY_LIKE)
- $msg = self::construct_like($item, $owner, $contact, $public_batch);
- else
- $msg = self::construct_comment($item, $owner, $contact, $public_batch);
-
- if (!$msg)
- return $msg;
-
- logger("base message: ".$msg, LOGGER_DATA);
- logger("send guid ".$item["guid"], LOGGER_DEBUG);
-
- $slap = self::build_message($msg, $owner, $contact, $owner["uprvkey"], $contact["pubkey"], $public_batch);
+ if($item['verb'] === ACTIVITY_LIKE) {
+ $message = self::construct_like($item, $owner);
+ $type = "like";
+ } else {
+ $message = self::construct_comment($item, $owner);
+ $type = "comment";
+ }
- $return_code = self::transmit($owner, $contact, $slap, $public_batch, false, $item["guid"]);
+ if (!$message)
+ return false;
- logger("guid: ".$item["guid"]." result ".$return_code, LOGGER_DEBUG);
+ $message["author_signature"] = self::signature($owner, $message);
- return $return_code;
+ return self::build_and_transmit($owner, $contact, $type, $message, $public_batch, $item["guid"]);
}
- function send_relay($item, $owner, $contact, $public_batch = false) {
+ private function message_from_signatur($item, $signature) {
- if ($item["deleted"])
- $sql_sign_id = "retract_iid";
- else
- $sql_sign_id = "iid";
-
- // fetch the original signature if the relayable was created by a Diaspora
- // or DFRN user.
-
- $r = q("SELECT `signed_text`, `signature`, `signer` FROM `sign` WHERE `".$sql_sign_id."` = %d LIMIT 1",
- intval($item["id"])
- );
+ // Split the signed text
+ $signed_parts = explode(";", $signature['signed_text']);
- if(count($r)) {
- $orig_sign = $r[0];
- $signed_text = $orig_sign['signed_text'];
- $authorsig = $orig_sign['signature'];
- $handle = $orig_sign['signer'];
-
- // Split the signed text
- $signed_parts = explode(";", $signed_text);
-
- if ($item['verb'] === ACTIVITY_LIKE) {
- $data = array("positive" => $signed_parts[0],
- "guid" => $signed_parts[1],
- "target_type" => $signed_parts[2],
- "parent_guid" => $signed_parts[3],
- "parent_author_signature" => "",
- "author_signature" => $orig_sign['signature'],
- "diaspora_handle" => $signed_parts[4]);
- } else {
- // Remove the comment guid
- $guid = array_shift($signed_parts);
+ if ($item["deleted"])
+ $message = array("parent_author_signature" => "",
+ "target_guid" => $signed_parts[0],
+ "target_type" => $signed_parts[1],
+ "sender_handle" => $signature['signer'],
+ "target_author_signature" => $signature['signature']);
+ elseif ($item['verb'] === ACTIVITY_LIKE)
+ $message = array("positive" => $signed_parts[0],
+ "guid" => $signed_parts[1],
+ "target_type" => $signed_parts[2],
+ "parent_guid" => $signed_parts[3],
+ "parent_author_signature" => "",
+ "author_signature" => $signature['signature'],
+ "diaspora_handle" => $signed_parts[4]);
+ else {
+ // Remove the comment guid
+ $guid = array_shift($signed_parts);
- // Remove the parent guid
- $parent_guid = array_shift($signed_parts);
+ // Remove the parent guid
+ $parent_guid = array_shift($signed_parts);
- // Remove the handle
- $handle = array_pop($signed_parts);
+ // Remove the handle
+ $handle = array_pop($signed_parts);
- // Glue the parts together
- $text = implode(";", $signed_parts);
+ // Glue the parts together
+ $text = implode(";", $signed_parts);
- $data = array("guid" => $guid,
- "parent_guid" => $parent_guid,
- "parent_author_signature" => "",
- "author_signature" => $orig_sign['signature'],
- "text" => implode(";", $signed_parts),
- "diaspora_handle" => $handle);
- }
+ $message = array("guid" => $guid,
+ "parent_guid" => $parent_guid,
+ "parent_author_signature" => "",
+ "author_signature" => $signature['signature'],
+ "text" => implode(";", $signed_parts),
+ "diaspora_handle" => $handle);
}
-
- if ($item['deleted'])
- ; // Relayed Retraction
- elseif($item['verb'] === ACTIVITY_LIKE)
- $msg = self::construct_like($item, $owner, $contact, $public_batch, $data);
- else
- $msg = self::construct_comment($item, $owner, $contact, $public_batch, $data);
-die($msg);
-
- logger('base message: '.$msg, LOGGER_DATA);
- logger('send guid '.$item['guid'], LOGGER_DEBUG);
-
- $slap = self::build_message($msg,$owner, $contact, $owner['uprvkey'], $contact['pubkey'], $public_batch);
-
- $return_code = self::transmit($owner, $contact, $slap, $public_batch, false, $item['guid']);
-
- logger("guid: ".$item["guid"]." result ".$return_code, LOGGER_DEBUG);
-
- return $return_code;
- }
-
-/*
- // Diaspora doesn't support threaded comments, but some
- // versions of Diaspora (i.e. Diaspora-pistos) support
- // likes on comments
- if($item['verb'] === ACTIVITY_LIKE && $item['thr-parent']) {
- $p = q("select guid, type, uri, `parent-uri` from item where uri = '%s' limit 1",
- dbesc($item['thr-parent'])
- );
- }
- else {
- // The first item in the `item` table with the parent id is the parent. However, MySQL doesn't always
- // return the items ordered by `item`.`id`, in which case the wrong item is chosen as the parent.
- // The only item with `parent` and `id` as the parent id is the parent item.
- $p = q("select guid, type, uri, `parent-uri` from item where parent = %d and id = %d limit 1",
- intval($item['parent']),
- intval($item['parent'])
- );
- }
- if(count($p))
- $parent = $p[0];
- else
- return;
-
- $like = false;
- $relay_retract = false;
- $sql_sign_id = 'iid';
- if( $item['deleted']) {
- $relay_retract = true;
-
- $target_type = ( ($item['verb'] === ACTIVITY_LIKE) ? 'Like' : 'Comment');
-
- $sql_sign_id = 'retract_iid';
- $tpl = get_markup_template('diaspora_relayable_retraction.tpl');
- }
- elseif($item['verb'] === ACTIVITY_LIKE) {
- $like = true;
-
- $target_type = ( $parent['uri'] === $parent['parent-uri'] ? 'Post' : 'Comment');
-// $positive = (($item['deleted']) ? 'false' : 'true');
- $positive = 'true';
-
- $tpl = get_markup_template('diaspora_like_relay.tpl');
- }
- else { // item is a comment
- $tpl = get_markup_template('diaspora_comment_relay.tpl');
+ return $message;
}
+ public static function send_relay($item, $owner, $contact, $public_batch = false) {
- // fetch the original signature if the relayable was created by a Diaspora
- // or DFRN user. Relayables for other networks are not supported.
-
- $r = q("SELECT `signed_text`, `signature`, `signer` FROM `sign` WHERE " . $sql_sign_id . " = %d LIMIT 1",
- intval($item['id'])
- );
- if(count($r)) {
- $orig_sign = $r[0];
- $signed_text = $orig_sign['signed_text'];
- $authorsig = $orig_sign['signature'];
- $handle = $orig_sign['signer'];
-
- // Split the signed text
- $signed_parts = explode(";", $signed_text);
-
- // Remove the parent guid
- array_shift($signed_parts);
+ if ($item["deleted"]) {
+ $sql_sign_id = "retract_iid";
+ $type = "relayable_retraction";
+ } elseif ($item['verb'] === ACTIVITY_LIKE) {
+ $sql_sign_id = "iid";
+ $type = "like";
+ } else {
+ $sql_sign_id = "iid";
+ $type = "comment";
+ }
- // Remove the comment guid
- array_shift($signed_parts);
+ // fetch the original signature
- // Remove the handle
- array_pop($signed_parts);
+ $r = q("SELECT `signed_text`, `signature`, `signer` FROM `sign` WHERE `".$sql_sign_id."` = %d LIMIT 1",
+ intval($item["id"]));
- // Glue the parts together
- $text = implode(";", $signed_parts);
- }
- else {
- // This part is meant for cases where we don't have the signatur. (Which shouldn't happen with posts from Diaspora and Friendica)
- // This means that the comment won't be accepted by newer Diaspora servers
+ if (!$r)
+ return self::send_followup($item, $owner, $contact, $public_batch);
- $body = $item['body'];
- $text = html_entity_decode(bb2diaspora($body));
+ $signature = $r[0];
- $handle = diaspora_handle_from_contact($item['contact-id']);
- if(! $handle)
- return;
+ // Old way - is used by the internal Friendica functions
+ /// @todo Change all signatur storing functions to the new format
+ if ($signature['signed_text'] AND $signature['signature'] AND $signature['signer'])
+ $message = self::message_from_signatur($item, $signature);
+ else // New way
+ $message = json_decode($signature['signed_text']);
- if($relay_retract)
- $signed_text = $item['guid'] . ';' . $target_type;
- elseif($like)
- $signed_text = $item['guid'] . ';' . $target_type . ';' . $parent['guid'] . ';' . $positive . ';' . $handle;
- else
- $signed_text = $item['guid'] . ';' . $parent['guid'] . ';' . $text . ';' . $handle;
+ if ($item["deleted"]) {
+ $signed_text = $message["target_guid"].';'.$message["target_type"];
+ $message["parent_author_signature"] = base64_encode(rsa_sign($signed_text, $owner["uprvkey"], "sha256"));
+ } else
+ $message["parent_author_signature"] = self::signature($owner, $message);
- $authorsig = base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256'));
+ return self::build_and_transmit($owner, $contact, $type, $message, $public_batch, $item["guid"]);
}
- // Sign the relayable with the top-level owner's signature
- $parentauthorsig = base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256'));
-
- $msg = replace_macros($tpl,array(
- '$guid' => xmlify($item['guid']),
- '$parent_guid' => xmlify($parent['guid']),
- '$target_type' =>xmlify($target_type),
- '$authorsig' => xmlify($authorsig),
- '$parentsig' => xmlify($parentauthorsig),
- '$body' => xmlify($text),
- '$positive' => xmlify($positive),
- '$handle' => xmlify($handle)
- ));
-
- logger('diaspora_send_relay: base message: ' . $msg, LOGGER_DATA);
- logger('send guid '.$item['guid'], LOGGER_DEBUG);
-
- $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch)));
- //$slap = 'xml=' . urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch));
-
- return(diaspora_transmit($owner,$contact,$slap,$public_batch,false,$item['guid']));
-*/
-
public static function send_retraction($item, $owner, $contact, $public_batch = false) {
- $myaddr = self::get_my_handle($owner);
+ $myaddr = self::my_handle($owner);
// Check whether the retraction is for a top-level post or whether it's a relayable
if ($item["uri"] !== $item["parent-uri"]) {
"sender_handle" => $myaddr,
"target_author_signature" => base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256')));
- $data = array("XML" => array("post" => array($msg_type => $message)));
- $msg = xml::from_array($data, $xml);
-
- logger("send guid ".$item["guid"], LOGGER_DEBUG);
-
- $slap = self::build_message($msg, $owner, $contact, $owner["uprvkey"], $contact["pubkey"], $public_batch);
-
- $return_code = self::transmit($owner, $contact, $slap, $public_batch, false, $item["guid"]);
-
- logger("guid: ".$item["guid"]." result ".$return_code, LOGGER_DEBUG);
-
- return $return_code;
+ return self::build_and_transmit($owner, $contact, $msg_type, $message, $public_batch, $item["guid"]);
}
- public static function send_mail($item,$owner,$contact) {
+ public static function send_mail($item, $owner, $contact) {
- $myaddr = self::get_my_handle($owner);
+ $myaddr = self::my_handle($owner);
$r = q("SELECT * FROM `conv` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($item["convid"]),
intval($item["uid"])
);
- if (!count($r)) {
+ if (!$r) {
logger("conversation not found.");
return;
}
$created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d H:i:s \U\T\C');
$signed_text = $item["guid"].";".$cnv["guid"].";".$body.";".$created.";".$myaddr.";".$cnv['guid'];
-
$sig = base64_encode(rsa_sign($signed_text, $owner["uprvkey"], "sha256"));
$msg = array(
"conversation_guid" => $cnv["guid"]
);
- if ($item["reply"])
- $data = array("XML" => array("post" => array("message" => $msg)));
- else {
+ if ($item["reply"]) {
+ $message = $msg;
+ $type = "message";
+ } else {
$message = array("guid" => $cnv["guid"],
"subject" => $cnv["subject"],
"created_at" => datetime_convert("UTC", "UTC", $cnv['created'], 'Y-m-d H:i:s \U\T\C'),
"diaspora_handle" => $cnv["creator"],
"participant_handles" => $cnv["recips"]);
- $data = array("XML" => array("post" => array("conversation" => $message)));
+ $type = "conversation";
}
- $xmsg = xml::from_array($data, $xml);
-
- logger("conversation: ".print_r($xmsg,true), LOGGER_DATA);
- logger("send guid ".$item["guid"], LOGGER_DEBUG);
-
- $slap = self::build_message($xmsg, $owner, $contact, $owner["uprvkey"], $contact["pubkey"], false);
-
- $return_code = self::transmit($owner, $contact, $slap, false, false, $item["guid"]);
-
- logger("guid: ".$item["guid"]." result ".$return_code, LOGGER_DEBUG);
-
- return $return_code;
+ return self::build_and_transmit($owner, $contact, $type, $message, false, $item["guid"]);
}
}
?>
projects / friendica.git / blobdiff