* This will change in the future.
*/
+use Friendica\App;
use Friendica\Core\Config;
require_once 'include/items.php';
require_once 'include/bb2diaspora.php';
-require_once 'include/Scrape.php';
+require_once 'include/probe.php';
require_once 'include/Contact.php';
require_once 'include/Photo.php';
require_once 'include/socgraph.php';
}
/**
- * @brief: Decodes incoming Diaspora message
+ * @brief: Decodes incoming Diaspora message in the new format
+ *
+ * @param array $importer Array of the importer user
+ * @param string $raw raw post message
+ *
+ * @return array
+ * 'message' -> decoded Diaspora XML message
+ * 'author' -> author diaspora handle
+ * 'key' -> author public key (converted to pkcs#8)
+ */
+ public static function decode_raw($importer, $raw) {
+ $data = json_decode($raw);
+
+ // Is it a private post? Then decrypt the outer Salmon
+ if (is_object($data)) {
+ $encrypted_aes_key_bundle = base64_decode($data->aes_key);
+ $ciphertext = base64_decode($data->encrypted_magic_envelope);
+
+ $outer_key_bundle = '';
+ @openssl_private_decrypt($encrypted_aes_key_bundle, $outer_key_bundle, $importer['prvkey']);
+ $j_outer_key_bundle = json_decode($outer_key_bundle);
+
+ if (!is_object($j_outer_key_bundle)) {
+ logger('Outer Salmon did not verify. Discarding.');
+ http_status_exit(400);
+ }
+
+ $outer_iv = base64_decode($j_outer_key_bundle->iv);
+ $outer_key = base64_decode($j_outer_key_bundle->key);
+
+ $xml = diaspora::aes_decrypt($outer_key, $outer_iv, $ciphertext);
+ } else {
+ $xml = $raw;
+ }
+
+ $basedom = parse_xml_string($xml);
+
+ if (!is_object($basedom)) {
+ logger('Received data does not seem to be an XML. Discarding.');
+ http_status_exit(400);
+ }
+
+ $base = $basedom->children(NAMESPACE_SALMON_ME);
+
+ // Not sure if this cleaning is needed
+ $data = str_replace(array(" ", "\t", "\r", "\n"), array("", "", "", ""), $base->data);
+
+ // Build the signed data
+ $type = $base->data[0]->attributes()->type[0];
+ $encoding = $base->encoding;
+ $alg = $base->alg;
+ $signed_data = $data.'.'.base64url_encode($type).'.'.base64url_encode($encoding).'.'.base64url_encode($alg);
+
+ // This is the signature
+ $signature = base64url_decode($base->sig);
+
+ // Get the senders' public key
+ $key_id = $base->sig[0]->attributes()->key_id[0];
+ $author_addr = base64_decode($key_id);
+ $key = diaspora::key($author_addr);
+
+ $verify = rsa_verify($signed_data, $signature, $key);
+ if (!$verify) {
+ logger('Message did not verify. Discarding.');
+ http_status_exit(400);
+ }
+
+ return array('message' => (string)base64url_decode($base->data),
+ 'author' => unxmlify($author_addr),
+ 'key' => (string)$key);
+ }
+
+ /**
+ * @brief: Decodes incoming Diaspora message in the deprecated format
*
* @param array $importer Array of the importer user
* @param string $xml urldecoded Diaspora salmon
$public = false;
$basedom = parse_xml_string($xml);
- if (!is_object($basedom))
+ if (!is_object($basedom)) {
+ logger("XML is not parseable.");
return false;
-
+ }
$children = $basedom->children('https://joindiaspora.com/protocol');
if ($children->header) {
return false;
}
+ if (!($postdata = self::valid_posting($msg))) {
+ logger("Invalid posting");
+ return false;
+ }
+
+ $fields = $postdata['fields'];
+
+ // Is it a an action (comment, like, ...) for our own post?
+ if (isset($fields->parent_guid) AND !$postdata["relayed"]) {
+ $guid = notags(unxmlify($fields->parent_guid));
+ $importer = self::importer_for_guid($guid);
+ if (is_array($importer)) {
+ logger("delivering to origin: ".$importer["name"]);
+ $message_id = self::dispatch($importer, $msg, $fields);
+ return $message_id;
+ }
+ }
+
// Now distribute it to the followers
$r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN
(SELECT `contact`.`uid` FROM `contact` WHERE `contact`.`network` = '%s' AND `contact`.`addr` = '%s')
if (dbm::is_result($r)) {
foreach ($r as $rr) {
logger("delivering to: ".$rr["username"]);
- self::dispatch($rr,$msg);
+ self::dispatch($rr, $msg, $fields);
}
+ } elseif (!Config::get('system', 'relay_subscribe', false)) {
+ logger("Unwanted message from ".$msg["author"]." send by ".$_SERVER["REMOTE_ADDR"]." with ".$_SERVER["HTTP_USER_AGENT"].": ".print_r($msg, true), LOGGER_DEBUG);
} else {
// Use a dummy importer to import the data for the public copy
- // or for comments from unknown people
$importer = array("uid" => 0, "page-flags" => PAGE_FREELOVE);
- $message_id = self::dispatch($importer,$msg);
+ $message_id = self::dispatch($importer, $msg, $fields);
}
return $message_id;
*
* @param array $importer Array of the importer user
* @param array $msg The post that will be dispatched
+ * @param object $fields SimpleXML object that contains the message
*
* @return int The message id of the generated message, "true" or "false" if there was an error
*/
- public static function dispatch($importer, $msg) {
+ public static function dispatch($importer, $msg, $fields = null) {
// The sender is the handle of the contact that sent the message.
// This will often be different with relayed messages (for example "like" and "comment")
$sender = $msg["author"];
- if (!self::valid_posting($msg, $fields)) {
- logger("Invalid posting");
- return false;
+ // This is only needed for private postings since this is already done for public ones before
+ if (is_null($fields)) {
+ if (!($postdata = self::valid_posting($msg))) {
+ logger("Invalid posting");
+ return false;
+ }
+ $fields = $postdata['fields'];
}
$type = $fields->getName();
- $social_relay = Config::get('system', 'relay_subscribe', false);
- if (!$social_relay AND ($type == 'message')) {
- logger("Unwanted message from ".$sender." send by ".$_SERVER["REMOTE_ADDR"]." with ".$_SERVER["HTTP_USER_AGENT"].": ".print_r($msg, true), LOGGER_DEBUG);
- }
-
logger("Received message type ".$type." from ".$sender." for user ".$importer["uid"], LOGGER_DEBUG);
switch ($type) {
* It also does the conversion between the old and the new diaspora format.
*
* @param array $msg Array with the XML, the sender handle and the sender signature
- * @param object $fields SimpleXML object that contains the posting when it is valid
*
- * @return bool Is the posting valid?
+ * @return bool|array If the posting is valid then an array with an SimpleXML object is returned
*/
- private static function valid_posting($msg, &$fields) {
+ private static function valid_posting($msg) {
$data = parse_xml_string($msg["message"], false);
foreach ($element->children() AS $fieldname => $entry) {
if ($oldXML) {
// Translation for the old XML structure
- if ($fieldname == "diaspora_handle")
+ if ($fieldname == "diaspora_handle") {
$fieldname = "author";
-
- if ($fieldname == "participant_handles")
+ }
+ if ($fieldname == "participant_handles") {
$fieldname = "participants";
-
+ }
if (in_array($type, array("like", "participation"))) {
- if ($fieldname == "target_type")
+ if ($fieldname == "target_type") {
$fieldname = "parent_type";
+ }
}
-
- if ($fieldname == "sender_handle")
+ if ($fieldname == "sender_handle") {
$fieldname = "author";
-
- if ($fieldname == "recipient_handle")
+ }
+ if ($fieldname == "recipient_handle") {
$fieldname = "recipient";
-
- if ($fieldname == "root_diaspora_id")
+ }
+ if ($fieldname == "root_diaspora_id") {
$fieldname = "root_author";
-
+ }
+ if ($type == "status_message") {
+ if ($fieldname == "raw_message") {
+ $fieldname = "text";
+ }
+ }
if ($type == "retraction") {
- if ($fieldname == "post_guid")
+ if ($fieldname == "post_guid") {
$fieldname = "target_guid";
-
- if ($fieldname == "type")
+ }
+ if ($fieldname == "type") {
$fieldname = "target_type";
+ }
}
}
}
// Only some message types have signatures. So we quit here for the other types.
- if (!in_array($type, array("comment", "message", "like")))
- return true;
-
+ if (!in_array($type, array("comment", "like"))) {
+ return array("fields" => $fields, "relayed" => false);
+ }
// No author_signature? This is a must, so we quit.
if (!isset($author_signature)) {
logger("No author signature for type ".$type." - Message: ".$msg["message"], LOGGER_DEBUG);
}
if (isset($parent_author_signature)) {
+ $relayed = true;
+
$key = self::key($msg["author"]);
if (!rsa_verify($signed_data, $parent_author_signature, $key, "sha256")) {
logger("No valid parent author signature for parent author ".$msg["author"]. " in type ".$type." - signed data: ".$signed_data." - Message: ".$msg["message"]." - Signature ".$parent_author_signature, LOGGER_DEBUG);
return false;
}
+ } else {
+ $relayed = false;
}
$key = self::key($fields->author);
if (!rsa_verify($signed_data, $author_signature, $key, "sha256")) {
logger("No valid author signature for author ".$fields->author. " in type ".$type." - signed data: ".$signed_data." - Message: ".$msg["message"]." - Signature ".$author_signature, LOGGER_DEBUG);
return false;
- } else
- return true;
+ } else {
+ return array("fields" => $fields, "relayed" => $relayed);
+ }
}
/**
*
* @return array the queried data
*/
- private static function person_by_handle($handle) {
+ public static function person_by_handle($handle) {
$r = q("SELECT * FROM `fcontact` WHERE `network` = '%s' AND `addr` = '%s' LIMIT 1",
dbesc(NETWORK_DIASPORA),
logger("defining user ".$contact["nick"]." as friend");
}
- if (($contact["blocked"]) || ($contact["readonly"]) || ($contact["archive"]))
+ // We don't seem to like that person
+ if ($contact["blocked"] || $contact["readonly"] || $contact["archive"]) {
return false;
- if ($contact["rel"] == CONTACT_IS_SHARING || $contact["rel"] == CONTACT_IS_FRIEND)
+ // We are following this person? Then it is okay
+ } elseif (($contact["rel"] == CONTACT_IS_SHARING) || ($contact["rel"] == CONTACT_IS_FRIEND)) {
return true;
- if ($contact["rel"] == CONTACT_IS_FOLLOWER)
- if (($importer["page-flags"] == PAGE_COMMUNITY) OR $is_comment)
- return true;
-
- // Messages for the global users are always accepted
- if ($importer["uid"] == 0)
+ // Is it a post to a community? That's good
+ } elseif (($contact["rel"] == CONTACT_IS_FOLLOWER) && ($importer["page-flags"] == PAGE_COMMUNITY)) {
+ return true;
+ }
+ // Messages for the global users and comments are always accepted
+ if (($importer["uid"] == 0) || $is_comment) {
return true;
+ }
return 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 a contact isn't found, we accept it anyway if it is a comment
+ if ($is_comment) {
+ return $importer;
+ } else {
+ return false;
+ }
}
if (!self::post_allow($importer, $contact, $is_comment)) {
$cid = $r[0]["id"];
$network = $r[0]["network"];
- // We are receiving content from a user that is about to be terminated
+ // We are receiving content from a user that possibly is about to be terminated
// This means the user is vital, so we remove a possible termination date.
- unmark_for_death($contact);
+ unmark_for_death($r[0]);
} else {
$cid = $contact["id"];
$network = NETWORK_DIASPORA;
}
/**
- * @brief Find the best importer for a comment
+ * @brief Find the best importer for a comment, like, ...
*
- * @param array $importer Array of the importer user
* @param string $guid The guid of the item
*
- * @return array the importer that fits the best
+ * @return array|boolean the origin owner of that post - or false
*/
- private static function importer_for_comment($importer, $guid) {
+ private static function importer_for_guid($guid) {
$item = dba::fetch_first("SELECT `uid` FROM `item` WHERE `origin` AND `guid` = ? LIMIT 1", $guid);
if (dbm::is_result($item)) {
logger("Found user ".$item['uid']." as owner of item ".$guid, LOGGER_DEBUG);
$contact = dba::fetch_first("SELECT * FROM `contact` WHERE `self` AND `uid` = ?", $item['uid']);
if (dbm::is_result($contact)) {
- $importer = $contact;
+ return $contact;
}
}
- return $importer;
+ return false;
}
/**
* @return int The message id of the generated comment or "false" if there was an error
*/
private static function receive_comment($importer, $sender, $data, $xml) {
+ $author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
$parent_guid = notags(unxmlify($data->parent_guid));
$text = unxmlify($data->text);
- $author = notags(unxmlify($data->author));
if (isset($data->created_at)) {
$created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
$thr_uri = "";
}
- // Find the best importer when there was no importer found
- if ($importer["uid"] == 0) {
- $importer = self::importer_for_comment($importer, $parent_guid);
- }
-
$contact = self::allowed_contact_by_handle($importer, $sender, true);
if (!$contact) {
return false;
* @return bool "true" if it was successful
*/
private static function receive_conversation_message($importer, $contact, $data, $msg, $mesg, $conversation) {
+ $author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
$subject = notags(unxmlify($data->subject));
- $author = notags(unxmlify($data->author));
-
- $msg_guid = notags(unxmlify($mesg->guid));
- $msg_parent_guid = notags(unxmlify($mesg->parent_guid));
- $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)));
// "diaspora_handle" is the element name from the old version
// "author" is the element name from the new version
return false;
}
+ $msg_guid = notags(unxmlify($mesg->guid));
$msg_conversation_guid = notags(unxmlify($mesg->conversation_guid));
+ $msg_text = unxmlify($mesg->text);
+ $msg_created_at = datetime_convert("UTC", "UTC", notags(unxmlify($mesg->created_at)));
if ($msg_conversation_guid != $guid) {
logger("message conversation guid does not belong to the current conversation.");
$body = diaspora2bb($msg_text);
$message_uri = $msg_author.":".$msg_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_author,$msg["author"]) == 0) {
- $person = $contact;
- $key = $msg["key"];
- } else {
- $person = self::person_by_handle($msg_author);
-
- if (is_array($person) && x($person, "pubkey")) {
- $key = $person["pubkey"];
- } else {
- logger("unable to find author details");
- return false;
- }
- }
-
- 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_author.";".$msg_conversation_guid;
+ $person = self::person_by_handle($msg_author);
- $parent_author_signature = base64_decode($msg_parent_author_signature);
-
- $key = $msg["key"];
-
- 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_uri)
+ $r = q("SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
+ dbesc($msg_guid),
+ intval($importer["uid"])
);
if (dbm::is_result($r)) {
logger("duplicate message already delivered.", LOGGER_DEBUG);
* @return bool Success
*/
private static function receive_conversation($importer, $msg, $data) {
+ $author = notags(unxmlify($data->author));
$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;
* @return int The message id of the generated like or "false" if there was an error
*/
private static function receive_like($importer, $sender, $data) {
- $positive = notags(unxmlify($data->positive));
+ $author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
- $parent_type = notags(unxmlify($data->parent_type));
$parent_guid = notags(unxmlify($data->parent_guid));
- $author = notags(unxmlify($data->author));
+ $parent_type = notags(unxmlify($data->parent_type));
+ $positive = notags(unxmlify($data->positive));
// likes on comments aren't supported by Diaspora - only on posts
// But maybe this will be supported in the future, so we will accept it.
* @return bool Success?
*/
private static function receive_message($importer, $data) {
+ $author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
- $parent_guid = notags(unxmlify($data->parent_guid));
+ $conversation_guid = notags(unxmlify($data->conversation_guid));
$text = unxmlify($data->text);
$created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
- $author = notags(unxmlify($data->author));
- $conversation_guid = notags(unxmlify($data->conversation_guid));
$contact = self::allowed_contact_by_handle($importer, $author, true);
if (!$contact) {
return false;
}
- $r = q("SELECT `id` FROM `mail` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($message_uri),
+ $r = q("SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
+ dbesc($guid),
intval($importer["uid"])
);
if (dbm::is_result($r)) {
0,
1,
dbesc($message_uri),
- dbesc($author.":".$parent_guid),
+ dbesc($author.":".$conversation["guid"]),
dbesc($created_at)
);
$name = unxmlify($data->first_name).((strlen($data->last_name)) ? " ".unxmlify($data->last_name) : "");
$image_url = unxmlify($data->image_url);
$birthday = unxmlify($data->birthday);
- $location = diaspora2bb(unxmlify($data->location));
- $about = diaspora2bb(unxmlify($data->bio));
$gender = unxmlify($data->gender);
+ $about = diaspora2bb(unxmlify($data->bio));
+ $location = diaspora2bb(unxmlify($data->location));
$searchable = (unxmlify($data->searchable) == "true");
$nsfw = (unxmlify($data->nsfw) == "true");
$tags = unxmlify($data->tag_string);
* @return int the message id
*/
private static function receive_reshare($importer, $data, $xml) {
+ $author = notags(unxmlify($data->author));
+ $guid = notags(unxmlify($data->guid));
+ $created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
$root_author = notags(unxmlify($data->root_author));
$root_guid = notags(unxmlify($data->root_guid));
- $guid = notags(unxmlify($data->guid));
- $author = notags(unxmlify($data->author));
+ /// @todo handle unprocessed property "provider_display_name"
$public = notags(unxmlify($data->public));
- $created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
$contact = self::allowed_contact_by_handle($importer, $author, false);
if (!$contact) {
* @return bool success
*/
private static 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));
+ $target_guid = notags(unxmlify($data->target_guid));
+ $target_type = notags(unxmlify($data->target_type));
$person = self::person_by_handle($author);
if (!is_array($person)) {
return false;
}
+ if (!isset($contact["url"])) {
+ $contact["url"] = $person["url"];
+ }
+
$r = q("SELECT `id`, `parent`, `parent-uri`, `author-link` FROM `item` WHERE `guid` = '%s' AND `uid` = %d AND NOT `file` LIKE '%%[%%' LIMIT 1",
dbesc($target_guid),
intval($importer["uid"])
);
if (!$r) {
+ logger("Target guid ".$target_guid." was not found for user ".$importer["uid"]);
return false;
}
$target_type = notags(unxmlify($data->target_type));
$contact = self::contact_by_handle($importer["uid"], $sender);
- if (!$contact) {
+ if (!$contact AND (in_array($target_type, array("Contact", "Person")))) {
logger("cannot find contact for sender: ".$sender." and user ".$importer["uid"]);
return false;
}
case "Post": // "Post" will be supported in a future version
case "Reshare":
case "StatusMessage":
- return self::item_retraction($importer, $contact, $data);;
+ return self::item_retraction($importer, $contact, $data);
case "Contact":
case "Person":
* @return int The message id of the newly created item
*/
private static function receive_status_message($importer, $data, $xml) {
- $raw_message = unxmlify($data->raw_message);
- $guid = notags(unxmlify($data->guid));
$author = notags(unxmlify($data->author));
- $public = notags(unxmlify($data->public));
+ $guid = notags(unxmlify($data->guid));
$created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
+ $public = notags(unxmlify($data->public));
+ $text = unxmlify($data->text);
$provider_display_name = notags(unxmlify($data->provider_display_name));
- /// @todo enable support for polls
- //if ($data->poll) {
- // foreach ($data->poll AS $poll)
- // print_r($poll);
- // die("poll!\n");
- //}
$contact = self::allowed_contact_by_handle($importer, $author, false);
if (!$contact) {
return false;
}
}
- $body = diaspora2bb($raw_message);
+ $body = diaspora2bb($text);
$datarray = array();
}
}
+ /// @todo enable support for polls
+ //if ($data->poll) {
+ // foreach ($data->poll AS $poll)
+ // print_r($poll);
+ // die("poll!\n");
+ //}
+
+ /// @todo enable support for events
+
$datarray["uid"] = $importer["uid"];
$datarray["contact-id"] = $contact["id"];
$datarray["network"] = NETWORK_DIASPORA;
return true;
}
}
-?>
projects / friendica.git / blobdiff