mirror of
https://github.com/friendica/friendica
synced 2025-04-29 10:24:23 +02:00
OStatus support removed
This commit is contained in:
Michael
parent
eb066b258d
commit
e8a3be6820
87 changed files with 773 additions and 4383 deletions
|
|
@ -7,17 +7,7 @@
|
|||
|
||||
namespace Friendica\Protocol;
|
||||
|
||||
use Friendica\Core\Logger;
|
||||
use Friendica\Core\Protocol;
|
||||
use Friendica\DI;
|
||||
use Friendica\Model\Item;
|
||||
use Friendica\Network\HTTPClient\Client\HttpClientAccept;
|
||||
use Friendica\Network\HTTPClient\Client\HttpClientRequest;
|
||||
use Friendica\Network\Probe;
|
||||
use Friendica\Protocol\Salmon\Format\Magic;
|
||||
use Friendica\Util\Crypto;
|
||||
use Friendica\Util\Strings;
|
||||
use Friendica\Util\XML;
|
||||
use phpseclib3\Crypt\PublicKeyLoader;
|
||||
|
||||
/**
|
||||
|
|
@ -28,206 +18,6 @@ use phpseclib3\Crypt\PublicKeyLoader;
|
|||
*/
|
||||
class Salmon
|
||||
{
|
||||
/**
|
||||
* @param string $uri Uniform Resource Identifier
|
||||
* @param string $keyhash encoded key
|
||||
* @return string Key or empty string on any errors
|
||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||
*/
|
||||
public static function getKey(string $uri, string $keyhash): string
|
||||
{
|
||||
$ret = [];
|
||||
|
||||
Logger::info('Fetching salmon key for ' . $uri);
|
||||
|
||||
$arr = Probe::lrdd($uri);
|
||||
|
||||
if (is_array($arr)) {
|
||||
foreach ($arr as $a) {
|
||||
if ($a['@attributes']['rel'] === 'magic-public-key') {
|
||||
$ret[] = $a['@attributes']['href'];
|
||||
}
|
||||
}
|
||||
} else {
|
||||
return '';
|
||||
}
|
||||
|
||||
// We have found at least one key URL
|
||||
// If it's inline, parse it - otherwise get the key
|
||||
|
||||
if (count($ret) > 0) {
|
||||
for ($x = 0; $x < count($ret); $x++) {
|
||||
if (substr($ret[$x], 0, 5) === 'data:') {
|
||||
if (strstr($ret[$x], ',')) {
|
||||
$ret[$x] = substr($ret[$x], strpos($ret[$x], ',') + 1);
|
||||
} else {
|
||||
$ret[$x] = substr($ret[$x], 5);
|
||||
}
|
||||
} elseif (Strings::normaliseLink($ret[$x]) == 'http://') {
|
||||
$ret[$x] = DI::httpClient()->fetch($ret[$x], HttpClientAccept::MAGIC_KEY, 0, '', HttpClientRequest::SALMON);
|
||||
Logger::debug('Fetched public key', ['url' => $ret[$x]]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Logger::notice('Key located', ['ret' => $ret]);
|
||||
|
||||
if (count($ret) == 1) {
|
||||
/* We only found 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));
|
||||
if ($hash == $keyhash) {
|
||||
return $a;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return '';
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array $owner owner
|
||||
* @param string $url url
|
||||
* @param string $slap slap
|
||||
* @return integer
|
||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||
*/
|
||||
public static function slapper(array $owner, string $url, string $slap): int
|
||||
{
|
||||
// does contact have a salmon endpoint?
|
||||
|
||||
if (!strlen($url)) {
|
||||
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 -1;
|
||||
}
|
||||
|
||||
Logger::info('slapper called for ' . $url . '. Data: ' . $slap);
|
||||
|
||||
// create a magic envelope
|
||||
|
||||
$data = Strings::base64UrlEncode($slap);
|
||||
$data_type = 'application/atom+xml';
|
||||
$encoding = 'base64url';
|
||||
$algorithm = 'RSA-SHA256';
|
||||
$keyhash = Strings::base64UrlEncode(hash('sha256', self::salmonKey($owner['spubkey'])), true);
|
||||
|
||||
$precomputed = '.' . Strings::base64UrlEncode($data_type) . '.' . Strings::base64UrlEncode($encoding) . '.' . Strings::base64UrlEncode($algorithm);
|
||||
|
||||
// GNU Social format
|
||||
$signature = Strings::base64UrlEncode(Crypto::rsaSign($data . $precomputed, $owner['sprvkey']));
|
||||
|
||||
// Compliant format
|
||||
$signature2 = Strings::base64UrlEncode(Crypto::rsaSign(str_replace('=', '', $data . $precomputed), $owner['sprvkey']));
|
||||
|
||||
// Old Status.net format
|
||||
$signature3 = Strings::base64UrlEncode(Crypto::rsaSign($data, $owner['sprvkey']));
|
||||
|
||||
// At first try the non compliant method that works for GNU Social
|
||||
$xmldata = [
|
||||
'me:env' => [
|
||||
'me:data' => $data,
|
||||
'@attributes' => ['type' => $data_type],
|
||||
'me:encoding' => $encoding,
|
||||
'me:alg' => $algorithm,
|
||||
'me:sig' => $signature,
|
||||
'@attributes2' => ['key_id' => $keyhash],
|
||||
]
|
||||
];
|
||||
|
||||
$namespaces = ['me' => ActivityNamespace::SALMON_ME];
|
||||
|
||||
$salmon = XML::fromArray($xmldata, $dummy, false, $namespaces);
|
||||
|
||||
// slap them
|
||||
$postResult = DI::httpClient()->post($url, $salmon, [
|
||||
'Content-type' => 'application/magic-envelope+xml',
|
||||
'Content-length' => strlen($salmon),
|
||||
], 0, HttpClientRequest::SALMON);
|
||||
|
||||
$return_code = $postResult->getReturnCode();
|
||||
|
||||
// check for success, e.g. 2xx
|
||||
|
||||
if ($return_code > 299) {
|
||||
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,
|
||||
'@attributes' => ['type' => $data_type],
|
||||
'me:encoding' => $encoding,
|
||||
'me:alg' => $algorithm,
|
||||
'me:sig' => $signature2,
|
||||
'@attributes2' => ['key_id' => $keyhash]
|
||||
]
|
||||
];
|
||||
|
||||
$salmon = XML::fromArray($xmldata, $dummy, false, $namespaces);
|
||||
|
||||
// slap them
|
||||
$postResult = DI::httpClient()->post($url, $salmon, [
|
||||
'Content-type' => 'application/magic-envelope+xml',
|
||||
'Content-length' => strlen($salmon),
|
||||
], 0, HttpClientRequest::SALMON);
|
||||
$return_code = $postResult->getReturnCode();
|
||||
}
|
||||
|
||||
if ($return_code > 299) {
|
||||
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,
|
||||
'@attributes' => ['type' => $data_type],
|
||||
'me:encoding' => $encoding,
|
||||
'me:alg' => $algorithm,
|
||||
'me:sig' => $signature3,
|
||||
'@attributes2' => ['key_id' => $keyhash],
|
||||
]
|
||||
];
|
||||
|
||||
$salmon = XML::fromArray($xmldata, $dummy, false, $namespaces);
|
||||
|
||||
// slap them
|
||||
$postResult = DI::httpClient()->post($url, $salmon, [
|
||||
'Content-type' => 'application/magic-envelope+xml',
|
||||
'Content-length' => strlen($salmon)
|
||||
], 0, HttpClientRequest::SALMON);
|
||||
$return_code = $postResult->getReturnCode();
|
||||
}
|
||||
|
||||
Item::incrementOutbound(Protocol::OSTATUS);
|
||||
Logger::info('slapper for ' . $url . ' returned ' . $return_code);
|
||||
|
||||
if (!$return_code) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (($return_code == 503) && $postResult->inHeader('retry-after')) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
return (($return_code >= 200) && ($return_code < 300)) ? 0 : 1;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $pubkey public key
|
||||
* @return string
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue