friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #3367 from annando/1704-mastodon 

Reworked OStatus communication part to better support Mastodon.
This commit is contained in:
Hypolite Petovan 2017-04-20 02:12:41 -04:00 committed by GitHub
parent 6e04e44776 3592f90910
commit 792ed55ae6
5 changed files with 116 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/bbcode.php
View File

@ -63,7 +63,7 @@ function bb_attachment($Text, $simplehtml = false, $tryoembed = true) {
(similar_text($test1,$test2) / strlen($data["title"])) > 0.9)) {
$title2 = $data["url"];
}
$text = sprintf('<a href="%s" title="%s" class="attachment thumbnail" rel="nofollow external">%s</a><br />',
$text = sprintf('<a href="%s" title="%s" class="attachment" rel="nofollow external">%s</a><br />',
$data["url"], $data["title"], $title2);
} elseif (($simplehtml != 4) AND ($simplehtml != 0)) {
$text = sprintf('<a href="%s" target="_blank">%s</a><br>', $data["url"], $data["title"]);
@ -97,7 +97,7 @@ function bb_attachment($Text, $simplehtml = false, $tryoembed = true) {
}
}
}
return $data["text"] . $text . $data["after"];
return trim($data["text"].' '.$text.' '.$data["after"]);
}
function bb_remove_share_information($Text, $plaintext = false, $nolink = false) {

32
include/ostatus.php
View File

@ -1480,14 +1480,6 @@ class ostatus {
$siteinfo = get_attached_data($item["body"]);
switch ($siteinfo["type"]) {
case 'link':
$attributes = array("rel" => "enclosure",
"href" => $siteinfo["url"],
"type" => "text/html; charset=UTF-8",
"length" => "",
"title" => $siteinfo["title"]);
xml::add_element($doc, $root, "link", "", $attributes);
break;
case 'photo':
$imgdata = get_photo_info($siteinfo["image"]);
$attributes = array("rel" => "enclosure",
@ -1509,13 +1501,15 @@ class ostatus {
}
if (($siteinfo["type"] != "photo") AND isset($siteinfo["image"])) {
$photodata = get_photo_info($siteinfo["image"]);
$imgdata = get_photo_info($siteinfo["image"]);
$attributes = array("rel" => "enclosure",
"href" => $siteinfo["image"],
"type" => $imgdata["mime"],
"length" => intval($imgdata["size"]));
$attributes = array("rel" => "preview", "href" => $siteinfo["image"], "media:width" => $photodata[0], "media:height" => $photodata[1]);
xml::add_element($doc, $root, "link", "", $attributes);
}
$arr = explode('[/attach],', $item['attach']);
if (count($arr)) {
foreach ($arr as $r) {
@ -1526,12 +1520,12 @@ class ostatus {
"href" => $matches[1],
"type" => $matches[3]);
if(intval($matches[2]))
if (intval($matches[2])) {
$attributes["length"] = intval($matches[2]);
if(trim($matches[4]) != "")
}
if (trim($matches[4]) != "") {
$attributes["title"] = trim($matches[4]);
}
xml::add_element($doc, $root, "link", "", $attributes);
}
}
@ -2089,7 +2083,13 @@ class ostatus {
if (intval($item["parent"]) > 0) {
$conversation = App::get_baseurl()."/display/".$owner["nick"]."/".$item["parent"];
xml::add_element($doc, $entry, "link", "", array("rel" => "ostatus:conversation", "href" => $conversation));
xml::add_element($doc, $entry, "ostatus:conversation", $conversation);
$attributes = array(
"href" => $conversation,
"local_id" => $item["parent"],
"ref" => $conversation);
xml::add_element($doc, $entry, "ostatus:conversation", $conversation, $attributes);
}
$tags = item_getfeedtags($item);

98
include/salmon.php
View File

@ -16,8 +16,7 @@ function get_salmon_key($uri,$keyhash) {
$ret[] = $a['@attributes']['href'];
}
}
}
else {
} else {
return '';
}
@ -50,8 +49,7 @@ function get_salmon_key($uri,$keyhash) {
// have one key we'll be right.
return $ret[0];
}
else {
} else {
foreach ($ret as $a) {
$hash = base64url_encode(hash('sha256', $a));
if ($hash == $keyhash) {
@ -69,9 +67,9 @@ function slapper($owner,$url,$slap) {
// does contact have a salmon endpoint?
if(! strlen($url))
if (! strlen($url)) {
return;
}
if (! $owner['sprvkey']) {
logger(sprintf("user '%s' (%d) does not have a salmon private key. Send failed.",
@ -89,25 +87,28 @@ function slapper($owner,$url,$slap) {
$algorithm = 'RSA-SHA256';
$keyhash = base64url_encode(hash('sha256', salmon_key($owner['spubkey'])), true);
// precomputed base64url encoding of data_type, encoding, algorithm concatenated with periods
$precomputed = '.' . base64url_encode($data_type) . '.' . base64url_encode($encoding) . '.' . base64url_encode($algorithm);
$precomputed = '.YXBwbGljYXRpb24vYXRvbSt4bWw=.YmFzZTY0dXJs.UlNBLVNIQTI1Ng==';
// GNU Social format
$signature = base64url_encode(rsa_sign($data . $precomputed, $owner['sprvkey']));
$signature = base64url_encode(rsa_sign(str_replace('=','',$data . $precomputed),$owner['sprvkey']));
$signature2 = base64url_encode(rsa_sign($data . $precomputed,$owner['sprvkey']));
// Compliant format
$signature2 = base64url_encode(rsa_sign(str_replace('=', '', $data . $precomputed), $owner['sprvkey']));
// Old Status.net format
$signature3 = base64url_encode(rsa_sign($data, $owner['sprvkey']));
$salmon_tpl = get_markup_template('magicsig.tpl');
// At first try the non compliant method that works for GNU Social
$xmldata = array("me:env" => array("me:data" => $data,
"@attributes" => array("type" => $data_type),
"me:encoding" => $encoding,
"me:alg" => $algorithm,
"me:sig" => $signature,
"@attributes2" => array("key_id" => $keyhash)));
$salmon = replace_macros($salmon_tpl,array(
'$data' => $data,
'$encoding' => $encoding,
'$algorithm' => $algorithm,
'$keyhash' => $keyhash,
'$signature' => $signature
));
$namespaces = array("me" => "http://salmon-protocol.org/ns/magic-env");
$salmon = xml::from_array($xmldata, $xml, false, $namespaces);
// slap them
post_url($url, $salmon, array(
@ -122,19 +123,19 @@ function slapper($owner,$url,$slap) {
if ($return_code > 299) {
logger('compliant salmon failed. Falling back to status.net hack2');
logger('GNU Social salmon failed. Falling back to compliant mode');
// Entirely likely that their salmon implementation is
// non-compliant. Let's try once more, this time only signing
// the data, without stripping '=' chars
// Now try the compliant mode that normally isn't used for GNU Social
$xmldata = array("me:env" => array("me:data" => $data,
"@attributes" => array("type" => $data_type),
"me:encoding" => $encoding,
"me:alg" => $algorithm,
"me:sig" => $signature2,
"@attributes2" => array("key_id" => $keyhash)));
$salmon = replace_macros($salmon_tpl,array(
'$data' => $data,
'$encoding' => $encoding,
'$algorithm' => $algorithm,
'$keyhash' => $keyhash,
'$signature' => $signature2
));
$namespaces = array("me" => "http://salmon-protocol.org/ns/magic-env");
$salmon = xml::from_array($xmldata, $xml, false, $namespaces);
// slap them
post_url($url, $salmon, array(
@ -142,23 +143,22 @@ function slapper($owner,$url,$slap) {
'Content-length: ' . strlen($salmon)
));
$return_code = $a->get_curl_code();
}
if ($return_code > 299) {
logger('compliant salmon failed. Falling back to old status.net');
logger('compliant salmon failed. Falling back to status.net hack3');
// Last try. This will most likely fail as well.
$xmldata = array("me:env" => array("me:data" => $data,
"@attributes" => array("type" => $data_type),
"me:encoding" => $encoding,
"me:alg" => $algorithm,
"me:sig" => $signature3,
"@attributes2" => array("key_id" => $keyhash)));
// Entirely likely that their salmon implementation is
// non-compliant. Let's try once more, this time only signing
// the data, without the precomputed blob
$namespaces = array("me" => "http://salmon-protocol.org/ns/magic-env");
$salmon = replace_macros($salmon_tpl,array(
'$data' => $data,
'$encoding' => $encoding,
'$algorithm' => $algorithm,
'$keyhash' => $keyhash,
'$signature' => $signature3
));
$salmon = xml::from_array($xmldata, $xml, false, $namespaces);
// slap them
post_url($url, $salmon, array(
@ -167,13 +167,13 @@ function slapper($owner,$url,$slap) {
));
$return_code = $a->get_curl_code();
}
}
logger('slapper for '.$url.' returned ' . $return_code);
if(! $return_code)
return(-1);
if(($return_code == 503) && (stristr($a->get_curl_headers(),'retry-after')))
return(-1);
logger('slapper for '.$url.' returned ' . $return_code);
if (! $return_code) {
return(-1);
}
if (($return_code == 503) && (stristr($a->get_curl_headers(), 'retry-after'))) {
return(-1);
}
return ((($return_code >= 200) && ($return_code < 300)) ? 0 : 1);
}

14
mod/salmon.php
View File

@ -115,16 +115,20 @@ function salmon_post(App $a) {
// We should have everything we need now. Let's see if it verifies.
$verify = rsa_verify($compliant_format,$signature,$pubkey);
// Try GNU Social format
$verify = rsa_verify($signed_data, $signature, $pubkey);
$mode = 1;
if (! $verify) {
logger('mod-salmon: message did not verify using protocol. Trying padding hack.');
$verify = rsa_verify($signed_data,$signature,$pubkey);
logger('mod-salmon: message did not verify using protocol. Trying compliant format.');
$verify = rsa_verify($compliant_format, $signature, $pubkey);
$mode = 2;
}
if (! $verify) {
logger('mod-salmon: message did not verify using padding. Trying old statusnet hack.');
logger('mod-salmon: message did not verify using padding. Trying old statusnet format.');
$verify = rsa_verify($stnet_signed_data, $signature, $pubkey);
$mode = 3;
}
if (! $verify) {
@ -132,7 +136,7 @@ function salmon_post(App $a) {
http_status_exit(400);
}
logger('mod-salmon: Message verified.');
logger('mod-salmon: Message verified with mode '.$mode);
/*

10
view/templates/magicsig.tpl
View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<me:env xmlns:me="http://salmon-protocol.org/ns/magic-env">
<me:data type="application/atom+xml">
{{$data}}
</me:data>
<me:encoding>{{$encoding}}</me:encoding>
<me:alg>{{$algorithm}}</me:alg>
<me:sig key_id="{{$keyhash}}">{{$signature}}</me:sig>
</me:env>