X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsalmon.php;h=3c62a6d8c556bb6eff1676e8987ad601fd69b567;hb=1b14c1733ba9fcd016eb7c8ed79a25633a5d08ae;hp=7ae29aafe2b00d3358b8aad5ed4d27a4c63e4919;hpb=5edee3c4d1f84c07c1c54775072601188075a542;p=friendica.git diff --git a/mod/salmon.php b/mod/salmon.php index 7ae29aafe2..3c62a6d8c5 100644 --- a/mod/salmon.php +++ b/mod/salmon.php @@ -1,7 +1,7 @@ = 500) + if($val >= 400) $err = 'Error'; - if($val == 200) + if($val >= 200 && $val < 300) $err = 'OK'; - + + logger('mod-salmon returns ' . $val); header($_SERVER["SERVER_PROTOCOL"] . ' ' . $val . ' ' . $err); killme(); @@ -25,10 +26,8 @@ function salmon_return($val) { function salmon_post(&$a) { $xml = file_get_contents('php://input'); - - $debugging = get_config('system','debugging'); - if($debugging) - file_put_contents('salmon.out','New Salmon: ' . $xml . "\n",FILE_APPEND); + + logger('mod-salmon: new salmon ' . $xml); $nick = (($a->argc > 1) ? notags(trim($a->argv[1])) : ''); $mentions = (($a->argc > 2 && $a->argv[2] === 'mention') ? true : false); @@ -45,10 +44,6 @@ function salmon_post(&$a) { $dom = simplexml_load_string($xml,'SimpleXMLElement',0,NAMESPACE_SALMON_ME); - - if($debugging) - file_put_contents('salmon.out', "\n" . print_r($dom,true) . "\n" , FILE_APPEND); - // figure out where in the DOM tree our data is hiding if($dom->provenance->data) @@ -59,33 +54,35 @@ function salmon_post(&$a) { $base = $dom; if(! $base) { - if($debugging) - file_put_contents('salmon.out', "\n" . 'Unable to find salmon data in XML' . "\n" , FILE_APPEND); - salmon_return(500); + logger('mod-salmon: unable to locate salmon data in xml '); + salmon_return(400); } // Stash the signature away for now. We have to find their key or it won't be good for anything. $signature = base64url_decode($base->sig); - if($debugging) - file_put_contents('salmon.out', "\n" . 'Encoded Signature: ' . $base->sig . "\n" , FILE_APPEND); - // unpack our data element. + // unpack the data - // strip whitespace + // strip whitespace so our data element will return to one big base64 blob $data = str_replace(array(" ","\t","\r","\n"),array("","","",""),$base->data); + + // stash away some other stuff for later + $type = $base->data[0]->attributes()->type[0]; + $keyhash = $base->sig[0]->attributes()->keyhash[0]; $encoding = $base->encoding; $alg = $base->alg; - $signed_data = $data; - // . '.' . base64url_encode($type) . '.' . base64url_encode($encoding) . '.' . base64url_encode($alg); - // decode it - $data = base64url_decode($data); + // If we're talking to status.net or one of their ilk, they aren't following the magic envelope spec + // and only signed the data element. We'll be nice and let them validate anyway. - if($debugging) - file_put_contents('salmon.out', "\n" . 'Signed data:>>>' . $signed_data . "<<<\n" , FILE_APPEND); + $stnet_signed_data = $data; + $signed_data = $data . '.' . base64url_encode($type) . '.' . base64url_encode($encoding) . '.' . base64url_encode($alg); + + // decode the data + $data = base64url_decode($data); // Remove the xml declaration $data = preg_replace('/\<\?xml[^\?].*\?\>/','',$data); @@ -98,9 +95,7 @@ function salmon_post(&$a) { $feedxml = $tpl . $base . ''; - if($debugging) { - file_put_contents('salmon.out', 'Processed feed: ' . $feedxml . "\n", FILE_APPEND); - } + logger('mod-salmon: Processed feed: ' . $feedxml); // Now parse it like a normal atom feed to scrape out the author URI @@ -109,10 +104,7 @@ function salmon_post(&$a) { $feed->enable_order_by_date(false); $feed->init(); - if($debugging) { - file_put_contents('salmon.out', "\n" . 'Feed parsed.' . "\n", FILE_APPEND); - } - + logger('mod-salmon: Feed parsed.'); if($feed->get_item_quantity()) { foreach($feed->get_items() as $item) { @@ -123,23 +115,20 @@ function salmon_post(&$a) { } if(! $author_link) { - if($debugging) - file_put_contents('salmon.out',"\n" . 'Could not retrieve author URI.' . "\n", FILE_APPEND); - salmon_return(500); + logger('mod-salmon: Could not retrieve author URI.'); + salmon_return(400); } - // Once we have the author URI, go to the web and find their public key + // Once we have the author URI, go to the web and try to find their public key + + logger('mod-salmon: Fetching key for ' . $author_link ); - if($debugging) { - file_put_contents('salmon.out', "\n" . 'Fetching key for ' . $author_link . "\n", FILE_APPEND); - } $key = get_salmon_key($author_link,$keyhash); if(! $key) { - if($debugging) - file_put_contents('salmon.out',"\n" . 'Could not retrieve author key.' . "\n", FILE_APPEND); - salmon_return(500); + logger('mod-salmon: Could not retrieve author key.'); + salmon_return(400); } // Setup RSA stuff to verify the signature @@ -152,8 +141,8 @@ function salmon_post(&$a) { $m = base64url_decode($key_info[1]); $e = base64url_decode($key_info[2]); - if($debugging) - file_put_contents('salmon.out',"\n" . print_r($key_info,true) . "\n", FILE_APPEND); + + logger('mod-salmon: key details: ' . print_r($key_info,true)); $rsa = new CRYPT_RSA(); $rsa->signatureMode = CRYPT_RSA_SIGNATURE_PKCS1; @@ -164,17 +153,22 @@ function salmon_post(&$a) { $rsa->exponent = new Math_BigInteger($e, 256); // We should have everything we need now. Let's see if it verifies. + // If it fails with the proper data format, try again using just the data + // (e.g. status.net) $verify = $rsa->verify($signed_data,$signature); if(! $verify) { - if($debugging) - file_put_contents('salmon.out',"\n" . 'Message did not verify. Discarding.' . "\n", FILE_APPEND); - salmon_return(500); + logger('mod-salmon: message did not verify using protocol. Trying statusnet hack.'); + $verify = $rsa->verify($stnet_signed_data,$signature); + } + + if(! $verify) { + logger('mod-salmon: Message did not verify. Discarding.'); + salmon_return(400); } - if($debugging) - file_put_contents('salmon.out',"\n" . 'Message verified.' . "\n", FILE_APPEND); + logger('mod-salmon: Message verified.'); /* @@ -183,22 +177,31 @@ function salmon_post(&$a) { * */ - $r = q("SELECT * FROM `contact` WHERE `network` = 'stat' AND `lrdd` = '%s' AND `uid` = %d LIMIT 1", + $r = q("SELECT * FROM `contact` WHERE `network` = 'stat' AND ( `url` = '%s' OR `lrdd` = '%s') + AND `uid` = %d LIMIT 1", + dbesc($author_link), dbesc($author_link), intval($importer['uid']) ); if(! count($r)) { - if($debugging) - file_put_contents('salmon.out',"\n" . 'Author unknown to us.' . "\n", FILE_APPEND); - salmon_return(500); + logger('mod-salmon: Author unknown to us.'); } - + if((count($r)) && ($r[0]['readonly'])) { + logger('mod-salmon: Ignoring this author.'); + salmon_return(202); + // NOTREACHED + } require_once('include/items.php'); + // Placeholder for hub discovery. We shouldn't find any hubs + // since we supplied the fake feed header - and it doesn't have any. + $hub = ''; - consume_feed($feedxml,$importer,$r[0],$hub); + // consume_feed will only accept a follow activity from this person if there is no contact record. + + consume_feed($feedxml,$importer,((count($r)) ? $r[0] : null),$hub); salmon_return(200); }