X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FProtocol%2FSalmon.php;h=7a4e8cc94e3d3940e046b7d5e10c47efde387a9d;hb=e82ef8890b60da42e47b8a4439309f7311e05141;hp=f8fa2f0540f66ec56e546e4a421c2c3f2e11a9ea;hpb=1de3960e267a8d298348fbca18cf1be1f6a20f7a;p=friendica.git diff --git a/src/Protocol/Salmon.php b/src/Protocol/Salmon.php index f8fa2f0540..7a4e8cc94e 100644 --- a/src/Protocol/Salmon.php +++ b/src/Protocol/Salmon.php @@ -1,18 +1,37 @@ . + * */ + namespace Friendica\Protocol; use Friendica\Core\Logger; +use Friendica\DI; +use Friendica\Network\HTTPClient\Client\HttpClientAccept; use Friendica\Network\Probe; use Friendica\Util\Crypto; -use Friendica\Util\Network; use Friendica\Util\Strings; use Friendica\Util\XML; /** - * @brief Salmon Protocol class + * Salmon Protocol class + * * The Salmon Protocol is a message exchange protocol running over HTTP designed to decentralize commentary * and annotations made against newsfeed articles such as blog posts. */ @@ -21,14 +40,14 @@ class Salmon /** * @param string $uri Uniform Resource Identifier * @param string $keyhash encoded key - * @return mixed + * @return string Key or empty string on any errors * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function getKey($uri, $keyhash) + public static function getKey(string $uri, string $keyhash): string { $ret = []; - Logger::log('Fetching salmon key for '.$uri); + Logger::info('Fetching salmon key for '.$uri); $arr = Probe::lrdd($uri); @@ -54,22 +73,23 @@ class Salmon $ret[$x] = substr($ret[$x], 5); } } elseif (Strings::normaliseLink($ret[$x]) == 'http://') { - $ret[$x] = Network::fetchUrl($ret[$x]); + $ret[$x] = DI::httpClient()->fetch($ret[$x], HttpClientAccept::MAGIC_KEY); + Logger::debug('Fetched public key', ['url' => $ret[$x]]); } } } - Logger::log('Key located: ' . print_r($ret, true)); + Logger::notice('Key located', ['ret' => $ret]); if (count($ret) == 1) { - // We only found one one key so we don't care if the hash matches. - // If it's the wrong key we'll find out soon enough because - // message verification will fail. This also covers some older - // software which don't supply a keyhash. As long as they only - // have one key we'll be right. - - return $ret[0]; + /* We only found one one key so we don't care if the hash matches. + * If it's the wrong key we'll find out soon enough because + * message verification will fail. This also covers some older + * software which don't supply a keyhash. As long as they only + * have one key we'll be right. + */ + return (string) $ret[0]; } else { foreach ($ret as $a) { $hash = Strings::base64UrlEncode(hash('sha256', $a)); @@ -89,21 +109,21 @@ class Salmon * @return integer * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function slapper($owner, $url, $slap) + public static function slapper(array $owner, string $url, string $slap): int { // does contact have a salmon endpoint? - if (! strlen($url)) { - return; + if (!strlen($url)) { + return -1; } - if (! $owner['sprvkey']) { - Logger::log(sprintf("user '%s' (%d) does not have a salmon private key. Send failed.", - $owner['username'], $owner['uid'])); - return; + if (!$owner['sprvkey']) { + Logger::notice(sprintf("user '%s' (%d) does not have a salmon private key. Send failed.", + $owner['name'], $owner['uid'])); + return -1; } - Logger::log('slapper called for '.$url.'. Data: ' . $slap); + Logger::info('slapper called for '.$url.'. Data: ' . $slap); // create a magic envelope @@ -137,9 +157,9 @@ class Salmon $salmon = XML::fromArray($xmldata, $xml, false, $namespaces); // slap them - $postResult = Network::post($url, $salmon, [ - 'Content-type: application/magic-envelope+xml', - 'Content-length: ' . strlen($salmon) + $postResult = DI::httpClient()->post($url, $salmon, [ + 'Content-type' => 'application/magic-envelope+xml', + 'Content-length' => strlen($salmon), ]); $return_code = $postResult->getReturnCode(); @@ -147,7 +167,7 @@ class Salmon // check for success, e.g. 2xx if ($return_code > 299) { - Logger::log('GNU Social salmon failed. Falling back to compliant mode'); + Logger::notice('GNU Social salmon failed. Falling back to compliant mode'); // Now try the compliant mode that normally isn't used for GNU Social $xmldata = ["me:env" => ["me:data" => $data, @@ -162,15 +182,15 @@ class Salmon $salmon = XML::fromArray($xmldata, $xml, false, $namespaces); // slap them - $postResult = Network::post($url, $salmon, [ - 'Content-type: application/magic-envelope+xml', - 'Content-length: ' . strlen($salmon) + $postResult = DI::httpClient()->post($url, $salmon, [ + 'Content-type' => 'application/magic-envelope+xml', + 'Content-length' => strlen($salmon), ]); $return_code = $postResult->getReturnCode(); } if ($return_code > 299) { - Logger::log('compliant salmon failed. Falling back to old status.net'); + Logger::notice('compliant salmon failed. Falling back to old status.net'); // Last try. This will most likely fail as well. $xmldata = ["me:env" => ["me:data" => $data, @@ -185,19 +205,19 @@ class Salmon $salmon = XML::fromArray($xmldata, $xml, false, $namespaces); // slap them - $postResult = Network::post($url, $salmon, [ - 'Content-type: application/magic-envelope+xml', - 'Content-length: ' . strlen($salmon)]); + $postResult = DI::httpClient()->post($url, $salmon, [ + 'Content-type' => 'application/magic-envelope+xml', + 'Content-length' => strlen($salmon)]); $return_code = $postResult->getReturnCode(); } - Logger::log('slapper for '.$url.' returned ' . $return_code); + Logger::info('slapper for '.$url.' returned ' . $return_code); if (! $return_code) { return -1; } - if (($return_code == 503) && (stristr($postResult->getHeader(), 'retry-after'))) { + if (($return_code == 503) && $postResult->inHeader('retry-after')) { return -1; } @@ -209,9 +229,9 @@ class Salmon * @return string * @throws \Exception */ - public static function salmonKey($pubkey) + public static function salmonKey(string $pubkey): string { - Crypto::pemToMe($pubkey, $m, $e); - return 'RSA' . '.' . Strings::base64UrlEncode($m, true) . '.' . Strings::base64UrlEncode($e, true); + Crypto::pemToMe($pubkey, $modulus, $exponent); + return 'RSA' . '.' . Strings::base64UrlEncode($modulus, true) . '.' . Strings::base64UrlEncode($exponent, true); } }