<?php
/**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
use Friendica\Content\Feature;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\Markdown;
-use Friendica\Core\Cache\Duration;
+use Friendica\Core\Cache\Enum\Duration;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\System;
*/
class Diaspora
{
+ const PUSHED = 0;
+ const FETCHED = 1;
+ const FORCED_FETCH = 2;
+
/**
* Return a list of participating contacts for a thread
*
$basedom = XML::parseString($envelope, true);
if (!is_object($basedom)) {
- Logger::log("Envelope is no XML file");
+ Logger::notice("Envelope is no XML file");
return false;
}
$children = $basedom->children('http://salmon-protocol.org/ns/magic-env');
if (sizeof($children) == 0) {
- Logger::log("XML has no children");
+ Logger::notice("XML has no children");
return false;
}
$signable_data = $msg.".".Strings::base64UrlEncode($type).".".Strings::base64UrlEncode($encoding).".".Strings::base64UrlEncode($alg);
if ($handle == '') {
- Logger::log('No author could be decoded. Discarding. Message: ' . $envelope);
+ Logger::notice('No author could be decoded. Discarding. Message: ' . $envelope);
return false;
}
$key = self::key($handle);
if ($key == '') {
- Logger::log("Couldn't get a key for handle " . $handle . ". Discarding.");
+ Logger::notice("Couldn't get a key for handle " . $handle . ". Discarding.");
return false;
}
$verify = Crypto::rsaVerify($signable_data, $sig, $key);
if (!$verify) {
- Logger::log('Message from ' . $handle . ' did not verify. Discarding.');
+ Logger::notice('Message from ' . $handle . ' did not verify. Discarding.');
return false;
}
$j_outer_key_bundle = json_decode($outer_key_bundle);
if (!is_object($j_outer_key_bundle)) {
- Logger::log('Outer Salmon did not verify. Discarding.');
+ Logger::notice('Outer Salmon did not verify. Discarding.');
if ($no_exit) {
return false;
} else {
$basedom = XML::parseString($xml, true);
if (!is_object($basedom)) {
- Logger::log('Received data does not seem to be an XML. Discarding. '.$xml);
+ Logger::notice('Received data does not seem to be an XML. Discarding. '.$xml);
if ($no_exit) {
return false;
} else {
$key_id = $base->sig[0]->attributes()->key_id[0];
$author_addr = base64_decode($key_id);
if ($author_addr == '') {
- Logger::log('No author could be decoded. Discarding. Message: ' . $xml);
+ Logger::notice('No author could be decoded. Discarding. Message: ' . $xml);
if ($no_exit) {
return false;
} else {
$key = self::key($author_addr);
if ($key == '') {
- Logger::log("Couldn't get a key for handle " . $author_addr . ". Discarding.");
+ Logger::notice("Couldn't get a key for handle " . $author_addr . ". Discarding.");
if ($no_exit) {
return false;
} else {
$verify = Crypto::rsaVerify($signed_data, $signature, $key);
if (!$verify) {
- Logger::log('Message did not verify. Discarding.');
+ Logger::notice('Message did not verify. Discarding.');
if ($no_exit) {
return false;
} else {
}
if (!$base) {
- Logger::log('unable to locate salmon data in xml');
+ Logger::notice('unable to locate salmon data in xml');
throw new \Friendica\Network\HTTPException\BadRequestException();
}
}
if (!$author_link) {
- Logger::log('Could not retrieve author URI.');
+ Logger::notice('Could not retrieve author URI.');
throw new \Friendica\Network\HTTPException\BadRequestException();
}
// 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::log('Fetching key for '.$author_link);
+ Logger::notice('Fetching key for '.$author_link);
$key = self::key($author_link);
if (!$key) {
- Logger::log('Could not retrieve author key.');
+ Logger::notice('Could not retrieve author key.');
throw new \Friendica\Network\HTTPException\BadRequestException();
}
$verify = Crypto::rsaVerify($signed_data, $signature, $key);
if (!$verify) {
- Logger::log('Message did not verify. Discarding.');
+ Logger::notice('Message did not verify. Discarding.');
throw new \Friendica\Network\HTTPException\BadRequestException();
}
- Logger::log('Message verified.');
+ Logger::notice('Message verified.');
return ['message' => (string)$inner_decrypted,
'author' => XML::unescape($author_link),
/**
* Dispatches public messages and find the fitting receivers
*
- * @param array $msg The post that will be dispatched
- * @param bool $fetched The message had been fetched (default "false")
+ * @param array $msg The post that will be dispatched
+ * @param int $direction Indicates if the message had been fetched or pushed
*
* @return int The message id of the generated message, "true" or "false" if there was an error
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function dispatchPublic($msg, bool $fetched = false)
+ public static function dispatchPublic($msg, int $direction)
{
$enabled = intval(DI::config()->get("system", "diaspora_enabled"));
if (!$enabled) {
- Logger::log("diaspora is disabled");
+ Logger::notice("diaspora is disabled");
return false;
}
if (!($fields = self::validPosting($msg))) {
- Logger::log("Invalid posting");
+ Logger::notice("Invalid posting");
return false;
}
$importer = ["uid" => 0, "page-flags" => User::PAGE_FLAGS_FREELOVE];
- $success = self::dispatch($importer, $msg, $fields, $fetched);
+ $success = self::dispatch($importer, $msg, $fields, $direction);
return $success;
}
/**
* 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
- * @param SimpleXMLElement $fields SimpleXML object that contains the message
- * @param bool $fetched The message had been fetched (default "false")
+ * @param array $importer Array of the importer user
+ * @param array $msg The post that will be dispatched
+ * @param SimpleXMLElement $fields SimpleXML object that contains the message
+ * @param int $direction Indicates if the message had been fetched or pushed
*
* @return int The message id of the generated message, "true" or "false" if there was an error
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function dispatch(array $importer, $msg, SimpleXMLElement $fields = null, bool $fetched = false)
+ public static function dispatch(array $importer, $msg, SimpleXMLElement $fields = null, int $direction = self::PUSHED)
{
// 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")
if (is_null($fields)) {
$private = true;
if (!($fields = self::validPosting($msg))) {
- Logger::log("Invalid posting");
+ Logger::notice("Invalid posting");
return false;
}
} else {
switch ($type) {
case "account_migration":
if (!$private) {
- Logger::log('Message with type ' . $type . ' is not private, quitting.');
+ Logger::notice('Message with type ' . $type . ' is not private, quitting.');
return false;
}
return self::receiveAccountMigration($importer, $fields);
return self::receiveAccountDeletion($fields);
case "comment":
- return self::receiveComment($importer, $sender, $fields, $msg["message"], $fetched);
+ return self::receiveComment($importer, $sender, $fields, $msg["message"], $direction);
case "contact":
if (!$private) {
- Logger::log('Message with type ' . $type . ' is not private, quitting.');
+ Logger::notice('Message with type ' . $type . ' is not private, quitting.');
return false;
}
return self::receiveContactRequest($importer, $fields);
case "conversation":
if (!$private) {
- Logger::log('Message with type ' . $type . ' is not private, quitting.');
+ Logger::notice('Message with type ' . $type . ' is not private, quitting.');
return false;
}
return self::receiveConversation($importer, $msg, $fields);
case "like":
- return self::receiveLike($importer, $sender, $fields, $fetched);
+ return self::receiveLike($importer, $sender, $fields, $direction);
case "message":
if (!$private) {
- Logger::log('Message with type ' . $type . ' is not private, quitting.');
+ Logger::notice('Message with type ' . $type . ' is not private, quitting.');
return false;
}
return self::receiveMessage($importer, $fields);
case "participation":
if (!$private) {
- Logger::log('Message with type ' . $type . ' is not private, quitting.');
+ Logger::notice('Message with type ' . $type . ' is not private, quitting.');
return false;
}
- return self::receiveParticipation($importer, $fields, $fetched);
+ return self::receiveParticipation($importer, $fields, $direction);
case "photo": // Not implemented
return self::receivePhoto($importer, $fields);
case "profile":
if (!$private) {
- Logger::log('Message with type ' . $type . ' is not private, quitting.');
+ Logger::notice('Message with type ' . $type . ' is not private, quitting.');
return false;
}
return self::receiveProfile($importer, $fields);
case "reshare":
- return self::receiveReshare($importer, $fields, $msg["message"], $fetched);
+ return self::receiveReshare($importer, $fields, $msg["message"], $direction);
case "retraction":
return self::receiveRetraction($importer, $sender, $fields);
case "status_message":
- return self::receiveStatusMessage($importer, $fields, $msg["message"], $fetched);
+ return self::receiveStatusMessage($importer, $fields, $msg["message"], $direction);
default:
- Logger::log("Unknown message type ".$type);
+ Logger::notice("Unknown message type ".$type);
return false;
}
}
$type = $element->getName();
$orig_type = $type;
- Logger::log("Got message type ".$type.": ".$msg["message"], Logger::DATA);
+ Logger::debug("Got message type ".$type.": ".$msg["message"]);
// All retractions are handled identically from now on.
// In the new version there will only be "retraction".
// This is something that shouldn't happen at all.
if (in_array($type, ["status_message", "reshare", "profile"])) {
if ($msg["author"] != $fields->author) {
- Logger::log("Message handle is not the same as envelope sender. Quitting this message.");
+ Logger::notice("Message handle is not the same as envelope sender. Quitting this message.");
return false;
}
}
}
// No author_signature? This is a must, so we quit.
if (!isset($author_signature)) {
- Logger::log("No author signature for type ".$type." - Message: ".$msg["message"], Logger::DEBUG);
+ Logger::info("No author signature for type ".$type." - Message: ".$msg["message"]);
return false;
}
}
if (!Crypto::rsaVerify($signed_data, $parent_author_signature, $key, "sha256")) {
- Logger::log("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);
+ Logger::info("No valid parent author signature for parent author ".$msg["author"]. " in type ".$type." - signed data: ".$signed_data." - Message: ".$msg["message"]." - Signature ".$parent_author_signature);
return false;
}
}
}
if (!Crypto::rsaVerify($signed_data, $author_signature, $key, "sha256")) {
- Logger::log("No valid author signature for author ".$fields->author. " in type ".$type." - signed data: ".$signed_data." - Message: ".$msg["message"]." - Signature ".$author_signature, Logger::DEBUG);
+ Logger::info("No valid author signature for author ".$fields->author. " in type ".$type." - signed data: ".$signed_data." - Message: ".$msg["message"]." - Signature ".$author_signature);
return false;
} else {
return $fields;
{
$handle = strval($handle);
- Logger::log("Fetching diaspora key for: ".$handle);
+ Logger::notice("Fetching diaspora key for: ".$handle);
$r = FContact::getByURL($handle);
if ($r) {
*/
private static function handleFromContact($contact_id, $pcontact_id = 0)
{
- $handle = false;
-
- Logger::log("contact id is ".$contact_id." - pcontact id is ".$pcontact_id, Logger::DEBUG);
+ $handle = '';
if ($pcontact_id != 0) {
- $contact = DBA::selectFirst('contact', ['addr'], ['id' => $pcontact_id]);
-
- if (DBA::isResult($contact) && !empty($contact["addr"])) {
- return strtolower($contact["addr"]);
+ $contact = Contact::getById($pcontact_id, ['addr']);
+ if (DBA::isResult($contact)) {
+ $handle = $contact['addr'];
}
}
- $r = q(
- "SELECT `network`, `addr`, `self`, `url`, `nick` FROM `contact` WHERE `id` = %d",
- intval($contact_id)
- );
-
- if (DBA::isResult($r)) {
- $contact = $r[0];
-
- Logger::log("contact 'self' = ".$contact['self']." 'url' = ".$contact['url'], Logger::DEBUG);
-
- if ($contact['addr'] != "") {
+ if (empty($handle)) {
+ $contact = Contact::getById($contact_id, ['addr']);
+ if (DBA::isResult($contact)) {
$handle = $contact['addr'];
- } else {
- $baseurl_start = strpos($contact['url'], '://') + 3;
- // allows installations in a subdirectory--not sure how Diaspora will handle
- $baseurl_length = strpos($contact['url'], '/profile') - $baseurl_start;
- $baseurl = substr($contact['url'], $baseurl_start, $baseurl_length);
- $handle = $contact['nick'].'@'.$baseurl;
}
}
// It is deactivated by now, due to side effects. See issue https://github.com/friendica/friendica/pull/4033
// It is not removed by now. Possibly the code is needed?
//if (!$is_comment && $contact["rel"] == Contact::FOLLOWER && in_array($importer["page-flags"], array(User::PAGE_FLAGS_FREELOVE))) {
- // DBA::update(
- // 'contact',
+ // Contact::update(
// array('rel' => Contact::FRIEND, 'writable' => true),
// array('id' => $contact["id"], 'uid' => $contact["uid"])
// );
//
// $contact["rel"] = Contact::FRIEND;
- // Logger::log("defining user ".$contact["nick"]." as friend");
+ // Logger::notice("defining user ".$contact["nick"]." as friend");
//}
// Contact server is blocked
} elseif (($contact["rel"] == Contact::SHARING) || ($contact["rel"] == Contact::FRIEND)) {
// Yes, then it is fine.
return true;
- // Is it a post to a community?
- } elseif (($contact["rel"] == Contact::FOLLOWER) && in_array($importer["page-flags"], [User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP])) {
- // That's good
- return true;
// Is the message a global user or a comment?
} elseif (($importer["uid"] == 0) || $is_comment) {
// Messages for the global users and comments are always accepted
{
$contact = self::contactByHandle($importer["uid"], $handle);
if (!$contact) {
- Logger::log("A Contact for handle ".$handle." and user ".$importer["uid"]." was not found");
+ Logger::notice("A Contact for handle ".$handle." and user ".$importer["uid"]." was not found");
// If a contact isn't found, we accept it anyway if it is a comment
if ($is_comment && ($importer["uid"] != 0)) {
return self::contactByHandle(0, $handle);
}
if (!self::postAllow($importer, $contact, $is_comment)) {
- Logger::log("The handle: ".$handle." is not allowed to post to user ".$importer["uid"]);
+ Logger::notice("The handle: ".$handle." is not allowed to post to user ".$importer["uid"]);
return false;
}
return $contact;
{
$item = Post::selectFirst(['id'], ['uid' => $uid, 'guid' => $guid]);
if (DBA::isResult($item)) {
- Logger::log("message ".$guid." already exists for user ".$uid);
+ Logger::notice("message ".$guid." already exists for user ".$uid);
return $item["id"];
}
*/
private static function fetchGuidSub($match, $item)
{
- if (!self::storeByGuid($match[1], $item["author-link"])) {
- self::storeByGuid($match[1], $item["owner-link"]);
+ if (!self::storeByGuid($match[1], $item["author-link"], true)) {
+ self::storeByGuid($match[1], $item["owner-link"], true);
}
}
*
* @param string $guid the message guid
* @param string $server The server address
- * @param int $uid The user id of the user
+ * @param bool $force Forced fetch
*
* @return int the message id of the stored message or false
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function storeByGuid($guid, $server, $uid = 0)
+ private static function storeByGuid($guid, $server, $force)
{
$serverparts = parse_url($server);
$server = $serverparts["scheme"]."://".$serverparts["host"];
- Logger::log("Trying to fetch item ".$guid." from ".$server, Logger::DEBUG);
+ Logger::info("Trying to fetch item ".$guid." from ".$server);
$msg = self::message($guid, $server);
return false;
}
- Logger::log("Successfully fetched item ".$guid." from ".$server, Logger::DEBUG);
+ Logger::info("Successfully fetched item ".$guid." from ".$server);
// Now call the dispatcher
- return self::dispatchPublic($msg, true);
+ return self::dispatchPublic($msg, $force ? self::FORCED_FETCH : self::FETCHED);
}
/**
// This will work for new Diaspora servers and Friendica servers from 3.5
$source_url = $server."/fetch/post/".urlencode($guid);
- Logger::log("Fetch post from ".$source_url, Logger::DEBUG);
+ Logger::info("Fetch post from ".$source_url);
- $envelope = DI::httpRequest()->fetch($source_url);
+ $envelope = DI::httpClient()->fetch($source_url);
if ($envelope) {
- Logger::log("Envelope was fetched.", Logger::DEBUG);
+ Logger::info("Envelope was fetched.");
$x = self::verifyMagicEnvelope($envelope);
if (!$x) {
- Logger::log("Envelope could not be verified.", Logger::DEBUG);
+ Logger::info("Envelope could not be verified.");
} else {
- Logger::log("Envelope was verified.", Logger::DEBUG);
+ Logger::info("Envelope was verified.");
}
} else {
$x = false;
if ($source_xml->post->reshare) {
// Reshare of a reshare - old Diaspora version
- Logger::log("Message is a reshare", Logger::DEBUG);
+ Logger::info("Message is a reshare");
return self::message($source_xml->post->reshare->root_guid, $server, ++$level);
} elseif ($source_xml->getName() == "reshare") {
// Reshare of a reshare - new Diaspora version
- Logger::log("Message is a new reshare", Logger::DEBUG);
+ Logger::info("Message is a new reshare");
return self::message($source_xml->root_guid, $server, ++$level);
}
// If this isn't a "status_message" then quit
if (!$author) {
- Logger::log("Message doesn't seem to be a status message", Logger::DEBUG);
+ Logger::info("Message doesn't seem to be a status message");
return false;
}
}
Logger::info('Fetch GUID from origin', ['guid' => $guid, 'server' => $matches[1]]);
- $ret = self::storeByGuid($guid, $matches[1], $uid);
+ $ret = self::storeByGuid($guid, $matches[1], true);
Logger::info('Result', ['ret' => $ret]);
$item = Post::selectFirst(['id'], ['guid' => $guid, 'uid' => $uid]);
if (!DBA::isResult($item)) {
$person = FContact::getByURL($author);
- $result = self::storeByGuid($guid, $person["url"], $uid);
+ $result = self::storeByGuid($guid, $person["url"], false);
// We don't have an url for items that arrived at the public dispatcher
if (!$result && !empty($contact["url"])) {
- $result = self::storeByGuid($guid, $contact["url"], $uid);
+ $result = self::storeByGuid($guid, $contact["url"], false);
}
if ($result) {
- Logger::log("Fetched missing item ".$guid." - result: ".$result, Logger::DEBUG);
+ Logger::info("Fetched missing item ".$guid." - result: ".$result);
$item = Post::selectFirst($fields, $condition);
}
}
if (!DBA::isResult($item)) {
- Logger::log("parent item not found: parent: ".$guid." - user: ".$uid);
+ Logger::notice("parent item not found: parent: ".$guid." - user: ".$uid);
return false;
} else {
- Logger::log("parent item found: parent: ".$guid." - user: ".$uid);
+ Logger::notice("parent item found: parent: ".$guid." - user: ".$uid);
return $item;
}
}
*/
private static function receiveAccountMigration(array $importer, $data)
{
- $old_handle = Strings::escapeTags(XML::unescape($data->author));
- $new_handle = Strings::escapeTags(XML::unescape($data->profile->author));
- $signature = Strings::escapeTags(XML::unescape($data->signature));
+ $old_handle = XML::unescape($data->author);
+ $new_handle = XML::unescape($data->profile->author);
+ $signature = XML::unescape($data->signature);
$contact = self::contactByHandle($importer["uid"], $old_handle);
if (!$contact) {
- Logger::log("cannot find contact for sender: ".$old_handle." and user ".$importer["uid"]);
+ Logger::notice("cannot find contact for sender: ".$old_handle." and user ".$importer["uid"]);
return false;
}
- Logger::log("Got migration for ".$old_handle.", to ".$new_handle." with user ".$importer["uid"]);
+ Logger::notice("Got migration for ".$old_handle.", to ".$new_handle." with user ".$importer["uid"]);
// Check signature
$signed_text = 'AccountMigration:'.$old_handle.':'.$new_handle;
$key = self::key($old_handle);
if (!Crypto::rsaVerify($signed_text, $signature, $key, "sha256")) {
- Logger::log('No valid signature for migration.');
+ Logger::notice('No valid signature for migration.');
return false;
}
// change the technical stuff in contact
$data = Probe::uri($new_handle);
if ($data['network'] == Protocol::PHANTOM) {
- Logger::log('Account for '.$new_handle." couldn't be probed.");
+ Logger::notice('Account for '.$new_handle." couldn't be probed.");
return false;
}
'notify' => $data['notify'], 'poll' => $data['poll'],
'network' => $data['network']];
- DBA::update('contact', $fields, ['addr' => $old_handle]);
+ Contact::update($fields, ['addr' => $old_handle]);
- Logger::log('Contacts are updated.');
+ Logger::notice('Contacts are updated.');
return true;
}
*/
private static function receiveAccountDeletion($data)
{
- $author = Strings::escapeTags(XML::unescape($data->author));
+ $author = XML::unescape($data->author);
$contacts = DBA::select('contact', ['id'], ['addr' => $author]);
while ($contact = DBA::fetch($contacts)) {
}
DBA::close($contacts);
- Logger::log('Removed contacts for ' . $author);
+ Logger::notice('Removed contacts for ' . $author);
return true;
}
/**
* Processes an incoming comment
*
- * @param array $importer Array of the importer user
- * @param string $sender The sender of the message
- * @param object $data The message object
- * @param string $xml The original XML of the message
- * @param bool $fetched The message had been fetched and not pushed
+ * @param array $importer Array of the importer user
+ * @param string $sender The sender of the message
+ * @param object $data The message object
+ * @param string $xml The original XML of the message
+ * @param int $direction Indicates if the message had been fetched or pushed
*
* @return int The message id of the generated comment or "false" if there was an error
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function receiveComment(array $importer, $sender, $data, $xml, bool $fetched)
+ private static function receiveComment(array $importer, $sender, $data, $xml, int $direction)
{
- $author = Strings::escapeTags(XML::unescape($data->author));
- $guid = Strings::escapeTags(XML::unescape($data->guid));
- $parent_guid = Strings::escapeTags(XML::unescape($data->parent_guid));
+ $author = XML::unescape($data->author);
+ $guid = XML::unescape($data->guid);
+ $parent_guid = XML::unescape($data->parent_guid);
$text = XML::unescape($data->text);
if (isset($data->created_at)) {
- $created_at = DateTimeFormat::utc(Strings::escapeTags(XML::unescape($data->created_at)));
+ $created_at = DateTimeFormat::utc(XML::unescape($data->created_at));
} else {
$created_at = DateTimeFormat::utcNow();
}
if (isset($data->thread_parent_guid)) {
- $thread_parent_guid = Strings::escapeTags(XML::unescape($data->thread_parent_guid));
+ $thread_parent_guid = XML::unescape($data->thread_parent_guid);
$thr_parent = self::getUriFromGuid("", $thread_parent_guid, true);
} else {
$thr_parent = "";
$person = FContact::getByURL($author);
if (!is_array($person)) {
- Logger::log("unable to find author details");
+ Logger::notice("unable to find author details");
return false;
}
$datarray["owner-id"] = Contact::getIdForURL($contact["url"], 0);
// Will be overwritten for sharing accounts in Item::insert
- if ($fetched) {
+ if (in_array($direction, [self::FETCHED, self::FORCED_FETCH])) {
$datarray["post-reason"] = Item::PR_FETCHED;
} elseif ($datarray["uid"] == 0) {
$datarray["post-reason"] = Item::PR_GLOBAL;
$datarray["protocol"] = Conversation::PARCEL_DIASPORA;
$datarray["source"] = $xml;
- $datarray["direction"] = $fetched ? Conversation::PULL : Conversation::PUSH;
+ $datarray["direction"] = in_array($direction, [self::FETCHED, self::FORCED_FETCH]) ? Conversation::PULL : Conversation::PUSH;
$datarray["changed"] = $datarray["created"] = $datarray["edited"] = $created_at;
}
if ($message_id) {
- Logger::log("Stored comment ".$datarray["guid"]." with message id ".$message_id, Logger::DEBUG);
+ Logger::info("Stored comment ".$datarray["guid"]." with message id ".$message_id);
if ($datarray['uid'] == 0) {
Item::distribute($message_id, json_encode($data));
}
*/
private static function receiveConversationMessage(array $importer, array $contact, $data, $msg, $mesg, $conversation)
{
- $author = Strings::escapeTags(XML::unescape($data->author));
- $guid = Strings::escapeTags(XML::unescape($data->guid));
- $subject = Strings::escapeTags(XML::unescape($data->subject));
+ $author = XML::unescape($data->author);
+ $guid = XML::unescape($data->guid);
+ $subject = XML::unescape($data->subject);
// "diaspora_handle" is the element name from the old version
// "author" is the element name from the new version
if ($mesg->author) {
- $msg_author = Strings::escapeTags(XML::unescape($mesg->author));
+ $msg_author = XML::unescape($mesg->author);
} elseif ($mesg->diaspora_handle) {
- $msg_author = Strings::escapeTags(XML::unescape($mesg->diaspora_handle));
+ $msg_author = XML::unescape($mesg->diaspora_handle);
} else {
return false;
}
- $msg_guid = Strings::escapeTags(XML::unescape($mesg->guid));
- $msg_conversation_guid = Strings::escapeTags(XML::unescape($mesg->conversation_guid));
+ $msg_guid = XML::unescape($mesg->guid);
+ $msg_conversation_guid = XML::unescape($mesg->conversation_guid);
$msg_text = XML::unescape($mesg->text);
- $msg_created_at = DateTimeFormat::utc(Strings::escapeTags(XML::unescape($mesg->created_at)));
+ $msg_created_at = DateTimeFormat::utc(XML::unescape($mesg->created_at));
if ($msg_conversation_guid != $guid) {
- Logger::log("message conversation guid does not belong to the current conversation.");
+ Logger::notice("message conversation guid does not belong to the current conversation.");
return false;
}
*/
private static function receiveConversation(array $importer, $msg, $data)
{
- $author = Strings::escapeTags(XML::unescape($data->author));
- $guid = Strings::escapeTags(XML::unescape($data->guid));
- $subject = Strings::escapeTags(XML::unescape($data->subject));
- $created_at = DateTimeFormat::utc(Strings::escapeTags(XML::unescape($data->created_at)));
- $participants = Strings::escapeTags(XML::unescape($data->participants));
+ $author = XML::unescape($data->author);
+ $guid = XML::unescape($data->guid);
+ $subject = XML::unescape($data->subject);
+ $created_at = DateTimeFormat::utc(XML::unescape($data->created_at));
+ $participants = XML::unescape($data->participants);
$messages = $data->message;
if (!count($messages)) {
- Logger::log("empty conversation");
+ Logger::notice("empty conversation");
return false;
}
$conversation = DBA::selectFirst('conv', [], ['uid' => $importer["uid"], 'guid' => $guid]);
if (!DBA::isResult($conversation)) {
- $r = q(
- "INSERT INTO `conv` (`uid`, `guid`, `creator`, `created`, `updated`, `subject`, `recips`)
- VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s')",
- intval($importer["uid"]),
- DBA::escape($guid),
- DBA::escape($author),
- DBA::escape($created_at),
- DBA::escape(DateTimeFormat::utcNow()),
- DBA::escape($subject),
- DBA::escape($participants)
- );
+ $r = DBA::insert('conv', [
+ 'uid' => $importer['uid'],
+ 'guid' => $guid,
+ 'creator' => $author,
+ 'created' => $created_at,
+ 'updated' => DateTimeFormat::utcNow(),
+ 'subject' => $subject,
+ 'recips' => $participants]);
if ($r) {
$conversation = DBA::selectFirst('conv', [], ['uid' => $importer["uid"], 'guid' => $guid]);
}
}
if (!$conversation) {
- Logger::log("unable to create conversation.");
+ Logger::notice("unable to create conversation.");
return false;
}
/**
* Processes "like" messages
*
- * @param array $importer Array of the importer user
- * @param string $sender The sender of the message
- * @param object $data The message object
+ * @param array $importer Array of the importer user
+ * @param string $sender The sender of the message
+ * @param object $data The message object
+ * @param int $direction Indicates if the message had been fetched or pushed
*
* @return int The message id of the generated like or "false" if there was an error
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function receiveLike(array $importer, $sender, $data, bool $fetched)
+ private static function receiveLike(array $importer, $sender, $data, int $direction)
{
- $author = Strings::escapeTags(XML::unescape($data->author));
- $guid = Strings::escapeTags(XML::unescape($data->guid));
- $parent_guid = Strings::escapeTags(XML::unescape($data->parent_guid));
- $parent_type = Strings::escapeTags(XML::unescape($data->parent_type));
- $positive = Strings::escapeTags(XML::unescape($data->positive));
+ $author = XML::unescape($data->author);
+ $guid = XML::unescape($data->guid);
+ $parent_guid = XML::unescape($data->parent_guid);
+ $parent_type = XML::unescape($data->parent_type);
+ $positive = XML::unescape($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.
$person = FContact::getByURL($author);
if (!is_array($person)) {
- Logger::log("unable to find author details");
+ Logger::notice("unable to find author details");
return false;
}
$datarray = [];
$datarray["protocol"] = Conversation::PARCEL_DIASPORA;
- $datarray["direction"] = $fetched ? Conversation::PULL : Conversation::PUSH;
+ $datarray["direction"] = in_array($direction, [self::FETCHED, self::FORCED_FETCH]) ? Conversation::PULL : Conversation::PUSH;
$datarray["uid"] = $importer["uid"];
$datarray["contact-id"] = $author_contact["cid"];
}
if ($message_id) {
- Logger::log("Stored like ".$datarray["guid"]." with message id ".$message_id, Logger::DEBUG);
+ Logger::info("Stored like ".$datarray["guid"]." with message id ".$message_id);
if ($datarray['uid'] == 0) {
Item::distribute($message_id, json_encode($data));
}
*/
private static function receiveMessage(array $importer, $data)
{
- $author = Strings::escapeTags(XML::unescape($data->author));
- $guid = Strings::escapeTags(XML::unescape($data->guid));
- $conversation_guid = Strings::escapeTags(XML::unescape($data->conversation_guid));
+ $author = XML::unescape($data->author);
+ $guid = XML::unescape($data->guid);
+ $conversation_guid = XML::unescape($data->conversation_guid);
$text = XML::unescape($data->text);
- $created_at = DateTimeFormat::utc(Strings::escapeTags(XML::unescape($data->created_at)));
+ $created_at = DateTimeFormat::utc(XML::unescape($data->created_at));
$contact = self::allowedContactByHandle($importer, $author, true);
if (!$contact) {
$conversation = DBA::selectFirst('conv', [], $condition);
if (!DBA::isResult($conversation)) {
- Logger::log("conversation not available.");
+ Logger::notice("conversation not available.");
return false;
}
$person = FContact::getByURL($author);
if (!$person) {
- Logger::log("unable to find author details");
+ Logger::notice("unable to find author details");
return false;
}
/**
* Processes participations - unsupported by now
*
- * @param array $importer Array of the importer user
- * @param object $data The message object
+ * @param array $importer Array of the importer user
+ * @param object $data The message object
+ * @param int $direction Indicates if the message had been fetched or pushed
*
* @return bool success
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function receiveParticipation(array $importer, $data, bool $fetched)
+ private static function receiveParticipation(array $importer, $data, int $direction)
{
- $author = strtolower(Strings::escapeTags(XML::unescape($data->author)));
- $guid = Strings::escapeTags(XML::unescape($data->guid));
- $parent_guid = Strings::escapeTags(XML::unescape($data->parent_guid));
+ $author = strtolower(XML::unescape($data->author));
+ $guid = XML::unescape($data->guid);
+ $parent_guid = XML::unescape($data->parent_guid);
$contact = self::allowedContactByHandle($importer, $author, true);
if (!$contact) {
$person = FContact::getByURL($author);
if (!is_array($person)) {
- Logger::log("Person not found: ".$author);
+ Logger::notice("Person not found: ".$author);
return false;
}
$datarray = [];
$datarray["protocol"] = Conversation::PARCEL_DIASPORA;
- $datarray["direction"] = $fetched ? Conversation::PULL : Conversation::PUSH;
+ $datarray["direction"] = in_array($direction, [self::FETCHED, self::FORCED_FETCH]) ? Conversation::PULL : Conversation::PUSH;
$datarray["uid"] = $importer["uid"];
$datarray["contact-id"] = $author_contact["cid"];
*/
private static function receiveProfile(array $importer, $data)
{
- $author = strtolower(Strings::escapeTags(XML::unescape($data->author)));
+ $author = strtolower(XML::unescape($data->author));
$contact = self::contactByHandle($importer["uid"], $author);
if (!$contact) {
$fields['bd'] = $birthday;
}
- DBA::update('contact', $fields, ['id' => $contact['id']]);
+ Contact::update($fields, ['id' => $contact['id']]);
- Logger::log("Profile of contact ".$contact["id"]." stored for user ".$importer["uid"], Logger::DEBUG);
+ Logger::info("Profile of contact ".$contact["id"]." stored for user ".$importer["uid"]);
return true;
}
private static function receiveRequestMakeFriend(array $importer, array $contact)
{
if ($contact["rel"] == Contact::SHARING) {
- DBA::update(
- 'contact',
+ Contact::update(
['rel' => Contact::FRIEND, 'writable' => true],
['id' => $contact["id"], 'uid' => $importer["uid"]]
);
// That makes us friends.
if ($contact) {
if ($following) {
- Logger::log("Author ".$author." (Contact ".$contact["id"].") wants to follow us.", Logger::DEBUG);
+ Logger::info("Author ".$author." (Contact ".$contact["id"].") wants to follow us.");
self::receiveRequestMakeFriend($importer, $contact);
// refetch the contact array
if (in_array($contact["rel"], [Contact::FRIEND])) {
$user = DBA::selectFirst('user', [], ['uid' => $importer["uid"]]);
if (DBA::isResult($user)) {
- Logger::log("Sending share message to author ".$author." - Contact: ".$contact["id"]." - User: ".$importer["uid"], Logger::DEBUG);
+ Logger::info("Sending share message to author ".$author." - Contact: ".$contact["id"]." - User: ".$importer["uid"]);
self::sendShare($user, $contact);
}
}
return true;
} else {
- Logger::log("Author ".$author." doesn't want to follow us anymore.", Logger::DEBUG);
- Contact::removeFollower($importer, $contact);
+ Logger::info("Author ".$author." doesn't want to follow us anymore.");
+ Contact::removeFollower($contact);
return true;
}
}
if (!$following && $sharing && in_array($importer["page-flags"], [User::PAGE_FLAGS_SOAPBOX, User::PAGE_FLAGS_NORMAL])) {
- Logger::log("Author ".$author." wants to share with us - but doesn't want to listen. Request is ignored.", Logger::DEBUG);
+ Logger::info("Author ".$author." wants to share with us - but doesn't want to listen. Request is ignored.");
return false;
} elseif (!$following && !$sharing) {
- Logger::log("Author ".$author." doesn't want anything - and we don't know the author. Request is ignored.", Logger::DEBUG);
+ Logger::info("Author ".$author." doesn't want anything - and we don't know the author. Request is ignored.");
return false;
} elseif (!$following && $sharing) {
- Logger::log("Author ".$author." wants to share with us.", Logger::DEBUG);
+ Logger::info("Author ".$author." wants to share with us.");
} elseif ($following && $sharing) {
- Logger::log("Author ".$author." wants to have a bidirectional conection.", Logger::DEBUG);
+ Logger::info("Author ".$author." wants to have a bidirectional conection.");
} elseif ($following && !$sharing) {
- Logger::log("Author ".$author." wants to listen to us.", Logger::DEBUG);
+ Logger::info("Author ".$author." wants to listen to us.");
}
$ret = FContact::getByURL($author);
if (!$ret || ($ret["network"] != Protocol::DIASPORA)) {
- Logger::log("Cannot resolve diaspora handle ".$author." for ".$recipient);
+ Logger::notice("Cannot resolve diaspora handle ".$author." for ".$recipient);
return false;
}
public static function originalItem($guid, $orig_author)
{
if (empty($guid)) {
- Logger::log('Empty guid. Quitting.');
+ Logger::notice('Empty guid. Quitting.');
return false;
}
$item = Post::selectFirst($fields, $condition);
if (DBA::isResult($item)) {
- Logger::log("reshared message ".$guid." already exists on system.");
+ Logger::notice("reshared message ".$guid." already exists on system.");
// Maybe it is already a reshared item?
// Then refetch the content, if it is a reshare from a reshare.
if (!DBA::isResult($item)) {
if (empty($orig_author)) {
- Logger::log('Empty author for guid ' . $guid . '. Quitting.');
+ Logger::notice('Empty author for guid ' . $guid . '. Quitting.');
return false;
}
$server = "https://".substr($orig_author, strpos($orig_author, "@") + 1);
- Logger::log("1st try: reshared message ".$guid." will be fetched via SSL from the server ".$server);
- $stored = self::storeByGuid($guid, $server);
+ Logger::notice("1st try: reshared message ".$guid." will be fetched via SSL from the server ".$server);
+ $stored = self::storeByGuid($guid, $server, true);
if (!$stored) {
$server = "http://".substr($orig_author, strpos($orig_author, "@") + 1);
- Logger::log("2nd try: reshared message ".$guid." will be fetched without SSL from the server ".$server);
- $stored = self::storeByGuid($guid, $server);
+ Logger::notice("2nd try: reshared message ".$guid." will be fetched without SSL from the server ".$server);
+ $stored = self::storeByGuid($guid, $server, true);
}
if ($stored) {
/**
* Processes a reshare message
*
- * @param array $importer Array of the importer user
- * @param object $data The message object
- * @param string $xml The original XML of the message
+ * @param array $importer Array of the importer user
+ * @param object $data The message object
+ * @param string $xml The original XML of the message
+ * @param int $direction Indicates if the message had been fetched or pushed
*
* @return int the message id
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function receiveReshare(array $importer, $data, $xml, bool $fetched)
+ private static function receiveReshare(array $importer, $data, $xml, int $direction)
{
- $author = Strings::escapeTags(XML::unescape($data->author));
- $guid = Strings::escapeTags(XML::unescape($data->guid));
- $created_at = DateTimeFormat::utc(Strings::escapeTags(XML::unescape($data->created_at)));
- $root_author = Strings::escapeTags(XML::unescape($data->root_author));
- $root_guid = Strings::escapeTags(XML::unescape($data->root_guid));
+ $author = XML::unescape($data->author);
+ $guid = XML::unescape($data->guid);
+ $created_at = DateTimeFormat::utc(XML::unescape($data->created_at));
+ $root_author = XML::unescape($data->root_author);
+ $root_guid = XML::unescape($data->root_guid);
/// @todo handle unprocessed property "provider_display_name"
- $public = Strings::escapeTags(XML::unescape($data->public));
+ $public = XML::unescape($data->public);
$contact = self::allowedContactByHandle($importer, $author, false);
if (!$contact) {
$datarray["protocol"] = Conversation::PARCEL_DIASPORA;
$datarray["source"] = $xml;
- $datarray["direction"] = $fetched ? Conversation::PULL : Conversation::PUSH;
+ $datarray["direction"] = in_array($direction, [self::FETCHED, self::FORCED_FETCH]) ? Conversation::PULL : Conversation::PUSH;
/// @todo Copy tag data from original post
}
if ($message_id) {
- Logger::log("Stored reshare ".$datarray["guid"]." with message id ".$message_id, Logger::DEBUG);
+ Logger::info("Stored reshare ".$datarray["guid"]." with message id ".$message_id);
if ($datarray['uid'] == 0) {
Item::distribute($message_id);
}
*/
private static function itemRetraction(array $importer, array $contact, $data)
{
- $author = Strings::escapeTags(XML::unescape($data->author));
- $target_guid = Strings::escapeTags(XML::unescape($data->target_guid));
- $target_type = Strings::escapeTags(XML::unescape($data->target_type));
+ $author = XML::unescape($data->author);
+ $target_guid = XML::unescape($data->target_guid);
+ $target_type = XML::unescape($data->target_type);
$person = FContact::getByURL($author);
if (!is_array($person)) {
- Logger::log("unable to find author detail for ".$author);
+ Logger::notice("unable to find author detail for ".$author);
return false;
}
$r = Post::select($fields, $condition);
if (!DBA::isResult($r)) {
- Logger::log("Target guid ".$target_guid." was not found on this system for user ".$importer['uid'].".");
+ Logger::notice("Target guid ".$target_guid." was not found on this system for user ".$importer['uid'].".");
return false;
}
while ($item = Post::fetch($r)) {
if (DBA::exists('post-category', ['uri-id' => $item['uri-id'], 'uid' => $item['uid'], 'type' => Post\Category::FILE])) {
- Logger::log("Target guid " . $target_guid . " for user " . $item['uid'] . " is filed. So it won't be deleted.", Logger::DEBUG);
+ Logger::info("Target guid " . $target_guid . " for user " . $item['uid'] . " is filed. So it won't be deleted.");
continue;
}
// Only delete it if the parent author really fits
if (!Strings::compareLink($parent["author-link"], $contact["url"]) && !Strings::compareLink($item["author-link"], $contact["url"])) {
- Logger::log("Thread author ".$parent["author-link"]." and item author ".$item["author-link"]." don't fit to expected contact ".$contact["url"], Logger::DEBUG);
+ Logger::info("Thread author ".$parent["author-link"]." and item author ".$item["author-link"]." don't fit to expected contact ".$contact["url"]);
continue;
}
Item::markForDeletion(['id' => $item['id']]);
- Logger::log("Deleted target ".$target_guid." (".$item["id"].") from user ".$item["uid"]." parent: ".$item['parent'], Logger::DEBUG);
+ Logger::info("Deleted target ".$target_guid." (".$item["id"].") from user ".$item["uid"]." parent: ".$item['parent']);
}
DBA::close($r);
*/
private static function receiveRetraction(array $importer, $sender, $data)
{
- $target_type = Strings::escapeTags(XML::unescape($data->target_type));
+ $target_type = XML::unescape($data->target_type);
$contact = self::contactByHandle($importer["uid"], $sender);
if (!$contact && (in_array($target_type, ["Contact", "Person"]))) {
- Logger::log("cannot find contact for sender: ".$sender." and user ".$importer["uid"]);
+ Logger::notice("cannot find contact for sender: ".$sender." and user ".$importer["uid"]);
return false;
}
$contact = [];
}
- Logger::log("Got retraction for ".$target_type.", sender ".$sender." and user ".$importer["uid"], Logger::DEBUG);
+ Logger::info("Got retraction for ".$target_type.", sender ".$sender." and user ".$importer["uid"]);
switch ($target_type) {
case "Comment":
break;
default:
- Logger::log("Unknown target type ".$target_type);
+ Logger::notice("Unknown target type ".$target_type);
return false;
}
return true;
* @param integer $uriid
* @param string $author
* @param string $body
+ * @param int $direction Indicates if the message had been fetched or pushed
+ *
* @return boolean Is the message wanted?
*/
- private static function isSolicitedMessage(string $url, int $uriid, string $author, string $body)
+ private static function isSolicitedMessage(string $url, int $uriid, string $author, string $body, int $direction)
{
$contact = Contact::getByURL($author);
if (DBA::exists('contact', ["`nurl` = ? AND `uid` != ? AND `rel` IN (?, ?)",
$contact['nurl'], 0, Contact::FRIEND, Contact::SHARING])) {
- Logger::info('Author has got followers - accepted', ['url' => $url, 'author' => $author]);
+ Logger::debug('Author has got followers - accepted', ['url' => $url, 'author' => $author]);
return true;
}
- $taglist = Tag::getByURIId($uriid, [Tag::HASHTAG]);
- $tags = array_column($taglist, 'name');
- return Relay::isSolicitedPost($tags, $body, $contact['id'], $url, Protocol::DIASPORA);
+ if ($direction == self::FORCED_FETCH) {
+ Logger::debug('Post is a forced fetch - accepted', ['url' => $url, 'author' => $author]);
+ return true;
+ }
+
+ $tags = array_column(Tag::getByURIId($uriid, [Tag::HASHTAG]), 'name');
+ if (Relay::isSolicitedPost($tags, $body, $contact['id'], $url, Protocol::DIASPORA)) {
+ Logger::debug('Post is accepted because of the relay settings', ['url' => $url, 'author' => $author]);
+ return true;
+ } else {
+ return false;
+ }
}
/**
/**
* Receives status messages
*
- * @param array $importer Array of the importer user
- * @param SimpleXMLElement $data The message object
- * @param string $xml The original XML of the message
- * @param bool $fetched The message had been fetched and not pushed
+ * @param array $importer Array of the importer user
+ * @param SimpleXMLElement $data The message object
+ * @param string $xml The original XML of the message
+ * @param int $direction Indicates if the message had been fetched or pushed
+ *
* @return int The message id of the newly created item
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function receiveStatusMessage(array $importer, SimpleXMLElement $data, $xml, bool $fetched)
+ private static function receiveStatusMessage(array $importer, SimpleXMLElement $data, $xml, int $direction)
{
- $author = Strings::escapeTags(XML::unescape($data->author));
- $guid = Strings::escapeTags(XML::unescape($data->guid));
- $created_at = DateTimeFormat::utc(Strings::escapeTags(XML::unescape($data->created_at)));
- $public = Strings::escapeTags(XML::unescape($data->public));
+ $author = XML::unescape($data->author);
+ $guid = XML::unescape($data->guid);
+ $created_at = DateTimeFormat::utc(XML::unescape($data->created_at));
+ $public = XML::unescape($data->public);
$text = XML::unescape($data->text);
- $provider_display_name = Strings::escapeTags(XML::unescape($data->provider_display_name));
+ $provider_display_name = XML::unescape($data->provider_display_name);
$contact = self::allowedContactByHandle($importer, $author, false);
if (!$contact) {
$address = [];
if ($data->location) {
foreach ($data->location->children() as $fieldname => $data) {
- $address[$fieldname] = Strings::escapeTags(XML::unescape($data));
+ $address[$fieldname] = XML::unescape($data);
}
}
$datarray["object-type"] = Activity\ObjectType::IMAGE;
$datarray["post-type"] = Item::PT_IMAGE;
+ } elseif ($data->poll) {
+ $datarray["object-type"] = Activity\ObjectType::NOTE;
+ $datarray["post-type"] = Item::PT_POLL;
} else {
$datarray["object-type"] = Activity\ObjectType::NOTE;
$datarray["post-type"] = Item::PT_NOTE;
/// @todo enable support for polls
//if ($data->poll) {
- // foreach ($data->poll AS $poll)
+ // foreach ($data->poll as $poll)
// print_r($poll);
// die("poll!\n");
//}
$datarray["protocol"] = Conversation::PARCEL_DIASPORA;
$datarray["source"] = $xml;
- $datarray["direction"] = $fetched ? Conversation::PULL : Conversation::PUSH;
+ $datarray["direction"] = in_array($direction, [self::FETCHED, self::FORCED_FETCH]) ? Conversation::PULL : Conversation::PUSH;
- if ($fetched) {
+ if (in_array($direction, [self::FETCHED, self::FORCED_FETCH])) {
$datarray["post-reason"] = Item::PR_FETCHED;
} elseif ($datarray["uid"] == 0) {
$datarray["post-reason"] = Item::PR_GLOBAL;
self::storeMentions($datarray['uri-id'], $text);
Tag::storeRawTagsFromBody($datarray['uri-id'], $datarray["body"]);
- if (!$fetched && !self::isSolicitedMessage($datarray["uri"], $datarray['uri-id'], $author, $body)) {
+ if (!self::isSolicitedMessage($datarray["uri"], $datarray['uri-id'], $author, $body, $direction)) {
DBA::delete('item-uri', ['uri' => $datarray['uri']]);
return false;
}
self::sendParticipation($contact, $datarray);
if ($message_id) {
- Logger::log("Stored item ".$datarray["guid"]." with message id ".$message_id, Logger::DEBUG);
+ Logger::info("Stored item ".$datarray["guid"]." with message id ".$message_id);
if ($datarray['uid'] == 0) {
Item::distribute($message_id);
}
*/
public static function encodePrivateData($msg, array $user, array $contact, $prvkey, $pubkey)
{
- Logger::log("Message: ".$msg, Logger::DATA);
+ Logger::debug("Message: ".$msg);
// without a public key nothing will work
if (!$pubkey) {
- Logger::log("pubkey missing: contact id: ".$contact["id"]);
+ Logger::notice("pubkey missing: contact id: ".$contact["id"]);
return false;
}
- $aes_key = openssl_random_pseudo_bytes(32);
+ $aes_key = random_bytes(32);
$b_aes_key = base64_encode($aes_key);
- $iv = openssl_random_pseudo_bytes(16);
+ $iv = random_bytes(16);
$b_iv = base64_encode($iv);
$ciphertext = self::aesEncrypt($aes_key, $iv, $msg);
}
if (!$dest_url) {
- Logger::log("no url for contact: ".$contact["id"]." batch mode =".$public_batch);
+ Logger::notice("no url for contact: ".$contact["id"]." batch mode =".$public_batch);
return 0;
}
- Logger::log("transmit: ".$logid."-".$guid." ".$dest_url);
+ Logger::notice("transmit: ".$logid."-".$guid." ".$dest_url);
if (!intval(DI::config()->get("system", "diaspora_test"))) {
$content_type = (($public_batch) ? "application/magic-envelope+xml" : "application/json");
- $postResult = DI::httpRequest()->post($dest_url . "/", $envelope, ["Content-Type: " . $content_type]);
+ $postResult = DI::httpClient()->post($dest_url . "/", $envelope, ['Content-Type' => $content_type]);
$return_code = $postResult->getReturnCode();
} else {
- Logger::log("test_mode");
+ Logger::notice("test_mode");
return 200;
}
- Logger::log("transmit: ".$logid."-".$guid." to ".$dest_url." returns: ".$return_code);
+ Logger::notice("transmit: ".$logid."-".$guid." to ".$dest_url." returns: ".$return_code);
return $return_code ? $return_code : -1;
}
{
$msg = self::buildPostXml($type, $message);
- Logger::log('message: '.$msg, Logger::DATA);
- Logger::log('send guid '.$guid, Logger::DEBUG);
-
// Fallback if the private key wasn't transmitted in the expected field
if (empty($owner['uprvkey'])) {
$owner['uprvkey'] = $owner['prvkey'];
if (!empty($fcontact)) {
$pubkey = $fcontact['pubkey'];
}
+ } else {
+ // The "addr" field should always be filled.
+ // If this isn't the case, it will raise a notice some lines later.
+ // And in the log we will see where it came from and we can handle it there.
+ Logger::notice('Empty addr', ['contact' => $contact ?? [], 'callstack' => System::callstack(20)]);
}
$envelope = self::buildMessage($msg, $owner, $contact, $owner['uprvkey'], $pubkey, $public_batch);
$return_code = self::transmit($owner, $contact, $envelope, $public_batch, $guid);
- Logger::log("guid: ".$guid." result ".$return_code, Logger::DEBUG);
+ Logger::info('Transmitted message', ['owner' => $owner['uid'], 'target' => $contact['addr'], 'type' => $type, 'guid' => $guid, 'result' => $return_code]);
return $return_code;
}
return;
}
- $owner = User::getOwnerDataById($item['uid']);
+ // Fetch some user id to have a valid handle to transmit the participation.
+ // In fact it doesn't matter which user sends this - but it is needed by the protocol.
+ // If the item belongs to a user, we take this user id.
+ if ($item['uid'] == 0) {
+ // @todo Possibly use an administrator account?
+ $condition = ['verified' => true, 'blocked' => false,
+ 'account_removed' => false, 'account_expired' => false, 'account-type' => User::ACCOUNT_TYPE_PERSON];
+ $first_user = DBA::selectFirst('user', ['uid'], $condition, ['order' => ['uid']]);
+ $owner = User::getOwnerDataById($first_user['uid']);
+ } else {
+ $owner = User::getOwnerDataById($item['uid']);
+ }
+
$author = self::myHandle($owner);
$message = ["author" => $author,
"parent_type" => "Post",
"parent_guid" => $item["guid"]];
- Logger::log("Send participation for ".$item["guid"]." by ".$author, Logger::DEBUG);
+ Logger::info("Send participation for ".$item["guid"]." by ".$author);
// It doesn't matter what we store, we only want to avoid sending repeated notifications for the same item
DI::cache()->set($cachekey, $item["guid"], Duration::QUARTER_HOUR);
*/
private static function buildEvent($event_id)
{
- $r = q("SELECT `guid`, `uid`, `start`, `finish`, `nofinish`, `summary`, `desc`, `location`, `adjust` FROM `event` WHERE `id` = %d", intval($event_id));
- if (!DBA::isResult($r)) {
+ $event = DBA::selectFirst('event', [], ['id' => $event_id]);
+ if (!DBA::isResult($event)) {
return [];
}
- $event = $r[0];
-
$eventdata = [];
- $r = q("SELECT `timezone` FROM `user` WHERE `uid` = %d", intval($event['uid']));
- if (!DBA::isResult($r)) {
- return [];
- }
-
- $user = $r[0];
-
- $r = q("SELECT `addr`, `nick` FROM `contact` WHERE `uid` = %d AND `self`", intval($event['uid']));
- if (!DBA::isResult($r)) {
+ $owner = User::getOwnerDataById($event['uid']);
+ if (!$owner) {
return [];
}
- $owner = $r[0];
-
$eventdata['author'] = self::myHandle($owner);
if ($event['guid']) {
$eventdata["all_day"] = "false";
$eventdata['timezone'] = 'UTC';
- if (!$event['adjust'] && $user['timezone']) {
- $eventdata['timezone'] = $user['timezone'];
- }
if ($event['start']) {
- $eventdata['start'] = DateTimeFormat::convert($event['start'], "UTC", $eventdata['timezone'], $mask);
+ $eventdata['start'] = DateTimeFormat::utc($event['start'], $mask);
}
if ($event['finish'] && !$event['nofinish']) {
- $eventdata['end'] = DateTimeFormat::convert($event['finish'], "UTC", $eventdata['timezone'], $mask);
+ $eventdata['end'] = DateTimeFormat::utc($event['finish'], $mask);
}
if ($event['summary']) {
$eventdata['summary'] = html_entity_decode(BBCode::toMarkdown($event['summary']));
return $eventdata;
}
- /**
- * Add media attachments to the body
- *
- * @param array $item
- * @return string body
- */
- private static function addAttachments(array $item)
- {
- $body = $item['body'];
-
- foreach (Post\Media::getByURIId($item['uri-id'], [Post\Media::IMAGE, Post\Media::AUDIO, Post\Media::VIDEO]) as $media) {
- if (Item::containsLink($item['body'], $media['url'])) {
- continue;
- }
-
- if ($media['type'] == Post\Media::IMAGE) {
- if (!empty($media['description'])) {
- $body .= "\n[img=" . $media['url'] . ']' . $media['description'] .'[/img]';
- } else {
- $body .= "\n[img]" . $media['url'] .'[/img]';
- }
- } elseif ($media['type'] == Post\Media::AUDIO) {
- $body .= "\n[audio]" . $media['url'] . "[/audio]\n";
- } elseif ($media['type'] == Post\Media::VIDEO) {
- $body .= "\n[video]" . $media['url'] . "[/video]\n";
- }
- }
- return $body;
- }
-
/**
* Create a post (status message or reshare)
*
$type = "reshare";
} else {
$title = $item["title"];
- $body = self::addAttachments($item);
+ $body = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body']);
// Fetch the title from an attached link - if there is one
if (empty($item["title"]) && DI::pConfig()->get($owner['uid'], 'system', 'attach_link_title')) {
$attachments = Post\Media::getByURIId($item['uri-id'], [Post\Media::DOCUMENT, Post\Media::TORRENT, Post\Media::UNKNOWN]);
if (!empty($attachments)) {
- $body .= "\n".DI::l10n()->t("Attachments:")."\n";
+ $body .= "\n[hr]\n";
foreach ($attachments as $attachment) {
$body .= "[" . $attachment['description'] . "](" . $attachment['url'] . ")\n";
}
private static function prependParentAuthorMention($body, $profile_url)
{
- $profile = Contact::getByURL($profile_url, false, ['addr', 'name', 'contact-type']);
+ $profile = Contact::getByURL($profile_url, false, ['addr', 'name']);
if (!empty($profile['addr'])
- && $profile['contact-type'] != Contact::TYPE_COMMUNITY
&& !strstr($body, $profile['addr'])
&& !strstr($body, $profile_url)
) {
$attend_answer = 'tentative';
break;
default:
- Logger::log('Unknown verb '.$item['verb'].' in item '.$item['guid']);
+ Logger::notice('Unknown verb '.$item['verb'].' in item '.$item['guid']);
return false;
}
$thread_parent_item = Post::selectFirst(['guid', 'author-id', 'author-link', 'gravity'], ['uri' => $item['thr-parent'], 'uid' => $item['uid']]);
}
- $body = self::addAttachments($item);
+ $body = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body']);
// The replied to autor mention is prepended for clarity if:
// - Item replied isn't yours
$type = "comment";
}
- Logger::log("Got relayable data ".$type." for item ".$item["guid"]." (".$item["id"].")", Logger::DEBUG);
+ Logger::info("Got relayable data ".$type." for item ".$item["guid"]." (".$item["id"].")");
$msg = json_decode($item['signed_text'], true);
$message[$field] = $data;
}
} else {
- Logger::log("Signature text for item ".$item["guid"]." (".$item["id"].") couldn't be extracted: ".$item['signed_text'], Logger::DEBUG);
+ Logger::info("Signature text for item ".$item["guid"]." (".$item["id"].") couldn't be extracted: ".$item['signed_text']);
}
$message["parent_author_signature"] = self::signature($owner, $message);
$cnv = DBA::selectFirst('conv', [], ['id' => $item["convid"], 'uid' => $item["uid"]]);
if (!DBA::isResult($cnv)) {
- Logger::log("conversation not found.");
+ Logger::notice("conversation not found.");
return;
}
$dob = '';
if ($profile['dob'] && ($profile['dob'] > '0000-00-00')) {
- list($year, $month, $day) = sscanf($profile['dob'], '%4d-%2d-%2d');
+ [$year, $month, $day] = sscanf($profile['dob'], '%4d-%2d-%2d');
if ($year < 1004) {
$year = 1004;
}
}
if (!$recips) {
- $recips = q(
- "SELECT `id`,`name`,`network`,`pubkey`,`notify` FROM `contact` WHERE `network` = '%s'
- AND `uid` = %d AND `rel` != %d",
- DBA::escape(Protocol::DIASPORA),
- intval($uid),
- intval(Contact::SHARING)
- );
+ $recips = DBA::selectToArray('contact', [], ['network' => Protocol::DIASPORA, 'uid' => $uid, 'rel' => [Contact::FOLLOWER, Contact::FRIEND]]);
}
if (!$recips) {
// @ToDo Split this into single worker jobs
foreach ($recips as $recip) {
- Logger::log("Send updated profile data for user ".$uid." to contact ".$recip["id"], Logger::DEBUG);
+ Logger::info("Send updated profile data for user ".$uid." to contact ".$recip["id"]);
self::buildAndTransmit($owner, $recip, "profile", $message);
}
}
/**
* Creates the signature for Comments that are created on our system
*
- * @param integer $uid The user of that comment
* @param array $item Item array
*
* @return array Signed content
* @throws \Exception
*/
- public static function createCommentSignature($uid, array $item)
+ public static function createCommentSignature(array $item)
{
+ if (!empty($item['author-link'])) {
+ $url = $item['author-link'];
+ } else {
+ $contact = Contact::getById($item['author-id'], ['url']);
+ if (empty($contact['url'])) {
+ Logger::warning('Author Contact not found', ['author-id' => $item['author-id']]);
+ return false;
+ }
+ $url = $contact['url'];
+ }
+
+ $uid = User::getIdForURL($url);
+ if (empty($uid)) {
+ Logger::info('No owner post, so not storing signature', ['url' => $contact['url']]);
+ return false;
+ }
+
$owner = User::getOwnerDataById($uid);
if (empty($owner)) {
Logger::info('No owner post, so not storing signature');
return false;
}
- $parent = Post::selectFirst(['parent-uri'], ['uri' => $item['thr-parent']]);
- if (!DBA::isResult($parent)) {
- return;
+ // This is only needed for the automated tests
+ if (empty($owner['uprvkey'])) {
+ return false;
}
- $item['parent-uri'] = $parent['parent-uri'];
-
$message = self::constructComment($item, $owner);
if ($message === false) {
return false;
return $message;
}
+
+ public static function performReshare(int $UriId, int $uid)
+ {
+ $fields = ['uri-id', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink'];
+ $item = Post::selectFirst($fields, ['uri-id' => $UriId, 'uid' => [$uid, 0], 'private' => [Item::PUBLIC, Item::UNLISTED]]);
+ if (!DBA::isResult($item)) {
+ return 0;
+ }
+
+ if (strpos($item['body'], '[/share]') !== false) {
+ $pos = strpos($item['body'], '[share');
+ $post = substr($item['body'], $pos);
+ } else {
+ $post = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'], $item['plink'], $item['created'], $item['guid']);
+
+ if (!empty($item['title'])) {
+ $post .= '[h3]' . $item['title'] . "[/h3]\n";
+ }
+
+ $post .= $item['body'];
+ $post .= '[/share]';
+ }
+
+ $owner = User::getOwnerDataById($uid);
+ $author = Contact::getPublicIdByUserId($uid);
+
+ $item = [
+ 'uid' => $uid,
+ 'verb' => Activity::POST,
+ 'contact-id' => $owner['id'],
+ 'author-id' => $author,
+ 'owner-id' => $author,
+ 'body' => $post,
+ 'allow_cid' => $owner['allow_cid'],
+ 'allow_gid' => $owner['allow_gid'],
+ 'deny_cid' => $owner['deny_cid'],
+ 'deny_gid' => $owner['deny_gid'],
+ ];
+
+ if (!empty($item['allow_cid'] . $item['allow_gid'] . $item['deny_cid'] . $item['deny_gid'])) {
+ $item['private'] = Item::PRIVATE;
+ } elseif (DI::pConfig()->get($uid, 'system', 'unlisted')) {
+ $item['private'] = Item::UNLISTED;
+ } else {
+ $item['private'] = Item::PUBLIC;
+ }
+
+ // Don't trigger the addons
+ $item['api_source'] = false;
+
+ return Item::insert($item, true);
+ }
}
projects / friendica.git / blobdiff