<?php
-require_once('library/asn1.php');
+require_once('include/crypto.php');
-function salmon_key($pubkey) {
- $lines = explode("\n",$pubkey);
- unset($lines[0]);
- unset($lines[count($lines)]);
- $x = base64_decode(implode('',$lines));
- $r = ASN_BASE::parseASNString($x);
-
- $m = $r[0]->asnData[1]->asnData[0]->asnData[0]->asnData;
- $e = $r[0]->asnData[1]->asnData[0]->asnData[1]->asnData;
-
-
- return 'RSA' . '.' . $m . '.' . $e ;
-}
-
-
-function base64url_encode($s) {
- return strtr(base64_encode($s),'+/','-_');
-}
-
-function base64url_decode($s) {
- return base64_decode(strtr($s,'-_','+/'));
-}
function get_salmon_key($uri,$keyhash) {
$ret = array();
- $debugging = get_config('system','debugging');
- if($debugging)
- file_put_contents('salmon.out', "\n" . 'Fetch key' . "\n", FILE_APPEND);
+ logger('Fetching salmon key for '.$uri);
$arr = lrdd($uri);
}
}
- if($debugging)
- file_put_contents('salmon.out', "\n" . 'Key located: ' . print_r($ret,true) . "\n", FILE_APPEND);
+
+ logger('Key located: ' . print_r($ret,true));
if(count($ret) == 1) {
// We only found one 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
+ // 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.
+ // have one key we'll be right.
return $ret[0];
}
return '';
}
-
-
-function slapper($owner,$contact,$slap) {
- // does contact have a salmon endpoint?
+function slapper($owner,$url,$slap) {
+
+ // does contact have a salmon endpoint?
- if(! strlen($contact['notify']))
+ if(! strlen($url))
return;
+
+ if(! $owner['sprvkey']) {
+ logger(sprintf("user '%s' (%d) does not have a salmon private key. Send failed.",
+ $owner['username'],$owner['uid']));
+ return;
+ }
+
// add all namespaces to item
$namespaces = <<< EOT
xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0"
xmlns:as="http://activitystrea.ms/spec/1.0/"
xmlns:georss="http://www.georss.org/georss"
- xmlns:poco="http://portablecontacts.net/spec/1.0" >
+ xmlns:poco="http://portablecontacts.net/spec/1.0"
+ xmlns:ostatus="http://ostatus.org/schema/1.0"
+ xmlns:statusnet="http://status.net/schema/api/1/" > >
EOT;
$slap = str_replace('<entry>',$namespaces,$slap);
-
+
+ logger('slapper called for '.$url.'. Data: ' . $slap);
+
// create a magic envelope
$data = base64url_encode($slap);
$data_type = 'application/atom+xml';
$encoding = 'base64url';
$algorithm = 'RSA-SHA256';
- $keyhash = base64url_encode(hash('sha256',salmon_key($owner['spubkey'])));
+ $keyhash = base64url_encode(hash('sha256',salmon_key($owner['spubkey'])),true);
+
+ // precomputed base64url encoding of data_type, encoding, algorithm concatenated with periods
- // Setup RSA stuff to PKCS#1 sign the data
+ $precomputed = '.YXBwbGljYXRpb24vYXRvbSt4bWw=.YmFzZTY0dXJs.UlNBLVNIQTI1Ng==';
- set_include_path(get_include_path() . PATH_SEPARATOR . 'phpsec');
+ $signature = base64url_encode(rsa_sign(str_replace('=','',$data . $precomputed),$owner['sprvkey']));
- require_once('phpsec/Crypt/RSA.php');
+ $signature2 = base64url_encode(rsa_sign($data . $precomputed,$owner['sprvkey']));
- $rsa = new CRYPT_RSA();
- $rsa->signatureMode = CRYPT_RSA_SIGNATURE_PKCS1;
- $rsa->setHash('sha256');
- $rsa->loadKey($owner['sprvkey']);
+ $signature3 = base64url_encode(rsa_sign($data,$owner['sprvkey']));
- $signature = base64url_encode($rsa->sign($data));
+ $salmon_tpl = get_markup_template('magicsig.tpl');
- $salmon_tpl = load_view_file('view/magicsig.tpl');
$salmon = replace_macros($salmon_tpl,array(
'$data' => $data,
'$encoding' => $encoding,
'$signature' => $signature
));
- // slap them
- post_url($contact['notify'],$salmon, array(
+ // slap them
+ post_url($url,$salmon, array(
'Content-type: application/magic-envelope+xml',
'Content-length: ' . strlen($salmon)
));
$a = get_app();
- echo "CURL returned: " . $a->get_curl_code() . "\n";
-
- return;
-}
\ No newline at end of file
+ $return_code = $a->get_curl_code();
+
+ // check for success, e.g. 2xx
+
+ if($return_code > 299) {
+
+ logger('compliant salmon failed. Falling back to status.net hack2');
+
+ // Entirely likely that their salmon implementation is
+ // non-compliant. Let's try once more, this time only signing
+ // the data, without stripping '=' chars
+
+ $salmon = replace_macros($salmon_tpl,array(
+ '$data' => $data,
+ '$encoding' => $encoding,
+ '$algorithm' => $algorithm,
+ '$keyhash' => $keyhash,
+ '$signature' => $signature2
+ ));
+
+ // slap them
+ 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 status.net hack3');
+
+ // Entirely likely that their salmon implementation is
+ // non-compliant. Let's try once more, this time only signing
+ // the data, without the precomputed blob
+
+ $salmon = replace_macros($salmon_tpl,array(
+ '$data' => $data,
+ '$encoding' => $encoding,
+ '$algorithm' => $algorithm,
+ '$keyhash' => $keyhash,
+ '$signature' => $signature3
+ ));
+
+ // 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)
+ return(-1);
+ if(($return_code == 503) && (stristr($a->get_curl_headers(),'retry-after')))
+ return(-1);
+
+ return ((($return_code >= 200) && ($return_code < 300)) ? 0 : 1);
+}
+
projects / friendica.git / blobdiff