use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
use Friendica\Util\XML;
+use Friendica\Protocol\Diaspora;
use dba;
use DOMDocument;
use DOMXPath;
* @param string $atom Content that will be transmitted
* @param bool $dissolve (to be documented)
*
- * @return int Deliver status. -1 means an error.
+ * @return int Deliver status. Negative values mean an error.
* @todo Add array type-hint for $owner, $contact
*/
public static function deliver($owner, $contact, $atom, $dissolve = false)
{
$a = get_app();
+ // At first try the Diaspora transport layer
+ $ret = self::transmit($owner, $contact, $atom);
+ if ($ret >= 200) {
+ logger('Delivery via Diaspora transport layer was successful with status ' . $ret);
+ return $ret;
+ }
+
$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
if ($contact['duplex'] && $contact['dfrn-id']) {
$xml = $ret['body'];
$curl_stat = $a->get_curl_code();
- if (!$curl_stat) {
+ if (empty($curl_stat)) {
return -3; // timed out
}
logger('dfrn_deliver: ' . $xml, LOGGER_DATA);
- if (! $xml) {
+ if (empty($xml)) {
return 3;
}
$res = XML::parseString($xml);
if ((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id))) {
- return (($res->status) ? $res->status : 3);
+ return ($res->status ? $res->status : 3);
}
$postvars = [];
logger('dfrn_deliver: ' . "RECEIVED: " . $xml, LOGGER_DATA);
$curl_stat = $a->get_curl_code();
- if ((!$curl_stat) || (!strlen($xml))) {
+ if (empty($curl_stat) || empty($xml)) {
return -9; // timed out
}
- if (($curl_stat == 503) && (stristr($a->get_curl_headers(), 'retry-after'))) {
+ if (($curl_stat == 503) && stristr($a->get_curl_headers(), 'retry-after')) {
return -10;
}
$res = XML::parseString($xml);
- if (!isset($res->status)) {
+ if (empty($res->status)) {
return -11;
}
return intval($res->status);
}
+ /**
+ * @brief Transmits atom content to the contacts via the Diaspora transport layer
+ *
+ * @param array $owner Owner record
+ * @param array $contact Contact record of the receiver
+ * @param string $atom Content that will be transmitted
+ *
+ * @return int Deliver status. Negative values mean an error.
+ */
+ public static function transmit($owner, $contact, $atom, $public_batch = false)
+ {
+ $a = get_app();
+
+ if (empty($contact['addr'])) {
+ logger('Empty contact handle for ' . $contact['id'] . ' - ' . $contact['url'] . ' - trying to update it.');
+ if (Contact::updateFromProbe($contact['id'])) {
+ $new_contact = dba::selectFirst('contact', ['addr'], ['id' => $contact['id']]);
+ $contact['addr'] = $new_contact['addr'];
+ }
+
+ if (empty($contact['addr'])) {
+ logger('Unable to find contact handle for ' . $contact['id'] . ' - ' . $contact['url']);
+ return -21;
+ }
+ }
+
+ $fcontact = Diaspora::personByHandle($contact['addr']);
+ if (empty($fcontact)) {
+ logger('Unable to find contact details for ' . $contact['id'] . ' - ' . $contact['addr']);
+ return -21;
+ }
+
+ $envelope = Diaspora::buildMessage($atom, $owner, $contact, $owner['uprvkey'], $fcontact['pubkey'], $public_batch);
+
+ $dest_url = ($public_batch ? $fcontact["batch"] : $contact["notify"]);
+
+ $content_type = ($public_batch ? "application/magic-envelope+xml" : "application/json");
+
+ $xml = Network::post($dest_url, $envelope, ["Content-Type: ".$content_type]);
+
+ $curl_stat = $a->get_curl_code();
+ if (empty($curl_stat) || empty($xml)) {
+ logger('Empty answer from ' . $contact['id'] . ' - ' . $dest_url);
+ return -9; // timed out
+ }
+
+ if (($curl_stat == 503) && (stristr($a->get_curl_headers(), 'retry-after'))) {
+ return -10;
+ }
+
+ if (strpos($xml, '<?xml') === false) {
+ logger('No valid XML returned from ' . $contact['id'] . ' - ' . $dest_url);
+ logger('Returned XML: ' . $xml, LOGGER_DATA);
+ return 3;
+ }
+
+ $res = XML::parseString($xml);
+
+ if (empty($res->status)) {
+ return -11;
+ }
+
+ if (!empty($res->message)) {
+ logger('Transmit to ' . $dest_url . ' returned status '.$res->status.' - '.$res->message, LOGGER_DEBUG);
+ }
+
+ if ($res->status == 200) {
+ Contact::unmarkForArchival($contact);
+ }
+
+ return intval($res->status);
+ }
+
/**
* @brief Add new birthday event for this person
*
return true;
}
} else { // $entrytype == DFRN_TOP_LEVEL
+ if ($importer["readonly"]) {
+ logger('ignoring read-only contact '.$importer["id"]);
+ return;
+ }
if ($importer["uid"] == 0) {
logger("Contact ".$importer["id"]." isn't known to user ".$importer["importer_uid"].". The post will be ignored.", LOGGER_DEBUG);
return;
self::processRelocation($xpath, $relocation, $importer);
}
- if ($importer["readonly"]) {
- // We aren't receiving stuff from this person. But we will quietly ignore them
- // rather than a blatant "go away" message.
- logger('ignoring contact '.$importer["id"]);
- return 403;
- }
-
- $mails = $xpath->query("/atom:feed/dfrn:mail");
- foreach ($mails as $mail) {
- self::processMail($xpath, $mail, $importer);
- }
+ if (($importer["uid"] != 0) && !$importer["readonly"]) {
+ $mails = $xpath->query("/atom:feed/dfrn:mail");
+ foreach ($mails as $mail) {
+ self::processMail($xpath, $mail, $importer);
+ }
- $suggestions = $xpath->query("/atom:feed/dfrn:suggest");
- foreach ($suggestions as $suggestion) {
- self::processSuggestion($xpath, $suggestion, $importer);
+ $suggestions = $xpath->query("/atom:feed/dfrn:suggest");
+ foreach ($suggestions as $suggestion) {
+ self::processSuggestion($xpath, $suggestion, $importer);
+ }
}
$deletions = $xpath->query("/atom:feed/at:deleted-entry");
projects / friendica.git / blobdiff