|
|
@ -3,21 +3,20 @@ |
|
|
|
require_once('include/crypto.php'); |
|
|
|
require_once('include/Probe.php'); |
|
|
|
|
|
|
|
function get_salmon_key($uri,$keyhash) { |
|
|
|
function get_salmon_key($uri, $keyhash) { |
|
|
|
$ret = array(); |
|
|
|
|
|
|
|
logger('Fetching salmon key for '.$uri); |
|
|
|
|
|
|
|
$arr = Probe::lrdd($uri); |
|
|
|
|
|
|
|
if(is_array($arr)) { |
|
|
|
foreach($arr as $a) { |
|
|
|
if($a['@attributes']['rel'] === 'magic-public-key') { |
|
|
|
if (is_array($arr)) { |
|
|
|
foreach ($arr as $a) { |
|
|
|
if ($a['@attributes']['rel'] === 'magic-public-key') { |
|
|
|
$ret[] = $a['@attributes']['href']; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
else { |
|
|
|
} else { |
|
|
|
return ''; |
|
|
|
} |
|
|
|
|
|
|
@ -26,11 +25,11 @@ function get_salmon_key($uri,$keyhash) { |
|
|
|
|
|
|
|
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); |
|
|
|
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); |
|
|
|
$ret[$x] = substr($ret[$x], 5); |
|
|
|
} |
|
|
|
} elseif (normalise_link($ret[$x]) == 'http://') { |
|
|
|
$ret[$x] = fetch_url($ret[$x]); |
|
|
@ -39,7 +38,7 @@ function get_salmon_key($uri,$keyhash) { |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
logger('Key located: ' . print_r($ret,true)); |
|
|
|
logger('Key located: ' . print_r($ret, true)); |
|
|
|
|
|
|
|
if (count($ret) == 1) { |
|
|
|
|
|
|
@ -50,10 +49,9 @@ 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)); |
|
|
|
$hash = base64url_encode(hash('sha256', $a)); |
|
|
|
if ($hash == $keyhash) { |
|
|
|
return $a; |
|
|
|
} |
|
|
@ -65,17 +63,17 @@ function get_salmon_key($uri,$keyhash) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
function slapper($owner,$url,$slap) { |
|
|
|
function slapper($owner, $url, $slap) { |
|
|
|
|
|
|
|
// does contact have a salmon endpoint?
|
|
|
|
|
|
|
|
if(! strlen($url)) |
|
|
|
if (! strlen($url)) { |
|
|
|
return; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if(! $owner['sprvkey']) { |
|
|
|
if (! $owner['sprvkey']) { |
|
|
|
logger(sprintf("user '%s' (%d) does not have a salmon private key. Send failed.", |
|
|
|
$owner['username'],$owner['uid'])); |
|
|
|
$owner['username'], $owner['uid'])); |
|
|
|
return; |
|
|
|
} |
|
|
|
|
|
|
@ -87,30 +85,33 @@ function slapper($owner,$url,$slap) { |
|
|
|
$data_type = 'application/atom+xml'; |
|
|
|
$encoding = 'base64url'; |
|
|
|
$algorithm = 'RSA-SHA256'; |
|
|
|
$keyhash = base64url_encode(hash('sha256',salmon_key($owner['spubkey'])),true); |
|
|
|
$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'])); |
|
|
|
// Compliant format
|
|
|
|
$signature2 = base64url_encode(rsa_sign(str_replace('=', '', $data . $precomputed), $owner['sprvkey'])); |
|
|
|
|
|
|
|
$signature2 = base64url_encode(rsa_sign($data . $precomputed,$owner['sprvkey'])); |
|
|
|
// Old Status.net format
|
|
|
|
$signature3 = base64url_encode(rsa_sign($data, $owner['sprvkey'])); |
|
|
|
|
|
|
|
$signature3 = base64url_encode(rsa_sign($data,$owner['sprvkey'])); |
|
|
|
// 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_tpl = get_markup_template('magicsig.tpl'); |
|
|
|
$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' => $signature |
|
|
|
)); |
|
|
|
$salmon = xml::from_array($xmldata, $xml, false, $namespaces); |
|
|
|
|
|
|
|
// slap them
|
|
|
|
post_url($url,$salmon, array( |
|
|
|
post_url($url, $salmon, array( |
|
|
|
'Content-type: application/magic-envelope+xml', |
|
|
|
'Content-length: ' . strlen($salmon) |
|
|
|
)); |
|
|
@ -120,60 +121,59 @@ function slapper($owner,$url,$slap) { |
|
|
|
|
|
|
|
// check for success, e.g. 2xx
|
|
|
|
|
|
|
|
if($return_code > 299) { |
|
|
|
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( |
|
|
|
post_url($url, $salmon, array( |
|
|
|
'Content-type: application/magic-envelope+xml', |
|
|
|
'Content-length: ' . strlen($salmon) |
|
|
|
)); |
|
|
|
$return_code = $a->get_curl_code(); |
|
|
|
} |
|
|
|
|
|
|
|
if ($return_code > 299) { |
|
|
|
logger('compliant salmon failed. Falling back to old status.net'); |
|
|
|
|
|
|
|
if($return_code > 299) { |
|
|
|
|
|
|
|
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( |
|
|
|
'Content-type: application/magic-envelope+xml', |
|
|
|
'Content-length: ' . strlen($salmon) |
|
|
|
)); |
|
|
|
$return_code = $a->get_curl_code(); |
|
|
|
} |
|
|
|
// slap them
|
|
|
|
post_url($url, $salmon, array( |
|
|
|
'Content-type: application/magic-envelope+xml', |
|
|
|
'Content-length: ' . strlen($salmon) |
|
|
|
)); |
|
|
|
$return_code = $a->get_curl_code(); |
|
|
|
} |
|
|
|
|
|
|
|
logger('slapper for '.$url.' returned ' . $return_code); |
|
|
|
if(! $return_code) |
|
|
|
if (! $return_code) { |
|
|
|
return(-1); |
|
|
|
if(($return_code == 503) && (stristr($a->get_curl_headers(),'retry-after'))) |
|
|
|
} |
|
|
|
if (($return_code == 503) && (stristr($a->get_curl_headers(), 'retry-after'))) { |
|
|
|
return(-1); |
|
|
|
|
|
|
|
} |
|
|
|
return ((($return_code >= 200) && ($return_code < 300)) ? 0 : 1); |
|
|
|
} |
|
|
|
|