use Friendica\Core\Logger;
use Friendica\DI;
-use Friendica\Network\HTTPClient\Client\HttpClient;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
use Friendica\Network\Probe;
use Friendica\Util\Crypto;
use Friendica\Util\Strings;
* @return mixed
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public static function getKey($uri, $keyhash)
+ public static function getKey(string $uri, string $keyhash)
{
$ret = [];
$ret[$x] = substr($ret[$x], 5);
}
} elseif (Strings::normaliseLink($ret[$x]) == 'http://') {
- $ret[$x] = DI::httpClient()->fetch($ret[$x], 0, HttpClient::ACCEPT_MAGIC_KEY);
+ $ret[$x] = DI::httpClient()->fetch($ret[$x], HttpClientAccept::MAGIC_KEY);
Logger::debug('Fetched public key', ['url' => $ret[$x]]);
}
}
* @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;
+ return -1;
}
if (!$owner['sprvkey']) {
Logger::notice(sprintf("user '%s' (%d) does not have a salmon private key. Send failed.",
$owner['name'], $owner['uid']));
- return;
+ return -1;
}
Logger::info('slapper called for '.$url.'. Data: ' . $slap);
* @return string
* @throws \Exception
*/
- public static function salmonKey($pubkey)
+ public static function salmonKey(string $pubkey): string
{
Crypto::pemToMe($pubkey, $modulus, $exponent);
return 'RSA' . '.' . Strings::base64UrlEncode($modulus, true) . '.' . Strings::base64UrlEncode($exponent, true);