X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdiaspora2.php;h=f6b8b9a704165e976f9d05a8a97c22ca06ec0f0c;hb=75f5cfe63e2d84fbe55384a7b2769c55bbf423b6;hp=4d0e4c2cb8f3ca3b596c392b5b7595edc962adc1;hpb=5adecf5b50e11fb6016cc089426f74b8f930ed0b;p=friendica.git
diff --git a/include/diaspora2.php b/include/diaspora2.php
index 4d0e4c2cb8..f6b8b9a704 100644
--- a/include/diaspora2.php
+++ b/include/diaspora2.php
@@ -11,46 +11,228 @@ require_once("include/Contact.php");
require_once("include/Photo.php");
require_once("include/socgraph.php");
require_once("include/group.php");
-require_once("include/api.php");
+require_once("include/xml.php");
+require_once("include/datetime.php");
-class xml {
- function from_array($array, &$xml) {
+/**
+ * @brief This class contain functions to create and send Diaspora XML files
+ *
+ */
+class diaspora {
- if (!is_object($xml)) {
- foreach($array as $key => $value) {
- $root = new SimpleXMLElement('<'.$key.'/>');
- array_to_xml($value, $root);
+ public static function relay_list() {
- $dom = dom_import_simplexml($root)->ownerDocument;
- $dom->formatOutput = true;
- return $dom->saveXML();
- }
+ $serverdata = get_config("system", "relay_server");
+ if ($serverdata == "")
+ return array();
+
+ $relay = array();
+
+ $servers = explode(",", $serverdata);
+
+ foreach($servers AS $server) {
+ $server = trim($server);
+ $batch = $server."/receive/public";
+
+ $relais = q("SELECT `batch`, `id`, `name`,`network` FROM `contact` WHERE `uid` = 0 AND `batch` = '%s' LIMIT 1", dbesc($batch));
+
+ if (!$relais) {
+ $addr = "relay@".str_replace("http://", "", normalise_link($server));
+
+ $r = q("INSERT INTO `contact` (`uid`, `created`, `name`, `nick`, `addr`, `url`, `nurl`, `batch`, `network`, `rel`, `blocked`, `pending`, `writable`, `name-date`, `uri-date`, `avatar-date`)
+ VALUES (0, '%s', '%s', 'relay', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, '%s', '%s', '%s')",
+ datetime_convert(),
+ dbesc($addr),
+ dbesc($addr),
+ dbesc($server),
+ dbesc(normalise_link($server)),
+ dbesc($batch),
+ dbesc(NETWORK_DIASPORA),
+ intval(CONTACT_IS_FOLLOWER),
+ dbesc(datetime_convert()),
+ dbesc(datetime_convert()),
+ dbesc(datetime_convert())
+ );
+
+ $relais = q("SELECT `batch`, `id`, `name`,`network` FROM `contact` WHERE `uid` = 0 AND `batch` = '%s' LIMIT 1", dbesc($batch));
+ if ($relais)
+ $relay[] = $relais[0];
+ } else
+ $relay[] = $relais[0];
}
- foreach($array as $key => $value) {
- if (!is_array($value) AND !is_numeric($key))
- $xml->addChild($key, $value);
- elseif (is_array($value))
- array_to_xml($value, $xml->addChild($key));
+ 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);
}
- function copy(&$source, &$target, $elementname) {
- if (count($source->children()) == 0)
- $target->addChild($elementname, $source);
+ /**
+ * @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
+ *
+ *
+ * 8e+G2+ET8l5BPuW0sVTnQw==
+ * UvSMb4puPeB14STkcDWq+4QE302Edu15oaprAQSkLKU=
+ * galaxor@diaspora.priateship.org
+ *
+ */
+
+ 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 {
- $child = $target->addChild($elementname);
- foreach ($source->children() AS $childfield => $childentry)
- self::copy($childentry, $child, $childfield);
+
+ // 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 This class contain functions to create and send Diaspora XML files
- *
- */
-class diaspora {
+
+ /**
+ * @brief Dispatches public messages and find the fitting receivers
+ *
+ * @param array $msg The post that will be dispatched
+ *
+ * @return bool Was the message accepted?
+ */
public static function dispatch_public($msg) {
$enabled = intval(get_config("system", "diaspora_enabled"));
@@ -70,7 +252,7 @@ class diaspora {
dbesc(NETWORK_DIASPORA),
dbesc($msg["author"])
);
- if(count($r)) {
+ if($r) {
foreach($r as $rr) {
logger("delivering to: ".$rr["username"]);
self::dispatch($rr,$msg);
@@ -81,6 +263,14 @@ class diaspora {
return $item_id;
}
+ /**
+ * @brief Dispatches the different message types to the different functions
+ *
+ * @param array $importer Array of the importer user
+ * @param array $msg The post that will be dispatched
+ *
+ * @return bool Was the message accepted?
+ */
public static function dispatch($importer, $msg) {
// The sender is the handle of the contact that sent the message.
@@ -94,53 +284,47 @@ class diaspora {
$type = $fields->getName();
+ logger("Received message type ".$type." from ".$sender." for user ".$importer["uid"], LOGGER_DEBUG);
+
switch ($type) {
- case "account_deletion": // Done
- return true;
- //return self::import_account_deletion($importer, $fields);
+ case "account_deletion":
+ return self::receive_account_deletion($importer, $fields);
- case "comment": // Done
- return true;
- //return self::import_comment($importer, $sender, $fields);
+ case "comment":
+ return self::receive_comment($importer, $sender, $fields);
case "conversation":
- return true;
- //return self::import_conversation($importer, $fields);
+ return self::receive_conversation($importer, $msg, $fields);
- case "like": // Done
- return true;
- //return self::import_like($importer, $sender, $fields);
+ case "like":
+ return self::receive_like($importer, $sender, $fields);
- case "message": // Done
- return true;
- //return self::import_message($importer, $fields);
+ case "message":
+ return self::receive_message($importer, $fields);
case "participation": // Not implemented
- return self::import_participation($importer, $fields);
+ return self::receive_participation($importer, $fields);
- case "photo": // Not needed
- return self::import_photo($importer, $fields);
+ case "photo": // Not implemented
+ return self::receive_photo($importer, $fields);
case "poll_participation": // Not implemented
- return self::import_poll_participation($importer, $fields);
+ return self::receive_poll_participation($importer, $fields);
- case "profile": // Done
- return true;
- //return self::import_profile($importer, $fields);
+ case "profile":
+ return self::receive_profile($importer, $fields);
case "request":
- return self::import_request($importer, $fields);
+ return self::receive_request($importer, $fields);
- case "reshare": // Done
- return true;
- //return self::import_reshare($importer, $fields);
+ case "reshare":
+ return self::receive_reshare($importer, $fields);
case "retraction":
- return self::import_retraction($importer, $fields);
+ return self::receive_retraction($importer, $sender, $fields);
- case "status_message": // Done
- return true;
- //return self::import_status_message($importer, $fields);
+ case "status_message":
+ return self::receive_status_message($importer, $fields);
default:
logger("Unknown message type ".$type);
@@ -181,6 +365,7 @@ class diaspora {
}
$type = $element->getName();
+ $orig_type = $type;
// All retractions are handled identically from now on.
// In the new version there will only be "retraction".
@@ -235,7 +420,8 @@ class diaspora {
$signed_data .= $entry;
}
- if (!in_array($fieldname, array("parent_author_signature", "target_author_signature")))
+ if (!in_array($fieldname, array("parent_author_signature", "target_author_signature")) OR
+ ($orig_type == "relayable_retraction"))
xml::copy($entry, $fields, $fieldname);
}
@@ -255,34 +441,48 @@ class diaspora {
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");
}
- private function get_key($handle) {
+ /**
+ * @brief Fetches the public key for a given handle
+ *
+ * @param string $handle The handle
+ *
+ * @return string The public key
+ */
+ 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 "";
}
- private function get_person_by_handle($handle) {
+ /**
+ * @brief Fetches data for a given handle
+ *
+ * @param string $handle The handle
+ *
+ * @return array the queried data
+ */
+ private function person_by_handle($handle) {
$r = q("SELECT * FROM `fcontact` WHERE `network` = '%s' AND `addr` = '%s' LIMIT 1",
dbesc(NETWORK_DIASPORA),
dbesc($handle)
);
- if (count($r)) {
+ if ($r) {
$person = $r[0];
logger("In cache ".print_r($r,true), LOGGER_DEBUG);
@@ -298,7 +498,7 @@ class diaspora {
// Note that Friendica contacts will return a "Diaspora person"
// if Diaspora connectivity is enabled on their server
- if (count($r) AND ($r["network"] === NETWORK_DIASPORA)) {
+ if ($r AND ($r["network"] === NETWORK_DIASPORA)) {
self::add_fcontact($r, $update);
$person = $r;
}
@@ -306,6 +506,14 @@ class diaspora {
return $person;
}
+ /**
+ * @brief Updates the fcontact table
+ *
+ * @param array $arr The fcontact data
+ * @param bool $update Update or insert?
+ *
+ * @return string The id of the fcontact entry
+ */
private function add_fcontact($arr, $update = false) {
/// @todo Remove this function from include/network.php
@@ -363,23 +571,49 @@ class 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)
);
- if ($r AND count($r))
+ if ($r)
return $r[0];
$handle_parts = explode("@", $handle);
- $nurl_sql = '%%://' . $handle_parts[1] . '%%/profile/' . $handle_parts[0];
+ $nurl_sql = "%%://".$handle_parts[1]."%%/profile/".$handle_parts[0];
$r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `nurl` LIKE '%s' LIMIT 1",
dbesc(NETWORK_DFRN),
intval($uid),
dbesc($nurl_sql)
);
- if($r AND count($r))
+ if($r)
return $r[0];
return false;
@@ -415,14 +649,14 @@ class diaspora {
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;
}
- if (!self::post_allow($importer, $contact, false)) {
+ if (!self::post_allow($importer, $contact, $is_comment)) {
logger("The handle: ".$handle." is not allowed to post to user ".$importer["uid"]);
return false;
}
@@ -435,12 +669,12 @@ class diaspora {
dbesc($guid)
);
- if(count($r)) {
+ if($r) {
logger("message ".$guid." already exists for user ".$uid);
- return false;
+ return true;
}
- return true;
+ return false;
}
private function fetch_guid($item) {
@@ -461,7 +695,7 @@ class diaspora {
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;
@@ -472,18 +706,17 @@ class diaspora {
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;
- // This will not work if the server is not a Diaspora server
+ // This will work for Diaspora and newer Friendica servers
$source_url = $server."/p/".$guid.".xml";
$x = fetch_url($source_url);
if(!$x)
return false;
- /// @todo - should maybe solved by the dispatcher
$source_xml = parse_xml_string($x, false);
if (!is_object($source_xml))
@@ -491,41 +724,43 @@ class diaspora {
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 = "";
+
// Fetch the author - for the old and the new Diaspora version
if ($source_xml->post->status_message->diaspora_handle)
$author = (string)$source_xml->post->status_message->diaspora_handle;
- elseif ($source_xml->author)
+ elseif ($source_xml->author AND ($source_xml->getName() == "status_message"))
$author = (string)$source_xml->author;
+ // If this isn't a "status_message" then quit
if (!$author)
return false;
$msg = array("message" => $x, "author" => $author);
- // We don't really need this, but until the work is unfinished we better will keep this
- $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`
FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
intval($uid), dbesc($guid));
- if(!count($r)) {
+ if(!$r) {
$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);
}
@@ -540,14 +775,16 @@ class diaspora {
}
}
- if (!count($r)) {
- logger("parent item not found: parent: ".$guid." item: ".$guid);
+ if (!$r) {
+ logger("parent item not found: parent: ".$guid." - user: ".$uid);
return false;
- } else
+ } else {
+ logger("parent item found: parent: ".$guid." - user: ".$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));
@@ -588,10 +825,10 @@ class diaspora {
return "https://".substr($addr,strpos($addr,"@")+1)."/posts/".$guid;
}
- private function import_account_deletion($importer, $data) {
+ 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;
@@ -602,31 +839,31 @@ class diaspora {
return true;
}
- private function import_comment($importer, $sender, $data) {
+ private function receive_comment($importer, $sender, $data) {
$guid = notags(unxmlify($data->guid));
$parent_guid = notags(unxmlify($data->parent_guid));
$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();
@@ -658,13 +895,15 @@ class diaspora {
self::fetch_guid($datarray);
$message_id = item_store($datarray);
- // print_r($datarray);
+
+ if ($message_id)
+ logger("Stored comment ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG);
// If we are the origin of the parent we store the original data and notify our followers
if($message_id AND $parent_item["origin"]) {
// Formerly we stored the signed text, the signature and the author in different fields.
- // The new Diaspora protocol can have variable fields. We now store the data in correct order in a single field.
+ // 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))
@@ -677,61 +916,10 @@ class diaspora {
return $message_id;
}
- private function import_conversation($importer, $data) {
- print_r($data);
- die();
-/*
- $guid = notags(unxmlify($xml->guid));
- $subject = notags(unxmlify($xml->subject));
- $diaspora_handle = notags(unxmlify($xml->diaspora_handle));
- $participant_handles = notags(unxmlify($xml->participant_handles));
- $created_at = datetime_convert('UTC','UTC',notags(unxmlify($xml->created_at)));
-
- $parent_uri = $diaspora_handle . ':' . $guid;
-
- $messages = $xml->message;
-
- if(! count($messages)) {
- logger('empty conversation');
- return;
- }
-
- $contact = self::get_allowed_contact_by_handle($importer, $sender, true)
- if (!$contact)
- return false;
-
- $conversation = null;
-
- $c = q("select * from conv where uid = %d and guid = '%s' limit 1",
- intval($importer["uid"]),
- dbesc($guid)
- );
- if(count($c))
- $conversation = $c[0];
- else {
- $r = q("insert into conv (uid,guid,creator,created,updated,subject,recips) values(%d, '%s', '%s', '%s', '%s', '%s', '%s') ",
- intval($importer["uid"]),
- dbesc($guid),
- dbesc($diaspora_handle),
- dbesc(datetime_convert('UTC','UTC',$created_at)),
- dbesc(datetime_convert()),
- dbesc($subject),
- dbesc($participant_handles)
- );
- if($r)
- $c = q("select * from conv where uid = %d and guid = '%s' limit 1",
- intval($importer["uid"]),
- dbesc($guid)
- );
- if(count($c))
- $conversation = $c[0];
- }
- if(! $conversation) {
- logger('diaspora_conversation: unable to create conversation.');
- return;
- }
-
- foreach($messages as $mesg) {
+ private function receive_conversation_message($importer, $contact, $data, $msg, $mesg) {
+ $guid = notags(unxmlify($data->guid));
+ $subject = notags(unxmlify($data->subject));
+ $author = notags(unxmlify($data->author));
$reply = 0;
@@ -740,63 +928,73 @@ class diaspora {
$msg_parent_author_signature = notags(unxmlify($mesg->parent_author_signature));
$msg_author_signature = notags(unxmlify($mesg->author_signature));
$msg_text = unxmlify($mesg->text);
- $msg_created_at = datetime_convert('UTC','UTC',notags(unxmlify($mesg->created_at)));
- $msg_diaspora_handle = notags(unxmlify($mesg->diaspora_handle));
+ $msg_created_at = datetime_convert("UTC", "UTC", notags(unxmlify($mesg->created_at)));
+
+ // "diaspora_handle" is the element name from the old version
+ // "author" is the element name from the new version
+ if ($mesg->author)
+ $msg_author = notags(unxmlify($mesg->author));
+ elseif ($mesg->diaspora_handle)
+ $msg_author = notags(unxmlify($mesg->diaspora_handle));
+ else
+ return false;
+
$msg_conversation_guid = notags(unxmlify($mesg->conversation_guid));
+
if($msg_conversation_guid != $guid) {
- logger('diaspora_conversation: message conversation guid does not belong to the current conversation. ' . $xml);
- continue;
+ logger("message conversation guid does not belong to the current conversation.");
+ return false;
}
$body = diaspora2bb($msg_text);
- $message_id = $msg_diaspora_handle . ':' . $msg_guid;
+ $message_uri = $msg_author.":".$msg_guid;
- $author_signed_data = $msg_guid . ';' . $msg_parent_guid . ';' . $msg_text . ';' . unxmlify($mesg->created_at) . ';' . $msg_diaspora_handle . ';' . $msg_conversation_guid;
+ $author_signed_data = $msg_guid.";".$msg_parent_guid.";".$msg_text.";".unxmlify($mesg->created_at).";".$msg_author.";".$msg_conversation_guid;
$author_signature = base64_decode($msg_author_signature);
- if(strcasecmp($msg_diaspora_handle,$msg["author"]) == 0) {
+ if(strcasecmp($msg_author,$msg["author"]) == 0) {
$person = $contact;
$key = $msg["key"];
- }
- else {
- $person = find_diaspora_person_by_handle($msg_diaspora_handle);
+ } else {
+ $person = self::person_by_handle($msg_author);
- if(is_array($person) && x($person,'pubkey'))
+ if (is_array($person) && x($person, "pubkey"))
$key = $person["pubkey"];
else {
- logger('diaspora_conversation: unable to find author details');
- continue;
+ logger("unable to find author details");
+ return false;
}
}
- if(! rsa_verify($author_signed_data,$author_signature,$key,'sha256')) {
- logger('diaspora_conversation: verification failed.');
- continue;
+ if (!rsa_verify($author_signed_data, $author_signature, $key, "sha256")) {
+ logger("verification failed.");
+ return false;
}
if($msg_parent_author_signature) {
- $owner_signed_data = $msg_guid . ';' . $msg_parent_guid . ';' . $msg_text . ';' . unxmlify($mesg->created_at) . ';' . $msg_diaspora_handle . ';' . $msg_conversation_guid;
+ $owner_signed_data = $msg_guid.";".$msg_parent_guid.";".$msg_text.";".unxmlify($mesg->created_at).";".$msg_author.";".$msg_conversation_guid;
$parent_author_signature = base64_decode($msg_parent_author_signature);
$key = $msg["key"];
- if(! rsa_verify($owner_signed_data,$parent_author_signature,$key,'sha256')) {
- logger('diaspora_conversation: owner verification failed.');
- continue;
+ if (!rsa_verify($owner_signed_data, $parent_author_signature, $key, "sha256")) {
+ logger("owner verification failed.");
+ return false;
}
}
- $r = q("select id from mail where `uri` = '%s' limit 1",
- dbesc($message_id)
+ $r = q("SELECT `id` FROM `mail` WHERE `uri` = '%s' LIMIT 1",
+ dbesc($message_uri)
);
- if(count($r)) {
- logger('diaspora_conversation: duplicate message already delivered.', LOGGER_DEBUG);
- continue;
+ if($r) {
+ logger("duplicate message already delivered.", LOGGER_DEBUG);
+ return false;
}
- 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')",
+ 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($msg_guid),
intval($conversation["id"]),
@@ -808,32 +1006,86 @@ class diaspora {
dbesc($body),
0,
0,
- dbesc($message_id),
- dbesc($parent_uri),
+ dbesc($message_uri),
+ dbesc($author.":".$guid),
dbesc($msg_created_at)
);
- q("update conv set updated = '%s' where id = %d",
+ q("UPDATE `conv` SET `updated` = '%s' WHERE `id` = %d",
dbesc(datetime_convert()),
intval($conversation["id"])
);
notification(array(
- 'type' => NOTIFY_MAIL,
- 'notify_flags' => $importer["notify-flags"],
- 'language' => $importer["language"],
- 'to_name' => $importer["username"],
- 'to_email' => $importer["email"],
- 'uid' =>$importer["uid"],
- 'item' => array('subject' => $subject, 'body' => $body),
- 'source_name' => $person["name"],
- 'source_link' => $person["url"],
- 'source_photo' => $person["thumb"],
- 'verb' => ACTIVITY_POST,
- 'otype' => 'mail'
+ "type" => NOTIFY_MAIL,
+ "notify_flags" => $importer["notify-flags"],
+ "language" => $importer["language"],
+ "to_name" => $importer["username"],
+ "to_email" => $importer["email"],
+ "uid" =>$importer["uid"],
+ "item" => array("subject" => $subject, "body" => $body),
+ "source_name" => $person["name"],
+ "source_link" => $person["url"],
+ "source_photo" => $person["thumb"],
+ "verb" => ACTIVITY_POST,
+ "otype" => "mail"
));
}
-*/
+
+ private function receive_conversation($importer, $msg, $data) {
+ $guid = notags(unxmlify($data->guid));
+ $subject = notags(unxmlify($data->subject));
+ $created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
+ $author = notags(unxmlify($data->author));
+ $participants = notags(unxmlify($data->participants));
+
+ $messages = $data->message;
+
+ if (!count($messages)) {
+ logger("empty conversation");
+ return false;
+ }
+
+ $contact = self::allowed_contact_by_handle($importer, $msg["author"], true);
+ if (!$contact)
+ return false;
+
+ $conversation = null;
+
+ $c = q("SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
+ intval($importer["uid"]),
+ dbesc($guid)
+ );
+ if($c)
+ $conversation = $c[0];
+ else {
+ $r = q("INSERT INTO `conv` (`uid`, `guid`, `creator`, `created`, `updated`, `subject`, `recips`)
+ VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s')",
+ intval($importer["uid"]),
+ dbesc($guid),
+ dbesc($author),
+ dbesc(datetime_convert("UTC", "UTC", $created_at)),
+ dbesc(datetime_convert()),
+ dbesc($subject),
+ dbesc($participants)
+ );
+ if($r)
+ $c = q("SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
+ intval($importer["uid"]),
+ dbesc($guid)
+ );
+
+ if($c)
+ $conversation = $c[0];
+ }
+ if (!$conversation) {
+ logger("unable to create conversation.");
+ return;
+ }
+
+ foreach($messages as $mesg)
+ self::receive_conversation_message($importer, $contact, $data, $msg, $mesg);
+
return true;
}
@@ -849,25 +1101,20 @@ class diaspora {
private function construct_like_object($importer, $parent_item) {
$objtype = ACTIVITY_OBJ_NOTE;
- $link = xmlify(''."\n") ;
+ $link = '';
$parent_body = $parent_item["body"];
- $obj = <<< EOT
+ $xmldata = array("object" => array("type" => $objtype,
+ "local" => "1",
+ "id" => $parent_item["uri"],
+ "link" => $link,
+ "title" => "",
+ "content" => $parent_body));
-
-EOT;
-
- return $obj;
+ return xml::from_array($xmldata, $xml, true);
}
- private function import_like($importer, $sender, $data) {
+ private function receive_like($importer, $sender, $data) {
$positive = notags(unxmlify($data->positive));
$guid = notags(unxmlify($data->guid));
$parent_type = notags(unxmlify($data->parent_type));
@@ -879,25 +1126,25 @@ EOT;
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.
@@ -934,13 +1181,15 @@ EOT;
$datarray["body"] = self::construct_like_body($contact, $parent_item, $guid);
$message_id = item_store($datarray);
- //print_r($datarray);
+
+ if ($message_id)
+ logger("Stored like ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG);
// If we are the origin of the parent we store the original data and notify our followers
if($message_id AND $parent_item["origin"]) {
// Formerly we stored the signed text, the signature and the author in different fields.
- // The new Diaspora protocol can have variable fields. We now store the data in correct order in a single field.
+ // 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))
@@ -953,7 +1202,7 @@ EOT;
return $message_id;
}
- private function import_message($importer, $data) {
+ private function receive_message($importer, $data) {
$guid = notags(unxmlify($data->guid));
$parent_guid = notags(unxmlify($data->parent_guid));
$text = unxmlify($data->text);
@@ -961,9 +1210,7 @@ EOT;
$author = notags(unxmlify($data->author));
$conversation_guid = notags(unxmlify($data->conversation_guid));
- $parent_uri = $author.":".$parent_guid;
-
- $contact = self::get_allowed_contact_by_handle($importer, $author, true);
+ $contact = self::allowed_contact_by_handle($importer, $author, true);
if (!$contact)
return false;
@@ -973,7 +1220,7 @@ EOT;
intval($importer["uid"]),
dbesc($conversation_guid)
);
- if(count($c))
+ if($c)
$conversation = $c[0];
else {
logger("conversation not available.");
@@ -983,19 +1230,19 @@ EOT;
$reply = 0;
$body = diaspora2bb($text);
- $message_id = $author.":".$guid;
+ $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;
}
$r = q("SELECT `id` FROM `mail` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($message_id),
+ dbesc($message_uri),
intval($importer["uid"])
);
- if(count($r)) {
+ if($r) {
logger("duplicate message already delivered.", LOGGER_DEBUG);
return false;
}
@@ -1013,8 +1260,8 @@ EOT;
dbesc($body),
0,
1,
- dbesc($message_id),
- dbesc($parent_uri),
+ dbesc($message_uri),
+ dbesc($author.":".$parent_guid),
dbesc($created_at)
);
@@ -1026,25 +1273,25 @@ EOT;
return true;
}
- private function import_participation($importer, $data) {
+ private function receive_participation($importer, $data) {
// I'm not sure if we can fully support this message type
return true;
}
- private function import_photo($importer, $data) {
+ private function receive_photo($importer, $data) {
// There doesn't seem to be a reason for this function, since the photo data is transmitted in the status message as well
return true;
}
- private function import_poll_participation($importer, $data) {
+ private function receive_poll_participation($importer, $data) {
// We don't support polls by now
return true;
}
- private function import_profile($importer, $data) {
+ 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;
@@ -1121,24 +1368,14 @@ EOT;
update_gcontact($gcontact);
+ logger("Profile of contact ".$contact["id"]." stored for user ".$importer["uid"], LOGGER_DEBUG);
+
return true;
}
- private function import_request($importer, $data) {
-print_r($data);
-/*
- $author = unxmlify($xml->author);
- $recipient = unxmlify($xml->recipient);
+ private function receive_request_make_friend($importer, $contact) {
- if (!$author || !$recipient)
- return;
-
- $contact = self::get_contact_by_handle($importer["uid"],$author);
-
- if($contact) {
-
- // perhaps we were already sharing with this person. Now they're sharing with us.
- // That makes us friends.
+ $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",
@@ -1153,18 +1390,18 @@ print_r($data);
intval($importer["uid"])
);
- if((count($r)) && (!$r[0]["hide-friends"]) && (!$contact["hidden"]) && intval(get_pconfig($importer["uid"],'system','post_newfriend'))) {
+ if($r && !$r[0]["hide-friends"] && !$contact["hidden"] && intval(get_pconfig($importer["uid"], "system", "post_newfriend"))) {
- $self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
+ $self = q("SELECT * FROM `contact` WHERE `self` AND `uid` = %d LIMIT 1",
intval($importer["uid"])
);
// they are not CONTACT_IS_FOLLOWER anymore but that's what we have in the array
- if(count($self) && $contact["rel"] == CONTACT_IS_FOLLOWER) {
+ if($self && $contact["rel"] == CONTACT_IS_FOLLOWER) {
$arr = array();
- $arr["uri"] = $arr["parent-uri"] = item_new_uri(App::get_hostname(), $importer["uid"]);
+ $arr["uri"] = $arr["parent-uri"] = item_new_uri($a->get_hostname(), $importer["uid"]);
$arr["uid"] = $importer["uid"];
$arr["contact-id"] = $self[0]["id"];
$arr["wall"] = 1;
@@ -1177,17 +1414,16 @@ print_r($data);
$arr["verb"] = ACTIVITY_FRIEND;
$arr["object-type"] = ACTIVITY_OBJ_PERSON;
- $A = '[url=' . $self[0]["url"] . "]' . $self[0]["name"] . '[/url]';
- $B = '[url=' . $contact["url"] . "]' . $contact["name"] . '[/url]';
- $BPhoto = '[url=' . $contact["url"] . "]' . '[img]' . $contact["thumb"] . '[/img][/url]';
- $arr["body"] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$Bphoto;
-
- $arr["object"] = '' . "\n";
+ $A = "[url=".$self[0]["url"]."]".$self[0]["name"]."[/url]";
+ $B = "[url=".$contact["url"]."]".$contact["name"]."[/url]";
+ $BPhoto = "[url=".$contact["url"]."][img]".$contact["thumb"]."[/img][/url]";
+ $arr["body"] = sprintf(t("%1$s is now friends with %2$s"), $A, $B)."\n\n\n".$Bphoto;
+
+ $arr["object"] = "\n";
$arr["last-child"] = 1;
$arr["allow_cid"] = $user[0]["allow_cid"];
@@ -1197,115 +1433,127 @@ print_r($data);
$i = item_store($arr);
if($i)
- proc_run('php',"include/notifier.php","activity","$i");
+ proc_run("php", "include/notifier.php", "activity", $i);
}
}
-
- return;
}
- $ret = self::get_person_by_handle($author);
+ private function receive_request($importer, $data) {
+ $author = unxmlify($data->author);
+ $recipient = unxmlify($data->recipient);
+ if (!$author || !$recipient)
+ return;
- if((! count($ret)) || ($ret["network"] != NETWORK_DIASPORA)) {
- logger('diaspora_request: Cannot resolve diaspora handle ' . $author . ' for ' . $recipient);
- return;
- }
+ $contact = self::contact_by_handle($importer["uid"],$author);
- $batch = (($ret["batch"]) ? $ret["batch"] : implode('/', array_slice(explode('/',$ret["url"]),0,3)) . '/receive/public');
+ if($contact) {
+ // perhaps we were already sharing with this person. Now they're sharing with us.
+ // That makes us friends.
+ self::receive_request_make_friend($importer, $contact);
+ return true;
+ }
- $r = q("INSERT INTO `contact` (`uid`, `network`,`addr`,`created`,`url`,`nurl`,`batch`,`name`,`nick`,`photo`,`pubkey`,`notify`,`poll`,`blocked`,`priority`)
- VALUES ( %d, '%s', '%s', '%s', '%s','%s','%s','%s','%s','%s','%s','%s','%s',%d,%d) ",
- intval($importer["uid"]),
- dbesc($ret["network"]),
- dbesc($ret["addr"]),
- datetime_convert(),
- dbesc($ret["url"]),
- dbesc(normalise_link($ret["url"])),
- dbesc($batch),
- dbesc($ret["name"]),
- dbesc($ret["nick"]),
- dbesc($ret["photo"]),
- dbesc($ret["pubkey"]),
- dbesc($ret["notify"]),
- dbesc($ret["poll"]),
- 1,
- 2
- );
+ $ret = self::person_by_handle($author);
- // find the contact record we just created
+ if (!$ret || ($ret["network"] != NETWORK_DIASPORA)) {
+ logger("Cannot resolve diaspora handle ".$author." for ".$recipient);
+ return false;
+ }
- $contact_record = diaspora_get_contact_by_handle($importer["uid"],$author);
+ $batch = (($ret["batch"]) ? $ret["batch"] : implode("/", array_slice(explode("/", $ret["url"]), 0, 3))."/receive/public");
- if(! $contact_record) {
- logger('diaspora_request: unable to locate newly created contact record.');
- return;
- }
+ $r = q("INSERT INTO `contact` (`uid`, `network`,`addr`,`created`,`url`,`nurl`,`batch`,`name`,`nick`,`photo`,`pubkey`,`notify`,`poll`,`blocked`,`priority`)
+ VALUES (%d, '%s', '%s', '%s', '%s','%s','%s','%s','%s','%s','%s','%s','%s',%d,%d)",
+ intval($importer["uid"]),
+ dbesc($ret["network"]),
+ dbesc($ret["addr"]),
+ datetime_convert(),
+ dbesc($ret["url"]),
+ dbesc(normalise_link($ret["url"])),
+ dbesc($batch),
+ dbesc($ret["name"]),
+ dbesc($ret["nick"]),
+ dbesc($ret["photo"]),
+ dbesc($ret["pubkey"]),
+ dbesc($ret["notify"]),
+ dbesc($ret["poll"]),
+ 1,
+ 2
+ );
- $g = q("select def_gid from user where uid = %d limit 1",
- intval($importer["uid"])
- );
- if($g && intval($g[0]["def_gid"])) {
- group_add_member($importer["uid"],'',$contact_record["id"],$g[0]["def_gid"]);
- }
+ // find the contact record we just created
- if($importer["page-flags"] == PAGE_NORMAL) {
+ $contact_record = self::contact_by_handle($importer["uid"],$author);
- $hash = random_string() . (string) time(); // Generate a confirm_key
+ if (!$contact_record) {
+ logger("unable to locate newly created contact record.");
+ return;
+ }
- $ret = q("INSERT INTO `intro` ( `uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime` )
- VALUES ( %d, %d, %d, %d, '%s', '%s', '%s' )",
- intval($importer["uid"]),
- intval($contact_record["id"]),
- 0,
- 0,
- dbesc( t('Sharing notification from Diaspora network')),
- dbesc($hash),
- dbesc(datetime_convert())
+ $g = q("SELECT `def_gid` FROM `user` WHERE `uid` = %d LIMIT 1",
+ intval($importer["uid"])
);
- }
- else {
- // automatic friend approval
+ if($g && intval($g[0]["def_gid"]))
+ group_add_member($importer["uid"], "", $contact_record["id"], $g[0]["def_gid"]);
- update_contact_avatar($contact_record["photo"],$importer["uid"],$contact_record["id"]);
+ if($importer["page-flags"] == PAGE_NORMAL) {
- // technically they are sharing with us (CONTACT_IS_SHARING),
- // but if our page-type is PAGE_COMMUNITY or PAGE_SOAPBOX
- // we are going to change the relationship and make them a follower.
+ $hash = random_string().(string)time(); // Generate a confirm_key
- if($importer["page-flags"] == PAGE_FREELOVE)
- $new_relation = CONTACT_IS_FRIEND;
- else
- $new_relation = CONTACT_IS_FOLLOWER;
-
- $r = q("UPDATE `contact` SET `rel` = %d,
- `name-date` = '%s',
- `uri-date` = '%s',
- `blocked` = 0,
- `pending` = 0,
- `writable` = 1
- WHERE `id` = %d
- ",
- intval($new_relation),
- dbesc(datetime_convert()),
- dbesc(datetime_convert()),
- intval($contact_record["id"])
- );
+ $ret = q("INSERT INTO `intro` (`uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`)
+ VALUES (%d, %d, %d, %d, '%s', '%s', '%s')",
+ intval($importer["uid"]),
+ intval($contact_record["id"]),
+ 0,
+ 0,
+ dbesc(t("Sharing notification from Diaspora network")),
+ dbesc($hash),
+ dbesc(datetime_convert())
+ );
+ } else {
+
+ // automatic friend approval
+
+ update_contact_avatar($contact_record["photo"],$importer["uid"],$contact_record["id"]);
+
+ // technically they are sharing with us (CONTACT_IS_SHARING),
+ // but if our page-type is PAGE_COMMUNITY or PAGE_SOAPBOX
+ // we are going to change the relationship and make them a follower.
+
+ if($importer["page-flags"] == PAGE_FREELOVE)
+ $new_relation = CONTACT_IS_FRIEND;
+ else
+ $new_relation = CONTACT_IS_FOLLOWER;
+
+ $r = q("UPDATE `contact` SET `rel` = %d,
+ `name-date` = '%s',
+ `uri-date` = '%s',
+ `blocked` = 0,
+ `pending` = 0,
+ `writable` = 1
+ WHERE `id` = %d
+ ",
+ intval($new_relation),
+ dbesc(datetime_convert()),
+ dbesc(datetime_convert()),
+ intval($contact_record["id"])
+ );
+
+ $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer["uid"]));
+ if($u)
+ $ret = self::send_share($u[0], $contact_record);
+ }
- $u = q("select * from user where uid = %d limit 1",intval($importer["uid"]));
- if($u)
- $ret = diaspora_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`,
@@ -1313,38 +1561,40 @@ print_r($data);
FROM `item` WHERE `guid` = '%s' AND `visible` AND NOT `deleted` AND `body` != '' LIMIT 1",
dbesc($guid));
- if(count($r)) {
+ if($r) {
logger("reshared message ".$guid." already exists on system.");
// Maybe it is already a reshared item?
// Then refetch the content, since there can be many side effects with reshared posts from other networks or reshares from reshares
- if (api_share_as_retweet($r[0]))
+ if (self::is_reshare($r[0]["body"]))
$r = array();
else
return $r[0];
}
- if (!count($r)) {
- $server = 'https://'.substr($orig_author,strpos($orig_author,'@')+1);
+ if (!$r) {
+ $server = "https://".substr($orig_author, strpos($orig_author, "@") + 1);
logger("1st try: reshared message ".$guid." will be fetched from original server: ".$server);
$item_id = self::store_by_guid($guid, $server);
if (!$item_id) {
- $server = 'https://'.substr($author,strpos($author,'@')+1);
- logger("2nd try: reshared message ".$guid." will be fetched from sharer's server: ".$server);
- $item = self::store_by_guid($guid, $server);
+ $server = "http://".substr($orig_author, strpos($orig_author, "@") + 1);
+ logger("2nd try: reshared message ".$guid." will be fetched from original server: ".$server);
+ $item_id = self::store_by_guid($guid, $server);
}
- if (!$item_id) {
- $server = 'http://'.substr($orig_author,strpos($orig_author,'@')+1);
- logger("3rd try: reshared message ".$guid." will be fetched from original server: ".$server);
- $item = self::store_by_guid($guid, $server);
+
+ // Deactivated by now since there is a risk that someone could manipulate postings through this method
+/* if (!$item_id) {
+ $server = "https://".substr($author, strpos($author, "@") + 1);
+ logger("3rd try: reshared message ".$guid." will be fetched from sharer's server: ".$server);
+ $item_id = self::store_by_guid($guid, $server);
}
if (!$item_id) {
- $server = 'http://'.substr($author,strpos($author,'@')+1);
+ $server = "http://".substr($author, strpos($author, "@") + 1);
logger("4th try: reshared message ".$guid." will be fetched from sharer's server: ".$server);
- $item = self::store_by_guid($guid, $server);
+ $item_id = self::store_by_guid($guid, $server);
}
-
+*/
if ($item_id) {
$r = q("SELECT `body`, `tag`, `app`, `created`, `object-type`, `uri`, `guid`,
`author-name`, `author-link`, `author-avatar`
@@ -1359,7 +1609,7 @@ print_r($data);
return false;
}
- private function import_reshare($importer, $data) {
+ private function receive_reshare($importer, $data) {
$root_author = notags(unxmlify($data->root_author));
$root_guid = notags(unxmlify($data->root_guid));
$guid = notags(unxmlify($data->guid));
@@ -1367,17 +1617,19 @@ print_r($data);
$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;
+ 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;
+ $orig_url = App::get_baseurl()."/display/".$original_item["guid"];
+
$datarray = array();
$datarray["uid"] = $importer["uid"];
@@ -1401,7 +1653,7 @@ print_r($data);
$datarray["object"] = json_encode($data);
$prefix = share_header($original_item["author-name"], $original_item["author-link"], $original_item["author-avatar"],
- $original_item["guid"], $original_item["created"], $original_item["uri"]);
+ $original_item["guid"], $original_item["created"], $orig_url);
$datarray["body"] = $prefix.$original_item["body"]."[/share]";
$datarray["tag"] = $original_item["tag"];
@@ -1414,14 +1666,24 @@ print_r($data);
$datarray["object-type"] = $original_item["object-type"];
self::fetch_guid($datarray);
- //$message_id = item_store($datarray);
- print_r($datarray);
+ $message_id = item_store($datarray);
+
+ if ($message_id)
+ logger("Stored reshare ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG);
return $message_id;
}
private function item_retraction($importer, $contact, $data) {
+ $target_type = notags(unxmlify($data->target_type));
$target_guid = notags(unxmlify($data->target_guid));
+ $author = notags(unxmlify($data->author));
+
+ $person = self::person_by_handle($author);
+ if (!is_array($person)) {
+ logger("unable to find author detail for ".$author);
+ return false;
+ }
$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),
@@ -1431,8 +1693,20 @@ print_r($data);
return false;
// Only delete it if the author really fits
- if (!link_compare($r[0]["author-link"],$contact["url"]))
+ if (!link_compare($r[0]["author-link"], $person["url"])) {
+ logger("Item author ".$r[0]["author-link"]." doesn't fit to expected contact ".$person["url"], LOGGER_DEBUG);
+ return false;
+ }
+
+ // Check if the sender is the thread owner
+ $p = q("SELECT `author-link`, `origin` FROM `item` WHERE `id` = %d",
+ intval($r[0]["parent"]));
+
+ // Only delete it if the parent author really fits
+ if (!link_compare($p[0]["author-link"], $contact["url"]) AND !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;
+ }
// 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",
@@ -1442,60 +1716,56 @@ print_r($data);
);
delete_thread($r[0]["id"], $r[0]["parent-uri"]);
- // Now check if the retraction needs to be relayed by us
- //
- // 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 `origin` FROM `item` WHERE `parent` = %d AND `id` = %d LIMIT 1",
- intval($r[0]["parent"]),
- intval($r[0]["parent"])
- );
- if(count($p)) {
- if($p[0]["origin"]) {
+ logger("Deleted target ".$target_guid." from user ".$importer["uid"], LOGGER_DEBUG);
- // Formerly we stored the signed text, the signature and the author in different fields.
- // The new Diaspora protocol can have variable fields. We now store the data in correct order in a single field.
- q("INSERT INTO `sign` (`iid`,`signed_text`) VALUES (%d,'%s')",
- intval($r[0]["id"]),
- dbesc(json_encode($data))
- );
+ // Now check if the retraction needs to be relayed by us
+ if($p[0]["origin"]) {
- // the existence of parent_author_signature would have meant the parent_author or owner
- // is already relaying.
- logger("relaying retraction");
+ // 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` (`retract_iid`,`signed_text`) VALUES (%d,'%s')",
+ intval($r[0]["id"]),
+ dbesc(json_encode($data))
+ );
- proc_run("php", "include/notifier.php", "drop", $r[0]["id"]);
- }
+ // notify others
+ proc_run("php", "include/notifier.php", "drop", $r[0]["id"]);
}
}
- private function import_retraction($importer, $data) {
+ private function receive_retraction($importer, $sender, $data) {
$target_type = notags(unxmlify($data->target_type));
- $author = notags(unxmlify($data->author));
- $contact = self::get_contact_by_handle($importer["uid"], $author);
+ $contact = self::contact_by_handle($importer["uid"], $sender);
if (!$contact) {
- logger("cannot find contact for author: ".$author);
+ logger("cannot find contact for sender: ".$sender." and user ".$importer["uid"]);
return false;
}
+ logger("Got retraction for ".$target_type.", sender ".$sender." and user ".$importer["uid"], LOGGER_DEBUG);
+
switch ($target_type) {
- case "Comment": case "Like": case "StatusMessage":
- self::item_retraction($importer, $contact, $data);
- break;
+ case "Comment":
+ case "Like":
+ case "Post": // "Post" will be supported in a future version
+ case "Reshare":
+ case "StatusMessage":
+ return self::item_retraction($importer, $contact, $data);;
case "Person":
- contact_remove($contact["id"]);
+ /// @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:
logger("Unknown target type ".$target_type);
+ return false;
}
return true;
}
- private function import_status_message($importer, $data) {
+ private function receive_status_message($importer, $data) {
$raw_message = unxmlify($data->raw_message);
$guid = notags(unxmlify($data->guid));
@@ -1510,12 +1780,12 @@ print_r($data);
// 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;
- //if (self::message_exists($importer["uid"], $guid))
- // return false;
+ if (self::message_exists($importer["uid"], $guid))
+ return false;
$address = array();
if ($data->location)
@@ -1539,18 +1809,6 @@ print_r($data);
$body = add_page_info_to_body($body, false, true);
}
- $str_tags = "";
-
- // This doesn't work. @todo Check if the "tag" field is filled in the "item_store" function.
- $cnt = preg_match_all("/@\[url=(.*?)\[\/url\]/ism", $body, $matches, PREG_SET_ORDER);
- if($cnt) {
- foreach($matches as $mtch) {
- if(strlen($str_tags))
- $str_tags .= ",";
- $str_tags .= "@[url=".$mtch[1]."[/url]";
- }
- }
-
$datarray["uid"] = $importer["uid"];
$datarray["contact-id"] = $contact["id"];
$datarray["network"] = NETWORK_DIASPORA;
@@ -1573,7 +1831,6 @@ print_r($data);
$datarray["body"] = $body;
- $datarray["tag"] = $str_tags;
if ($provider_display_name != "")
$datarray["app"] = $provider_display_name;
@@ -1588,12 +1845,621 @@ print_r($data);
$datarray["coord"] = $address["lat"]." ".$address["lng"];
self::fetch_guid($datarray);
- //$message_id = item_store($datarray);
- print_r($datarray);
+ $message_id = item_store($datarray);
- logger("Stored item with message id ".$message_id, LOGGER_DEBUG);
+ if ($message_id)
+ logger("Stored item ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG);
return $message_id;
}
+
+ /******************************************************************************************
+ * Here are all the functions that are needed to transmit data with the Diaspora protocol *
+ ******************************************************************************************/
+
+ private function my_handle($me) {
+ if ($contact["addr"] != "")
+ return $contact["addr"];
+
+ // Normally we should have a filled "addr" field - but in the past this wasn't the case
+ // So - just in case - we build the the address here.
+ return $me["nickname"]."@".substr(App::get_baseurl(), strpos(App::get_baseurl(),"://") + 3);
+ }
+
+ private 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" => "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;
+ }
+
+ private 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 = random_string(32);
+ $b_inner_aes_key = base64_encode($inner_aes_key);
+ $inner_iv = random_string(16);
+ $b_inner_iv = base64_encode($inner_iv);
+
+ $outer_aes_key = random_string(32);
+ $b_outer_aes_key = base64_encode($outer_aes_key);
+ $outer_iv = random_string(16);
+ $b_outer_iv = base64_encode($outer_iv);
+
+ $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);
+
+ $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);
+ $decrypted_header = pkcs5_pad($decrypted_header,16);
+
+ $ciphertext = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $outer_aes_key, $decrypted_header, MCRYPT_MODE_CBC, $outer_iv);
+
+ $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" => "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;
+ }
+
+ private function build_message($msg, $user, $contact, $prvkey, $pubkey, $public = false) {
+
+ 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;
+ }
+
+ private function signature($owner, $message) {
+ $sigmsg = $message;
+ unset($sigmsg["author_signature"]);
+ unset($sigmsg["parent_author_signature"]);
+
+ $signed_text = implode(";", $sigmsg);
+
+ return base64_encode(rsa_sign($signed_text, $owner["uprvkey"], "sha256"));
+ }
+
+ public static function transmit($owner, $contact, $slap, $public_batch, $queue_run=false, $guid = "") {
+
+ $a = get_app();
+
+ $enabled = intval(get_config("system", "diaspora_enabled"));
+ if(!$enabled)
+ return 200;
+
+ $logid = random_string(4);
+ $dest_url = (($public_batch) ? $contact["batch"] : $contact["notify"]);
+ if (!$dest_url) {
+ logger("no url for contact: ".$contact["id"]." batch mode =".$public_batch);
+ return 0;
+ }
+
+ logger("transmit: ".$logid."-".$guid." ".$dest_url);
+
+ if (!$queue_run && was_recently_delayed($contact["id"])) {
+ $return_code = 0;
+ } else {
+ if (!intval(get_config("system", "diaspora_test"))) {
+ post_url($dest_url."/", $slap);
+ $return_code = $a->get_curl_code();
+ } else {
+ logger("test_mode");
+ return 200;
+ }
+ }
+
+ logger("transmit: ".$logid."-".$guid." returns: ".$return_code);
+
+ if(!$return_code || (($return_code == 503) && (stristr($a->get_curl_headers(), "retry-after")))) {
+ logger("queue message");
+
+ $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),
+ 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);
+ }
+ }
+
+ return(($return_code) ? $return_code : (-1));
+ }
+
+
+ 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);
+
+ logger('message: '.$msg, LOGGER_DATA);
+ logger('send guid '.$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, $guid);
+
+ logger("guid: ".$item["guid"]." result ".$return_code, LOGGER_DEBUG);
+
+ return $return_code;
+ }
+
+ public static function send_share($owner,$contact) {
+
+ $message = array("sender_handle" => self::my_handle($owner),
+ "recipient_handle" => $contact["addr"]);
+
+ return self::build_and_transmit($owner, $contact, "request", $message);
+ }
+
+ public static function send_unshare($owner,$contact) {
+
+ $message = array("post_guid" => $owner["guid"],
+ "diaspora_handle" => self::my_handle($owner),
+ "type" => "Person");
+
+ return self::build_and_transmit($owner, $contact, "retraction", $message);
+ }
+
+ private function is_reshare($body) {
+ $body = trim($body);
+
+ // Skip if it isn't a pure repeated messages
+ // Does it start with a share?
+ if (strpos($body, "[share") > 0)
+ return(false);
+
+ // Does it end with a share?
+ if (strlen($body) > (strrpos($body, "[/share]") + 8))
+ return(false);
+
+ $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body);
+ // Skip if there is no shared message in there
+ if ($body == $attributes)
+ return(false);
+
+ $guid = "";
+ preg_match("/guid='(.*?)'/ism", $attributes, $matches);
+ if ($matches[1] != "")
+ $guid = $matches[1];
+
+ preg_match('/guid="(.*?)"/ism', $attributes, $matches);
+ if ($matches[1] != "")
+ $guid = $matches[1];
+
+ if ($guid != "") {
+ $r = q("SELECT `contact-id` FROM `item` WHERE `guid` = '%s' AND `network` IN ('%s', '%s') LIMIT 1",
+ dbesc($guid), NETWORK_DFRN, NETWORK_DIASPORA);
+ if ($r) {
+ $ret= array();
+ $ret["root_handle"] = self::handle_from_contact($r[0]["contact-id"]);
+ $ret["root_guid"] = $guid;
+ return($ret);
+ }
+ }
+
+ $profile = "";
+ preg_match("/profile='(.*?)'/ism", $attributes, $matches);
+ if ($matches[1] != "")
+ $profile = $matches[1];
+
+ preg_match('/profile="(.*?)"/ism', $attributes, $matches);
+ if ($matches[1] != "")
+ $profile = $matches[1];
+
+ $ret= array();
+
+ $ret["root_handle"] = preg_replace("=https?://(.*)/u/(.*)=ism", "$2@$1", $profile);
+ if (($ret["root_handle"] == $profile) OR ($ret["root_handle"] == ""))
+ return(false);
+
+ $link = "";
+ preg_match("/link='(.*?)'/ism", $attributes, $matches);
+ if ($matches[1] != "")
+ $link = $matches[1];
+
+ preg_match('/link="(.*?)"/ism', $attributes, $matches);
+ if ($matches[1] != "")
+ $link = $matches[1];
+
+ $ret["root_guid"] = preg_replace("=https?://(.*)/posts/(.*)=ism", "$2", $link);
+ if (($ret["root_guid"] == $link) OR ($ret["root_guid"] == ""))
+ return(false);
+ return($ret);
+ }
+
+ public static function send_status($item, $owner, $contact, $public_batch = false) {
+
+ $myaddr = self::my_handle($owner);
+
+ $public = (($item["private"]) ? "false" : "true");
+
+ $created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d H:i:s \U\T\C');
+
+ // Detect a share element and do a reshare
+ if (!$item['private'] AND ($ret = self::is_reshare($item["body"]))) {
+ $message = array("root_diaspora_id" => $ret["root_handle"],
+ "root_guid" => $ret["root_guid"],
+ "guid" => $item["guid"],
+ "diaspora_handle" => $myaddr,
+ "public" => $public,
+ "created_at" => $created,
+ "provider_display_name" => $item["app"]);
+
+ $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"] != "")
+ $location["address"] = $item["location"];
+
+ if ($item["coord"] != "") {
+ $coord = explode(" ", $item["coord"]);
+ $location["lat"] = $coord[0];
+ $location["lng"] = $coord[1];
+ }
+
+ $message = array("raw_message" => $body,
+ "location" => $location,
+ "guid" => $item["guid"],
+ "diaspora_handle" => $myaddr,
+ "public" => $public,
+ "created_at" => $created,
+ "provider_display_name" => $item["app"]);
+
+ if (count($location) == 0)
+ unset($message["location"]);
+
+ $type = "status_message";
+ }
+
+ return self::build_and_transmit($owner, $contact, $type, $message, $public_batch, $item["guid"]);
+ }
+
+ private function construct_like($item, $owner) {
+
+ $myaddr = self::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";
+
+ 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) {
+
+ $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"]));
+
+ 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) {
+ $message = self::construct_like($item, $owner);
+ $type = "like";
+ } else {
+ $message = self::construct_comment($item, $owner);
+ $type = "comment";
+ }
+
+ if (!$message)
+ return false;
+
+ $message["author_signature"] = self::signature($owner, $message);
+
+ return self::build_and_transmit($owner, $contact, $type, $message, $public_batch, $item["guid"]);
+ }
+
+ private function message_from_signatur($item, $signature) {
+
+ // Split the signed text
+ $signed_parts = explode(";", $signature['signed_text']);
+
+ 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 handle
+ $handle = array_pop($signed_parts);
+
+ // Glue the parts together
+ $text = implode(";", $signed_parts);
+
+ $message = array("guid" => $guid,
+ "parent_guid" => $parent_guid,
+ "parent_author_signature" => "",
+ "author_signature" => $signature['signature'],
+ "text" => implode(";", $signed_parts),
+ "diaspora_handle" => $handle);
+ }
+ return $message;
+ }
+
+ public static function send_relay($item, $owner, $contact, $public_batch = false) {
+
+ 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";
+ }
+
+ // fetch the original signature
+
+ $r = q("SELECT `signed_text`, `signature`, `signer` FROM `sign` WHERE `".$sql_sign_id."` = %d LIMIT 1",
+ intval($item["id"]));
+
+ if (!$r)
+ return self::send_followup($item, $owner, $contact, $public_batch);
+
+ $signature = $r[0];
+
+ // 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
+ $msg = json_decode($signature['signed_text'], true);
+
+ $message = array();
+ foreach ($msg AS $field => $data) {
+ if (!$item["deleted"]) {
+ if ($field == "author")
+ $field = "diaspora_handle";
+ if ($field == "parent_type")
+ $field = "target_type";
+ }
+
+ $message[$field] = $data;
+ }
+ }
+
+ 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);
+
+ logger("Relayed data ".print_r($message, true), LOGGER_DEBUG);
+
+ return self::build_and_transmit($owner, $contact, $type, $message, $public_batch, $item["guid"]);
+ }
+
+ public static function send_retraction($item, $owner, $contact, $public_batch = false) {
+
+ $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"]) {
+ $msg_type = "relayable_retraction";
+ $target_type = (($item["verb"] === ACTIVITY_LIKE) ? "Like" : "Comment");
+ } else {
+ $msg_type = "signed_retraction";
+ $target_type = "StatusMessage";
+ }
+
+ $signed_text = $item["guid"].";".$target_type;
+
+ $message = array("target_guid" => $item['guid'],
+ "target_type" => $target_type,
+ "sender_handle" => $myaddr,
+ "target_author_signature" => base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256')));
+
+ return self::build_and_transmit($owner, $contact, $msg_type, $message, $public_batch, $item["guid"]);
+ }
+
+ public static function send_mail($item, $owner, $contact) {
+
+ $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 (!$r) {
+ logger("conversation not found.");
+ return;
+ }
+ $cnv = $r[0];
+
+ $conv = 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"]
+ );
+
+ $body = bb2diaspora($item["body"]);
+ $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(
+ "guid" => $item["guid"],
+ "parent_guid" => $cnv["guid"],
+ "parent_author_signature" => $sig,
+ "author_signature" => $sig,
+ "text" => $body,
+ "created_at" => $created,
+ "diaspora_handle" => $myaddr,
+ "conversation_guid" => $cnv["guid"]
+ );
+
+ 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'),
+ "message" => $msg,
+ "diaspora_handle" => $cnv["creator"],
+ "participant_handles" => $cnv["recips"]);
+
+ $type = "conversation";
+ }
+
+ return self::build_and_transmit($owner, $contact, $type, $message, false, $item["guid"]);
+ }
}
?>