<?php
-
-// TODO:
-// add relevant contacts so they can use this
-
-// There is a lot of debug stuff in here because this is quite a
-// complicated process to try and sort out.
-
require_once('include/salmon.php');
-require_once('simplepie/simplepie.inc');
+require_once('include/ostatus.php');
+require_once('include/crypto.php');
+require_once('include/items.php');
+require_once('include/follow.php');
function salmon_return($val) {
- if($val >= 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();
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, LOGGER_DATA);
$nick = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
$mentions = (($a->argc > 2 && $a->argv[2] === 'mention') ? true : false);
- $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1",
+ $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
dbesc($nick)
);
if(! count($r))
- salmon_return(500);
+ http_status_exit(500);
$importer = $r[0];
$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)
$base = $dom->env;
elseif($dom->data)
$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 ');
+ http_status_exit(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 the data
// strip whitespace so our data element will return to one big base64 blob
$encoding = $base->encoding;
$alg = $base->alg;
- // 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.
+ // Salmon magic signatures have evolved and there is no way of knowing ahead of time which
+ // flavour we have. We'll try and verify it regardless.
$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);
- // Create a fake feed wrapper so simplepie doesn't choke
-
- $tpl = load_view_file('view/fake_feed.tpl');
-
- $base = substr($data,strpos($data,'<entry'));
+ $signed_data = $data . '.' . base64url_encode($type) . '.' . base64url_encode($encoding) . '.' . base64url_encode($alg);
- $feedxml = $tpl . $base . '</feed>';
+ $compliant_format = str_replace('=','',$signed_data);
- if($debugging) {
- file_put_contents('salmon.out', 'Processed feed: ' . $feedxml . "\n", FILE_APPEND);
- }
- // Now parse it like a normal atom feed to scrape out the author URI
-
- $feed = new SimplePie();
- $feed->set_raw_data($feedxml);
- $feed->enable_order_by_date(false);
- $feed->init();
-
- if($debugging) {
- file_put_contents('salmon.out', "\n" . 'Feed parsed.' . "\n", FILE_APPEND);
- }
+ // decode the data
+ $data = base64url_decode($data);
-
- if($feed->get_item_quantity()) {
- foreach($feed->get_items() as $item) {
- $author = $item->get_author();
- $author_link = unxmlify($author->get_link());
- break;
- }
- }
+ $author = ostatus_salmon_author($data,$importer);
+ $author_link = $author["author-link"];
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.');
+ http_status_exit(400);
}
// Once we have the author URI, go to the web and try to find their public key
- if($debugging) {
- file_put_contents('salmon.out', "\n" . 'Fetching key for ' . $author_link . "\n", FILE_APPEND);
- }
+ logger('mod-salmon: Fetching key for ' . $author_link);
$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.');
+ http_status_exit(400);
}
- // Setup RSA stuff to verify the signature
-
- set_include_path(get_include_path() . PATH_SEPARATOR . 'phpsec');
-
- require_once('phpsec/Crypt/RSA.php');
-
$key_info = explode('.',$key);
$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), LOGGER_DEBUG);
- $rsa = new CRYPT_RSA();
- $rsa->signatureMode = CRYPT_RSA_SIGNATURE_PKCS1;
- $rsa->setHash('sha256');
-
- $rsa->modulus = new Math_BigInteger($m, 256);
- $rsa->k = strlen($rsa->modulus->toBytes());
- $rsa->exponent = new Math_BigInteger($e, 256);
+ $pubkey = metopem($m,$e);
// 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);
+ $verify = rsa_verify($compliant_format,$signature,$pubkey);
- if(! $verify)
- $verify = $rsa->verify($stnet_signed_data,$signature);
+ if(! $verify) {
+ logger('mod-salmon: message did not verify using protocol. Trying padding hack.');
+ $verify = rsa_verify($signed_data,$signature,$pubkey);
+ }
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 padding. Trying old statusnet hack.');
+ $verify = rsa_verify($stnet_signed_data,$signature,$pubkey);
}
- if($debugging)
- file_put_contents('salmon.out',"\n" . 'Message verified.' . "\n", FILE_APPEND);
+ if(! $verify) {
+ logger('mod-salmon: Message did not verify. Discarding.');
+ http_status_exit(400);
+ }
+
+ logger('mod-salmon: Message verified.');
/*
*
*/
- $r = q("SELECT * FROM `contact` WHERE `network` = 'stat' AND ( `url` = '%s' OR `lrdd` = '%s') AND `uid` = %d
- AND `readonly` = 0 LIMIT 1",
- dbesc($author_link),
+ $r = q("SELECT * FROM `contact` WHERE `network` IN ('%s', '%s')
+ AND (`nurl` = '%s' OR `alias` = '%s' OR `alias` = '%s')
+ AND `uid` = %d LIMIT 1",
+ dbesc(NETWORK_OSTATUS),
+ dbesc(NETWORK_DFRN),
+ dbesc(normalise_link($author_link)),
dbesc($author_link),
+ dbesc(normalise_link($author_link)),
intval($importer['uid'])
);
if(! count($r)) {
- if($debugging)
- file_put_contents('salmon.out',"\n" . 'Author unknown to us.' . "\n", FILE_APPEND);
-
- }
+ logger('mod-salmon: Author unknown to us.');
+ if(get_pconfig($importer['uid'],'system','ostatus_autofriend')) {
+ $result = new_contact($importer['uid'],$author_link);
+ if($result['success']) {
+ $r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s')
+ AND `uid` = %d LIMIT 1",
+ dbesc(NETWORK_OSTATUS),
+ dbesc($author_link),
+ dbesc($author_link),
+ intval($importer['uid'])
+ );
+ }
+ }
+ }
- require_once('include/items.php');
+ // Have we ignored the person?
+ // If so we can not accept this post.
- // Placeholder for hub discovery. We shouldn't find any hubs
- // since we supplied the fake feed header - and it doesn't have any.
+ //if((count($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) {
+ if(count($r) && $r[0]['blocked']) {
+ logger('mod-salmon: Ignoring this author.');
+ http_status_exit(202);
+ // NOTREACHED
+ }
+ // Placeholder for hub discovery.
$hub = '';
- // consume_feed will only accept a follow activity from this person if there is no contact record.
+ $contact_rec = ((count($r)) ? $r[0] : null);
- consume_feed($feedxml,$importer,((count($r)) ? $r[0] : null),$hub);
+ ostatus_import($data,$importer,$contact_rec, $hub);
- salmon_return(200);
+ http_status_exit(200);
}
-
-
-
-
projects / friendica.git / blobdiff