<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
namespace Friendica\Protocol;
use Friendica\Core\Logger;
-use Friendica\Network\HTTPRequest;
+use Friendica\DI;
+use Friendica\Network\HTTPClient\Client\HttpClient;
use Friendica\Network\Probe;
use Friendica\Util\Crypto;
use Friendica\Util\Strings;
{
$ret = [];
- Logger::log('Fetching salmon key for '.$uri);
+ Logger::info('Fetching salmon key for '.$uri);
$arr = Probe::lrdd($uri);
$ret[$x] = substr($ret[$x], 5);
}
} elseif (Strings::normaliseLink($ret[$x]) == 'http://') {
- $ret[$x] = HTTPRequest::fetchUrl($ret[$x]);
+ $ret[$x] = DI::httpClient()->fetch($ret[$x], 0, HttpClient::ACCEPT_MAGIC_KEY);
+ Logger::debug('Fetched public key', ['url' => $ret[$x]]);
}
}
}
}
if (!$owner['sprvkey']) {
- Logger::log(sprintf("user '%s' (%d) does not have a salmon private key. Send failed.",
+ Logger::notice(sprintf("user '%s' (%d) does not have a salmon private key. Send failed.",
$owner['name'], $owner['uid']));
return;
}
- Logger::log('slapper called for '.$url.'. Data: ' . $slap);
+ Logger::info('slapper called for '.$url.'. Data: ' . $slap);
// create a magic envelope
$salmon = XML::fromArray($xmldata, $xml, false, $namespaces);
// slap them
- $postResult = DI::httpRequest()->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();
// 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,
$salmon = XML::fromArray($xmldata, $xml, false, $namespaces);
// slap them
- $postResult = DI::httpRequest()->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,
$salmon = XML::fromArray($xmldata, $xml, false, $namespaces);
// slap them
- $postResult = DI::httpRequest()->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;
}
*/
public static function salmonKey($pubkey)
{
- 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);
}
}