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

Reworked salmon import

This commit is contained in:
Michael Vogel 2015-07-13 08:06:51 +02:00
parent 2c488863b8
commit 0398bb67be
2 changed files with 48 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
include/ostatus.php
View File

@ -109,6 +109,34 @@ function ostatus_fetchauthor($xpath, $context, $importer, &$contact) {
return($author); return($author);
} }
function ostatus_salmon_author($xml, $importer) {
$a = get_app();
if ($xml == "")
return;
$doc = new DOMDocument();
@$doc->loadXML($xml);
$xpath = new DomXPath($doc);
$xpath->registerNamespace('atom', "http://www.w3.org/2005/Atom");
$xpath->registerNamespace('thr', "http://purl.org/syndication/thread/1.0");
$xpath->registerNamespace('georss', "http://www.georss.org/georss");
$xpath->registerNamespace('activity', "http://activitystrea.ms/spec/1.0/");
$xpath->registerNamespace('media', "http://purl.org/syndication/atommedia");
$xpath->registerNamespace('poco', "http://portablecontacts.net/spec/1.0");
$xpath->registerNamespace('ostatus', "http://ostatus.org/schema/1.0");
$xpath->registerNamespace('statusnet', "http://status.net/schema/api/1/");
$entries = $xpath->query('/atom:entry');
foreach ($entries AS $entry) {
// fetch the author
$author = ostatus_fetchauthor($xpath, $entry, $importer, $contact);
return $author;
}
}
function ostatus_import($xml,$importer,&$contact, &$hub) { function ostatus_import($xml,$importer,&$contact, &$hub) {
$a = get_app(); $a = get_app();
@ -218,6 +246,11 @@ function ostatus_import($xml,$importer,&$contact, &$hub) {
continue; continue;
} }
if ($item["verb"] == NAMESPACE_OSTATUS."/unfollow") {
// ignore "Unfollow" messages
continue;
}
if ($item["verb"] == ACTIVITY_FAVORITE) { if ($item["verb"] == ACTIVITY_FAVORITE) {
// ignore "Favorite" messages // ignore "Favorite" messages
continue; continue;

53
mod/salmon.php
View File

@ -2,11 +2,11 @@
// There is a lot of debug stuff in here because this is quite a // There is a lot of debug stuff in here because this is quite a
// complicated process to try and sort out. // complicated process to try and sort out.
require_once('include/salmon.php'); require_once('include/salmon.php');
require_once('include/ostatus.php');
require_once('include/crypto.php'); require_once('include/crypto.php');
require_once('library/simplepie/simplepie.inc');
function salmon_return($val) { function salmon_return($val) {
@ -86,35 +86,8 @@ function salmon_post(&$a) {
// decode the data // decode the data
$data = base64url_decode($data); $data = base64url_decode($data);
// Remove the xml declaration $author = ostatus_salmon_author($data,$importer);
$data = preg_replace('/\<\?xml[^\?].*\?\>/','',$data); $author_link = $author["author-link"];
// Create a fake feed wrapper so simplepie doesn't choke
$tpl = get_markup_template('fake_feed.tpl');
$base = substr($data,strpos($data,'<entry'));
$feedxml = $tpl . $base . '</feed>';
logger('mod-salmon: Processed feed: ' . $feedxml);
// 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();
logger('mod-salmon: Feed parsed.');
if($feed->get_item_quantity()) {
foreach($feed->get_items() as $item) {
$author = $item->get_author();
$author_link = unxmlify($author->get_link());
break;
}
}
if(! $author_link) { if(! $author_link) {
logger('mod-salmon: Could not retrieve author URI.'); logger('mod-salmon: Could not retrieve author URI.');
@ -144,17 +117,17 @@ function salmon_post(&$a) {
// We should have everything we need now. Let's see if it verifies. // We should have everything we need now. Let's see if it verifies.
$verify = rsa_verify($compliant_format,$signature,$pubkey); $verify = rsa_verify($compliant_format,$signature,$pubkey);
if(! $verify) { if(! $verify) {
logger('mod-salmon: message did not verify using protocol. Trying padding hack.'); logger('mod-salmon: message did not verify using protocol. Trying padding hack.');
$verify = rsa_verify($signed_data,$signature,$pubkey); $verify = rsa_verify($signed_data,$signature,$pubkey);
} }
if(! $verify) { 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 hack.');
$verify = rsa_verify($stnet_signed_data,$signature,$pubkey); $verify = rsa_verify($stnet_signed_data,$signature,$pubkey);
} }
if(! $verify) { if(! $verify) {
logger('mod-salmon: Message did not verify. Discarding.'); logger('mod-salmon: Message did not verify. Discarding.');
@ -170,11 +143,14 @@ function salmon_post(&$a) {
* *
*/ */
$r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s' ) $r = q("SELECT * FROM `contact` WHERE `network` IN ('%s', '%s')
AND `uid` = %d LIMIT 1", AND (`nurl` = '%s' OR `alias` = '%s' OR `alias` = '%s')
AND `uid` = %d LIMIT 1",
dbesc(NETWORK_OSTATUS), dbesc(NETWORK_OSTATUS),
dbesc(NETWORK_DFRN),
dbesc(normalise_link($author_link)),
dbesc($author_link), dbesc($author_link),
dbesc($author_link), dbesc(normalise_link($author_link)),
intval($importer['uid']) intval($importer['uid'])
); );
if(! count($r)) { if(! count($r)) {
@ -219,7 +195,8 @@ function salmon_post(&$a) {
$contact_rec = ((count($r)) ? $r[0] : null); $contact_rec = ((count($r)) ? $r[0] : null);
consume_feed($feedxml,$importer,$contact_rec,$hub); //consume_feed($feedxml,$importer,$contact_rec,$hub);
ostatus_import($data,$importer,$contact_rec, $hub);
http_status_exit(200); http_status_exit(200);
} }