From eeadd2f9d61ca1dfd8acf157df5f4b8b06d87b0b Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 2 Apr 2018 21:46:10 +0000 Subject: [PATCH 1/4] The Diaspora transport layer is now the default for DFRN --- src/Protocol/DFRN.php | 57 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 46 insertions(+), 11 deletions(-) diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index ea867a84d6..88025b88ca 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -1146,13 +1146,20 @@ class DFRN * @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 successfull with status ' . $ret); + return $ret; + } + $idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']); if ($contact['duplex'] && $contact['dfrn-id']) { @@ -1359,7 +1366,7 @@ class DFRN } if (!empty($res->message)) { - logger('Delivery returned status '.$res->status.' - '.$res->message, LOGGER_DEBUG); + logger('Transmit returned status '.$res->status.' - '.$res->message, LOGGER_DEBUG); } if ($res->status == 200) { @@ -1370,15 +1377,15 @@ class DFRN } /** - * @brief Delivers items to the contacts via the Diaspora transport layer + * @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 array $items Items that will be transmitted + * @param array $owner Owner record + * @param array $contact Contact record of the receiver + * @param string $atom Content that will be transmitted * - * @return int HTTP Deliver status + * @return int Deliver status. Negative values mean an error. */ - public static function buildAndTransmit($owner, $contact, $items) + public static function transmit($owner, $contact, $atom) { $a = get_app(); @@ -1400,10 +1407,38 @@ class DFRN $content_type = ($public_batch ? "application/magic-envelope+xml" : "application/json"); - $ret = Network::post($dest_url, $envelope, ["Content-Type: ".$content_type]); + $xml = Network::post($dest_url, $envelope, ["Content-Type: ".$content_type]); - /// @ToDo: Add better treatment of return codes - return $a->get_curl_code(); + $curl_stat = $a->get_curl_code(); + if (!$curl_stat || empty($xml)) { + return -9; // timed out + } + + if (($curl_stat == 503) && (stristr($a->get_curl_headers(), 'retry-after'))) { + return -10; + } + + if (strpos($xml, 'status)) { + return -11; + } + + if (!empty($res->message)) { + logger('Delivery returned status '.$res->status.' - '.$res->message, LOGGER_DEBUG); + } + + if ($res->status == 200) { + Contact::unmarkForArchival($contact); + } + + return intval($res->status); } /** From 8ff6a31512d86623673d38c116d37cca566dab27 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 2 Apr 2018 21:59:30 +0000 Subject: [PATCH 2/4] Sending does now work --- src/Protocol/DFRN.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index 88025b88ca..1ead71ea17 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -1393,15 +1393,13 @@ class DFRN // $public_batch = !$items[0]['private']; $public_batch = false; - $msg = DFRN::entries($items, $owner); - $fcontact = Diaspora::personByHandle($contact['addr']); if (empty($fcontact)) { logger("unable to find contact details"); return; } - $envelope = Diaspora::buildMessage($msg, $owner, $contact, $owner['uprvkey'], $fcontact['pubkey'], $public_batch); + $envelope = Diaspora::buildMessage($atom, $owner, $contact, $owner['uprvkey'], $fcontact['pubkey'], $public_batch); $dest_url = ($public_batch ? $fcontact["batch"] : $contact["notify"]); From becc86a9606a3619cf96b6d38ca245e726431d52 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 2 Apr 2018 22:02:43 +0000 Subject: [PATCH 3/4] Changed logging text --- src/Protocol/DFRN.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index 1ead71ea17..e253ae7513 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -1366,7 +1366,7 @@ class DFRN } if (!empty($res->message)) { - logger('Transmit returned status '.$res->status.' - '.$res->message, LOGGER_DEBUG); + logger('Delivery returned status '.$res->status.' - '.$res->message, LOGGER_DEBUG); } if ($res->status == 200) { @@ -1429,7 +1429,7 @@ class DFRN } if (!empty($res->message)) { - logger('Delivery returned status '.$res->status.' - '.$res->message, LOGGER_DEBUG); + logger('Transmit returned status '.$res->status.' - '.$res->message, LOGGER_DEBUG); } if ($res->status == 200) { From d668b967c90f65366375ff6cfb825a97d66cb253 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 2 Apr 2018 22:06:31 +0000 Subject: [PATCH 4/4] Misspelling --- src/Protocol/DFRN.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index e253ae7513..ea3a05a886 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -1156,7 +1156,7 @@ class DFRN // At first try the Diaspora transport layer $ret = self::transmit($owner, $contact, $atom); if ($ret >= 200) { - logger('Delivery via Diaspora transport layer was successfull with status ' . $ret); + logger('Delivery via Diaspora transport layer was successful with status ' . $ret); return $ret; }