From 0398bb67be0acbbc6dc135c4c49519daf9777e0a Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 13 Jul 2015 08:06:51 +0200 Subject: [PATCH 1/5] Reworked salmon import --- include/ostatus.php | 33 ++++++++++++++++++++++++++++ mod/salmon.php | 53 +++++++++++++-------------------------------- 2 files changed, 48 insertions(+), 38 deletions(-) diff --git a/include/ostatus.php b/include/ostatus.php index 782541847..7b657577a 100644 --- a/include/ostatus.php +++ b/include/ostatus.php @@ -109,6 +109,34 @@ function ostatus_fetchauthor($xpath, $context, $importer, &$contact) { 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) { $a = get_app(); @@ -218,6 +246,11 @@ function ostatus_import($xml,$importer,&$contact, &$hub) { continue; } + if ($item["verb"] == NAMESPACE_OSTATUS."/unfollow") { + // ignore "Unfollow" messages + continue; + } + if ($item["verb"] == ACTIVITY_FAVORITE) { // ignore "Favorite" messages continue; diff --git a/mod/salmon.php b/mod/salmon.php index 11e42d943..f04a2e228 100644 --- a/mod/salmon.php +++ b/mod/salmon.php @@ -2,11 +2,11 @@ // 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/ostatus.php'); require_once('include/crypto.php'); -require_once('library/simplepie/simplepie.inc'); function salmon_return($val) { @@ -86,35 +86,8 @@ function salmon_post(&$a) { // 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 = get_markup_template('fake_feed.tpl'); - - $base = substr($data,strpos($data,''; - - 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; - } - } + $author = ostatus_salmon_author($data,$importer); + $author_link = $author["author-link"]; if(! $author_link) { 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. - $verify = rsa_verify($compliant_format,$signature,$pubkey); + $verify = rsa_verify($compliant_format,$signature,$pubkey); if(! $verify) { logger('mod-salmon: message did not verify using protocol. Trying padding hack.'); $verify = rsa_verify($signed_data,$signature,$pubkey); - } + } if(! $verify) { logger('mod-salmon: message did not verify using padding. Trying old statusnet hack.'); $verify = rsa_verify($stnet_signed_data,$signature,$pubkey); - } + } if(! $verify) { 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' ) - AND `uid` = %d LIMIT 1", + $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($author_link), + dbesc(normalise_link($author_link)), intval($importer['uid']) ); if(! count($r)) { @@ -219,7 +195,8 @@ function salmon_post(&$a) { $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); } From 3457f8583307367f6308e938eca0c09720387133 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 13 Jul 2015 14:34:28 +0200 Subject: [PATCH 2/5] Salmon: Don't store contact data before the message was authenticated. --- include/ostatus.php | 14 ++++++++------ mod/salmon.php | 31 ++++++++----------------------- 2 files changed, 16 insertions(+), 29 deletions(-) diff --git a/include/ostatus.php b/include/ostatus.php index 7b657577a..901ae95f7 100644 --- a/include/ostatus.php +++ b/include/ostatus.php @@ -12,7 +12,7 @@ define('OSTATUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes define('OSTATUS_DEFAULT_POLL_TIMEFRAME', 1440); // given in minutes define('OSTATUS_DEFAULT_POLL_TIMEFRAME_MENTIONS', 14400); // given in minutes -function ostatus_fetchauthor($xpath, $context, $importer, &$contact) { +function ostatus_fetchauthor($xpath, $context, $importer, &$contact, $onlyfetch) { $author = array(); $author["author-link"] = $xpath->evaluate('atom:author/atom:uri/text()', $context)->item(0)->nodeValue; @@ -63,7 +63,7 @@ function ostatus_fetchauthor($xpath, $context, $importer, &$contact) { $author["owner-link"] = $author["author-link"]; $author["owner-avatar"] = $author["author-avatar"]; - if ($r) { + if ($r AND !$onlyfetch) { // Update contact data $update_contact = ($r[0]['name-date'] < datetime_convert('','','now -12 hours')); if ($update_contact) { @@ -132,7 +132,7 @@ function ostatus_salmon_author($xml, $importer) { foreach ($entries AS $entry) { // fetch the author - $author = ostatus_fetchauthor($xpath, $entry, $importer, $contact); + $author = ostatus_fetchauthor($xpath, $entry, $importer, $contact, true); return $author; } } @@ -201,9 +201,9 @@ function ostatus_import($xml,$importer,&$contact, &$hub) { // fetch the author if ($first_child == "feed") - $author = ostatus_fetchauthor($xpath, $doc->firstChild, $importer, $contact); + $author = ostatus_fetchauthor($xpath, $doc->firstChild, $importer, $contact, false); else - $author = ostatus_fetchauthor($xpath, $entry, $importer, $contact); + $author = ostatus_fetchauthor($xpath, $entry, $importer, $contact, false); $item = array_merge($header, $author); @@ -243,11 +243,13 @@ function ostatus_import($xml,$importer,&$contact, &$hub) { if ($item["verb"] == ACTIVITY_FOLLOW) { // ignore "Follow" messages + // new_follower($importer,$contact,$datarray,$item); continue; } if ($item["verb"] == NAMESPACE_OSTATUS."/unfollow") { // ignore "Unfollow" messages + // lose_follower($importer,$contact,$datarray,$item); continue; } @@ -399,7 +401,7 @@ function ostatus_import($xml,$importer,&$contact, &$hub) { $orig_created = $xpath->query('atom:published/text()', $activityobjects)->item(0)->nodeValue; $orig_contact = $contact; - $orig_author = ostatus_fetchauthor($xpath, $activityobjects, $importer, $orig_contact); + $orig_author = ostatus_fetchauthor($xpath, $activityobjects, $importer, $orig_contact, false); //if (!intval(get_config('system','wall-to-wall_share'))) { // $prefix = share_header($orig_author['author-name'], $orig_author['author-link'], $orig_author['author-avatar'], "", $orig_created, $orig_link); diff --git a/mod/salmon.php b/mod/salmon.php index f04a2e228..9c22e42d1 100644 --- a/mod/salmon.php +++ b/mod/salmon.php @@ -1,12 +1,10 @@ Date: Mon, 13 Jul 2015 23:50:33 +0200 Subject: [PATCH 3/5] Follow/Unfollow now works from OStatus. --- include/items.php | 9 ++++++--- include/ostatus.php | 12 ++++++++---- mod/wall_upload.php | 1 + 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/include/items.php b/include/items.php index 45d25e379..cba1ae236 100644 --- a/include/items.php +++ b/include/items.php @@ -4159,9 +4159,12 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) { $name = notags(trim($datarray['author-name'])); $photo = notags(trim($datarray['author-avatar'])); - $rawtag = $item->get_item_tags(NAMESPACE_ACTIVITY,'actor'); - if($rawtag && $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data']) - $nick = $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data']; + if (is_object($item)) { + $rawtag = $item->get_item_tags(NAMESPACE_ACTIVITY,'actor'); + if($rawtag && $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data']) + $nick = $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data']; + } else + $nick = $item; if(is_array($contact)) { if(($contact['network'] == NETWORK_OSTATUS && $contact['rel'] == CONTACT_IS_SHARING) diff --git a/include/ostatus.php b/include/ostatus.php index 901ae95f7..53887d535 100644 --- a/include/ostatus.php +++ b/include/ostatus.php @@ -205,6 +205,12 @@ function ostatus_import($xml,$importer,&$contact, &$hub) { else $author = ostatus_fetchauthor($xpath, $entry, $importer, $contact, false); + $value = $xpath->evaluate('atom:author/poco:preferredUsername/text()', $context)->item(0)->nodeValue; + if ($value != "") + $nickname = $value; + else + $nickname = $author["author-name"]; + $item = array_merge($header, $author); // Now get the item @@ -242,14 +248,12 @@ function ostatus_import($xml,$importer,&$contact, &$hub) { } if ($item["verb"] == ACTIVITY_FOLLOW) { - // ignore "Follow" messages - // new_follower($importer,$contact,$datarray,$item); + new_follower($importer, $contact, $item, $nickname); continue; } if ($item["verb"] == NAMESPACE_OSTATUS."/unfollow") { - // ignore "Unfollow" messages - // lose_follower($importer,$contact,$datarray,$item); + lose_follower($importer, $contact, $item, $dummy); continue; } diff --git a/mod/wall_upload.php b/mod/wall_upload.php index 44cfa0156..9abc1dd9f 100644 --- a/mod/wall_upload.php +++ b/mod/wall_upload.php @@ -119,6 +119,7 @@ function wall_upload_post(&$a, $desktopmode = true) { $maximagesize = get_config('system','maximagesize'); if(($maximagesize) && ($filesize > $maximagesize)) { + logger("Image exceeds size limit of ".$maximagesize); echo sprintf( t('Image exceeds size limit of %s'), formatBytes($maximagesize)) . EOL; @unlink($src); killme(); From 9ebaa45670bd6835d5c4de843530b4b0da84e028 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 13 Jul 2015 23:56:45 +0200 Subject: [PATCH 4/5] Removed unused template --- view/templates/fake_feed.tpl | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 view/templates/fake_feed.tpl diff --git a/view/templates/fake_feed.tpl b/view/templates/fake_feed.tpl deleted file mode 100644 index c4c45bf4d..000000000 --- a/view/templates/fake_feed.tpl +++ /dev/null @@ -1,14 +0,0 @@ - - - - - fake feed - fake title - - 1970-01-01T00:00:00Z - - - Fake Name - http://example.com - - From 0de192611319b891763ddbe484f82f1ccfaa5a3b Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Tue, 14 Jul 2015 08:52:54 +0200 Subject: [PATCH 5/5] removed logger entry --- mod/wall_upload.php | 1 - 1 file changed, 1 deletion(-) diff --git a/mod/wall_upload.php b/mod/wall_upload.php index 9abc1dd9f..44cfa0156 100644 --- a/mod/wall_upload.php +++ b/mod/wall_upload.php @@ -119,7 +119,6 @@ function wall_upload_post(&$a, $desktopmode = true) { $maximagesize = get_config('system','maximagesize'); if(($maximagesize) && ($filesize > $maximagesize)) { - logger("Image exceeds size limit of ".$maximagesize); echo sprintf( t('Image exceeds size limit of %s'), formatBytes($maximagesize)) . EOL; @unlink($src); killme();