From 7c73e8634c954cc2bd0d1138729459d7d5090f62 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Wed, 10 Oct 2018 21:15:26 +0200 Subject: [PATCH] Curl Response Refactoring - refactored Network::post() - replaced every Network::post() execution with the new Curl container --- include/items.php | 4 ++-- mod/dfrn_confirm.php | 2 +- mod/dfrn_poll.php | 2 +- mod/match.php | 4 ++-- src/Protocol/DFRN.php | 7 ++++--- src/Protocol/Diaspora.php | 6 +++--- src/Protocol/Salmon.php | 13 ++++++------- src/Util/HTTPSignature.php | 5 ++--- src/Worker/OnePoll.php | 2 +- src/Worker/PubSubPublish.php | 4 ++-- 10 files changed, 24 insertions(+), 25 deletions(-) diff --git a/include/items.php b/include/items.php index 236e63dd25..27a7db767b 100644 --- a/include/items.php +++ b/include/items.php @@ -316,9 +316,9 @@ function subscribe_to_hub($url, array $importer, array $contact, $hubmode = 'sub DBA::update('contact', ['hub-verify' => $verify_token], ['id' => $contact['id']]); } - Network::post($url, $params); + $postResult = Network::post($url, $params); - logger('subscribe_to_hub: returns: ' . Network::getCurl()->getCode(), LOGGER_DEBUG); + logger('subscribe_to_hub: returns: ' . $postResult->getReturnCode(), LOGGER_DEBUG); return; diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index d3fa45d361..969e2286c8 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -221,7 +221,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) * */ - $res = Network::post($dfrn_confirm, $params, null, $redirects, 120); + $res = Network::post($dfrn_confirm, $params, null, $redirects, 120)->getBody(); logger(' Confirm: received data: ' . $res, LOGGER_DATA); diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php index 54539ee03d..af597d76ff 100644 --- a/mod/dfrn_poll.php +++ b/mod/dfrn_poll.php @@ -502,7 +502,7 @@ function dfrn_poll_content(App $a) 'dfrn_version' => DFRN_PROTOCOL_VERSION, 'challenge' => $challenge, 'sec' => $sec - ]); + ])->getBody(); } $profile = ((DBA::isResult($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname); diff --git a/mod/match.php b/mod/match.php index bb1e4542ae..7e805d5baf 100644 --- a/mod/match.php +++ b/mod/match.php @@ -59,9 +59,9 @@ function match_content(App $a) } if (strlen(Config::get('system', 'directory'))) { - $x = Network::post(get_server().'/msearch', $params); + $x = Network::post(get_server().'/msearch', $params)->getBody(); } else { - $x = Network::post(System::baseUrl() . '/msearch', $params); + $x = Network::post(System::baseUrl() . '/msearch', $params)->getBody(); } $j = json_decode($x); diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index 3a001de049..f92d1401df 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -1469,16 +1469,17 @@ class DFRN $content_type = ($public_batch ? "application/magic-envelope+xml" : "application/json"); - $xml = Network::post($dest_url, $envelope, ["Content-Type: ".$content_type]); + $postResult = Network::post($dest_url, $envelope, ["Content-Type: ".$content_type]); + $xml = $postResult->getBody(); - $curl_stat = Network::getCurl()->getCode(); + $curl_stat = $postResult->getReturnCode(); if (empty($curl_stat) || empty($xml)) { logger('Empty answer from ' . $contact['id'] . ' - ' . $dest_url); Contact::markForArchival($contact); return -9; // timed out } - if (($curl_stat == 503) && (stristr(Network::getCurl()->getHeaders(), 'retry-after'))) { + if (($curl_stat == 503) && (stristr($postResult->getHeader(), 'retry-after'))) { Contact::markForArchival($contact); return -10; } diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php index ebdc84ce7f..d3cda6c2da 100644 --- a/src/Protocol/Diaspora.php +++ b/src/Protocol/Diaspora.php @@ -3079,8 +3079,8 @@ class Diaspora if (!intval(Config::get("system", "diaspora_test"))) { $content_type = (($public_batch) ? "application/magic-envelope+xml" : "application/json"); - Network::post($dest_url."/", $envelope, ["Content-Type: ".$content_type]); - $return_code = Network::getCurl()->getCode(); + $postResult = Network::post($dest_url."/", $envelope, ["Content-Type: ".$content_type]); + $return_code = $postResult->getReturnCode(); } else { logger("test_mode"); return 200; @@ -3089,7 +3089,7 @@ class Diaspora logger("transmit: ".$logid."-".$guid." to ".$dest_url." returns: ".$return_code); - if (!$return_code || (($return_code == 503) && (stristr(Network::getCurl()->getHeaders(), "retry-after")))) { + if (!$return_code || (($return_code == 503) && (stristr($postResult->getHeaders(), "retry-after")))) { if (!$no_queue && !empty($contact['contact-type']) && ($contact['contact-type'] != Contact::ACCOUNT_TYPE_RELAY)) { logger("queue message"); // queue message for redelivery diff --git a/src/Protocol/Salmon.php b/src/Protocol/Salmon.php index b71be6e2fa..02d08c3d4e 100644 --- a/src/Protocol/Salmon.php +++ b/src/Protocol/Salmon.php @@ -133,13 +133,12 @@ class Salmon $salmon = XML::fromArray($xmldata, $xml, false, $namespaces); // slap them - Network::post($url, $salmon, [ + $postResult = Network::post($url, $salmon, [ 'Content-type: application/magic-envelope+xml', 'Content-length: ' . strlen($salmon) ]); - $a = get_app(); - $return_code = Network::getCurl()->getCode(); + $return_code = $postResult->getReturnCode(); // check for success, e.g. 2xx @@ -159,11 +158,11 @@ class Salmon $salmon = XML::fromArray($xmldata, $xml, false, $namespaces); // slap them - Network::post($url, $salmon, [ + $postResult = Network::post($url, $salmon, [ 'Content-type: application/magic-envelope+xml', 'Content-length: ' . strlen($salmon) ]); - $return_code = Network::getCurl()->getCode(); + $return_code = $postResult->getReturnCode(); } if ($return_code > 299) { @@ -182,10 +181,10 @@ class Salmon $salmon = XML::fromArray($xmldata, $xml, false, $namespaces); // slap them - Network::post($url, $salmon, [ + $postResult = Network::post($url, $salmon, [ 'Content-type: application/magic-envelope+xml', 'Content-length: ' . strlen($salmon)]); - $return_code = Network::getCurl()->getCode(); + $return_code = $postResult->getReturnCode(); } logger('slapper for '.$url.' returned ' . $return_code); diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php index 247e554f00..503cbff0ad 100644 --- a/src/Util/HTTPSignature.php +++ b/src/Util/HTTPSignature.php @@ -302,10 +302,9 @@ class HTTPSignature $headers[] = 'Content-Type: application/activity+json'; - Network::post($target, $content, $headers); - $return_code = Network::getCurl()->getCode(); + $postResult = Network::post($target, $content, $headers); - logger('Transmit to ' . $target . ' returned ' . $return_code); + logger('Transmit to ' . $target . ' returned ' . $postResult->getReturnCode()); } /** diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php index ab8a305494..a68ad1336d 100644 --- a/src/Worker/OnePoll.php +++ b/src/Worker/OnePoll.php @@ -287,7 +287,7 @@ class OnePoll $postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION; $postvars['perm'] = 'rw'; - $xml = Network::post($contact['poll'], $postvars); + $xml = Network::post($contact['poll'], $postvars)->getBody(); } elseif (($contact['network'] === Protocol::OSTATUS) || ($contact['network'] === Protocol::DIASPORA) diff --git a/src/Worker/PubSubPublish.php b/src/Worker/PubSubPublish.php index 07023e8247..38d9c07868 100644 --- a/src/Worker/PubSubPublish.php +++ b/src/Worker/PubSubPublish.php @@ -56,8 +56,8 @@ class PubSubPublish logger('POST ' . print_r($headers, true) . "\n" . $params, LOGGER_DATA); - Network::post($subscriber['callback_url'], $params, $headers); - $ret = Network::getCurl()->getCode(); + $postResult = Network::post($subscriber['callback_url'], $params, $headers); + $ret = $postResult->getReturnCode(); $condition = ['id' => $subscriber['id']]; -- 2.39.5