From ffa1931c9dafea385e8f30c53ea079e2425a0786 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 3 Mar 2010 09:31:14 -0800
Subject: Avoid warning/notice spew in XRD parser. Not all DOM nodes are
 elements.

---
 plugins/OStatus/lib/xrd.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'plugins/OStatus/lib')

diff --git a/plugins/OStatus/lib/xrd.php b/plugins/OStatus/lib/xrd.php
index 85df26c54..f00e1f809 100644
--- a/plugins/OStatus/lib/xrd.php
+++ b/plugins/OStatus/lib/xrd.php
@@ -149,9 +149,11 @@ class XRD
         $link['href'] = $element->getAttribute('href');
         $link['template'] = $element->getAttribute('template');
         foreach ($element->childNodes as $node) {
-            switch($node->tagName) {
-            case 'Title':
-                $link['title'][] = $node->nodeValue;
+            if ($node instanceof DOMElement) {
+                switch($node->tagName) {
+                case 'Title':
+                    $link['title'][] = $node->nodeValue;
+                }
             }
         }
 
-- 
cgit v1.2.3-54-g00ecf


From 9fadf8da1164d620284917b829329e195aa2a226 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 3 Mar 2010 12:51:23 -0800
Subject: Put all required field setup into AtomUserNoticeFeed and
 AtomGroupNoticeFeed, consolidating some code. (RSS feeds pulling title, logo
 etc from the Atom data structure so we don't dupe it.) OStatus now calling
 the feed classes directly instead of faking a call into the API, should be
 less flakey.

---
 actions/apitimelinegroup.php                | 45 ++++++-------------------
 actions/apitimelineuser.php                 | 51 ++++++-----------------------
 lib/atom10feed.php                          | 20 +++++++++--
 lib/atomgroupnoticefeed.php                 | 32 ++++++++++++++++--
 lib/atomusernoticefeed.php                  | 41 +++++++++++++++++++++--
 plugins/OStatus/lib/ostatusqueuehandler.php | 45 ++++++-------------------
 6 files changed, 116 insertions(+), 118 deletions(-)

(limited to 'plugins/OStatus/lib')

diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index e30a08fb5..8f971392b 100644
--- a/actions/apitimelinegroup.php
+++ b/actions/apitimelinegroup.php
@@ -104,30 +104,21 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
 
     function showTimeline()
     {
-        $sitename   = common_config('site', 'name');
-        $avatar     = $this->group->homepage_logo;
-        $title      = sprintf(_("%s timeline"), $this->group->nickname);
-
-        $subtitle   = sprintf(
-            _('Updates from %1$s on %2$s!'),
-            $this->group->nickname,
-            $sitename
-        );
-
-        $logo = ($avatar) ? $avatar : User_group::defaultLogo(AVATAR_PROFILE_SIZE);
+        // We'll pull common formatting out of this for other formats
+        $atom = new AtomGroupNoticeFeed($this->group);
 
         switch($this->format) {
         case 'xml':
             $this->showXmlTimeline($this->notices);
             break;
         case 'rss':
-                $this->showRssTimeline(
+            $this->showRssTimeline(
                 $this->notices,
-                $title,
+                $atom->title,
                 $this->group->homeUrl(),
-                $subtitle,
+                $atom->subtitle,
                 null,
-                $logo
+                $atom->logo
             );
             break;
         case 'atom':
@@ -136,38 +127,22 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
 
             try {
 
-                $atom = new AtomGroupNoticeFeed($this->group);
-
-                // @todo set all this Atom junk up inside the feed class
-
-                #$atom->setId($id);
-                $atom->setTitle($title);
-                $atom->setSubtitle($subtitle);
-                $atom->setLogo($logo);
-                $atom->setUpdated('now');
-
                 $atom->addAuthorRaw($this->group->asAtomAuthor());
                 $atom->setActivitySubject($this->group->asActivitySubject());
 
-                $atom->addLink($this->group->homeUrl());
-
                 $id = $this->arg('id');
                 $aargs = array('format' => 'atom');
                 if (!empty($id)) {
                     $aargs['id'] = $id;
                 }
+                $self = $this->getSelfUri('ApiTimelineGroup', $aargs);
 
-                $atom->setId($this->getSelfUri('ApiTimelineGroup', $aargs));
-
-                $atom->addLink(
-                    $this->getSelfUri('ApiTimelineGroup', $aargs),
-                    array('rel' => 'self', 'type' => 'application/atom+xml')
-                );
+                $atom->setId($self);
+                $atom->setSelfLink($self);
 
                 $atom->addEntryFromNotices($this->notices);
 
-                //$this->raw($atom->getString());
-                print $atom->getString(); // temp hack until PuSH feeds are redone cleanly
+                $this->raw($atom->getString());
 
             } catch (Atom10FeedException $e) {
                 $this->serverError(
diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php
index 94491946c..2d0047c04 100644
--- a/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@ -112,19 +112,17 @@ class ApiTimelineUserAction extends ApiBareAuthAction
     function showTimeline()
     {
         $profile = $this->user->getProfile();
-        $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
 
-        $sitename   = common_config('site', 'name');
-        $title      = sprintf(_("%s timeline"), $this->user->nickname);
+        // We'll use the shared params from the Atom stub
+        // for other feed types.
+        $atom = new AtomUserNoticeFeed($this->user);
+        $title      = $atom->title;
         $link       = common_local_url(
             'showstream',
             array('nickname' => $this->user->nickname)
         );
-        $subtitle   = sprintf(
-            _('Updates from %1$s on %2$s!'),
-            $this->user->nickname, $sitename
-        );
-        $logo = ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE);
+        $subtitle = $atom->subtitle;
+        $logo = $atom->logo;
 
         // FriendFeed's SUP protocol
         // Also added RSS and Atom feeds
@@ -146,47 +144,18 @@ class ApiTimelineUserAction extends ApiBareAuthAction
 
             header('Content-Type: application/atom+xml; charset=utf-8');
 
-            // @todo set all this Atom junk up inside the feed class
-
-            $atom = new AtomUserNoticeFeed($this->user);
-
-            $atom->setTitle($title);
-            $atom->setSubtitle($subtitle);
-            $atom->setLogo($logo);
-            $atom->setUpdated('now');
-
-            $atom->addLink(
-                common_local_url(
-                    'showstream',
-                    array('nickname' => $this->user->nickname)
-                )
-            );
-
             $id = $this->arg('id');
             $aargs = array('format' => 'atom');
             if (!empty($id)) {
                 $aargs['id'] = $id;
             }
-
-            $atom->setId($this->getSelfUri('ApiTimelineUser', $aargs));
-
-            $atom->addLink(
-                $this->getSelfUri('ApiTimelineUser', $aargs),
-                array('rel' => 'self', 'type' => 'application/atom+xml')
-            );
-
-            $atom->addLink(
-                $suplink,
-                array(
-                    'rel' => 'http://api.friendfeed.com/2008/03#sup',
-                    'type' => 'application/json'
-                )
-            );
+            $self = $this->getSelfUri('ApiTimelineUser', $aargs);
+            $atom->setId($self);
+            $atom->setSelfLink($self);
 
             $atom->addEntryFromNotices($this->notices);
 
-            #$this->raw($atom->getString());
-            print $atom->getString(); // temporary for output buffering
+            $this->raw($atom->getString());
 
             break;
         case 'json':
diff --git a/lib/atom10feed.php b/lib/atom10feed.php
index 8842840d5..c1fdeaae9 100644
--- a/lib/atom10feed.php
+++ b/lib/atom10feed.php
@@ -49,6 +49,8 @@ class Atom10FeedException extends Exception
 class Atom10Feed extends XMLStringer
 {
     public  $xw;
+
+    // @fixme most of these should probably be read-only properties
     private $namespaces;
     private $authors;
     private $subject;
@@ -57,10 +59,12 @@ class Atom10Feed extends XMLStringer
     private $generator;
     private $icon;
     private $links;
-    private $logo;
+    private $selfLink;
+    private $selfLinkType;
+    public $logo;
     private $rights;
-    private $subtitle;
-    private $title;
+    public $subtitle;
+    public $title;
     private $published;
     private $updated;
     private $entries;
@@ -184,6 +188,10 @@ class Atom10Feed extends XMLStringer
 
         $this->renderAuthors();
 
+        if ($this->selfLink) {
+            $this->addLink($this->selfLink, array('rel' => 'self',
+                                                  'type' => $this->selfLinkType));
+        }
         $this->renderLinks();
     }
 
@@ -253,6 +261,12 @@ class Atom10Feed extends XMLStringer
         $this->id = $id;
     }
 
+    function setSelfLink($url, $type='application/atom+xml')
+    {
+        $this->selfLink = $url;
+        $this->selfLinkType = $type;
+    }
+
     function setTitle($title)
     {
         $this->title = $title;
diff --git a/lib/atomgroupnoticefeed.php b/lib/atomgroupnoticefeed.php
index 52ee4c7d6..08c1c707c 100644
--- a/lib/atomgroupnoticefeed.php
+++ b/lib/atomgroupnoticefeed.php
@@ -49,14 +49,42 @@ class AtomGroupNoticeFeed extends AtomNoticeFeed
     /**
      * Constructor
      *
-     * @param Group   $group   the group for the feed (optional)
+     * @param Group   $group   the group for the feed
      * @param boolean $indent  flag to turn indenting on or off
      *
      * @return void
      */
-    function __construct($group = null, $indent = true) {
+    function __construct($group, $indent = true) {
         parent::__construct($indent);
         $this->group = $group;
+
+        $title      = sprintf(_("%s timeline"), $group->nickname);
+        $this->setTitle($title);
+
+        $sitename   = common_config('site', 'name');
+        $subtitle   = sprintf(
+            _('Updates from %1$s on %2$s!'),
+            $group->nickname,
+            $sitename
+        );
+        $this->setSubtitle($subtitle);
+
+        $avatar = $group->homepage_logo;
+        $logo = ($avatar) ? $avatar : User_group::defaultLogo(AVATAR_PROFILE_SIZE);
+        $this->setLogo($logo);
+
+        $this->setUpdated('now');
+
+        $self = common_local_url('ApiTimelineGroup',
+                                 array('id' => $group->id,
+                                       'format' => 'atom'));
+        $this->setId($self);
+        $this->setSelfLink($self);
+
+        $this->addAuthorRaw($group->asAtomAuthor());
+        $this->setActivitySubject($group->asActivitySubject());
+
+        $this->addLink($group->homeUrl());
     }
 
     function getGroup()
diff --git a/lib/atomusernoticefeed.php b/lib/atomusernoticefeed.php
index 2ad8de455..55cebef6d 100644
--- a/lib/atomusernoticefeed.php
+++ b/lib/atomusernoticefeed.php
@@ -49,19 +49,56 @@ class AtomUserNoticeFeed extends AtomNoticeFeed
     /**
      * Constructor
      *
-     * @param User    $user    the user for the feed (optional)
+     * @param User    $user    the user for the feed
      * @param boolean $indent  flag to turn indenting on or off
      *
      * @return void
      */
 
-    function __construct($user = null, $indent = true) {
+    function __construct($user, $indent = true) {
         parent::__construct($indent);
         $this->user = $user;
         if (!empty($user)) {
             $profile = $user->getProfile();
             $this->addAuthor($profile->nickname, $user->uri);
         }
+
+        $title      = sprintf(_("%s timeline"), $user->nickname);
+        $this->setTitle($title);
+
+        $sitename   = common_config('site', 'name');
+        $subtitle   = sprintf(
+            _('Updates from %1$s on %2$s!'),
+            $user->nickname, $sitename
+        );
+        $this->setSubtitle($subtitle);
+
+        $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
+        $logo = ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE);
+        $this->setLogo($logo);
+
+        $this->setUpdated('now');
+
+        $this->addLink(
+            common_local_url(
+                'showstream',
+                array('nickname' => $user->nickname)
+            )
+        );
+        
+        $self = common_local_url('ApiTimelineUser',
+                                 array('id' => $user->id,
+                                       'format' => 'atom'));
+        $this->setId($self);
+        $this->setSelfLink($self);
+
+        $this->addLink(
+            common_local_url('sup', null, null, $user->id),
+            array(
+                'rel' => 'http://api.friendfeed.com/2008/03#sup',
+                'type' => 'application/json'
+            )
+        );
     }
 
     function getUser()
diff --git a/plugins/OStatus/lib/ostatusqueuehandler.php b/plugins/OStatus/lib/ostatusqueuehandler.php
index 6ca31c485..d1e58f1d6 100644
--- a/plugins/OStatus/lib/ostatusqueuehandler.php
+++ b/plugins/OStatus/lib/ostatusqueuehandler.php
@@ -164,46 +164,21 @@ class OStatusQueueHandler extends QueueHandler
      */
     function userFeedForNotice()
     {
-        // @fixme this feels VERY hacky...
-        // should probably be a cleaner way to do it
-
-        ob_start();
-        $api = new ApiTimelineUserAction();
-        $api->prepare(array('id' => $this->notice->profile_id,
-                            'format' => 'atom',
-                            'max_id' => $this->notice->id,
-                            'since_id' => $this->notice->id - 1));
-        $api->showTimeline();
-        $feed = ob_get_clean();
-        
-        // ...and override the content-type back to something normal... eww!
-        // hope there's no other headers that got set while we weren't looking.
-        header('Content-Type: text/html; charset=utf-8');
-
-        common_log(LOG_DEBUG, $feed);
+        $atom = new AtomUserNoticeFeed($this->user);
+        $atom->addEntryFromNotice($this->notice);
+        $feed = $atom->getString();
+
         return $feed;
     }
 
     function groupFeedForNotice($group_id)
     {
-        // @fixme this feels VERY hacky...
-        // should probably be a cleaner way to do it
-
-        ob_start();
-        $api = new ApiTimelineGroupAction();
-        $args = array('id' => $group_id,
-                      'format' => 'atom',
-                      'max_id' => $this->notice->id,
-                      'since_id' => $this->notice->id - 1);
-        $api->prepare($args);
-        $api->handle($args);
-        $feed = ob_get_clean();
-        
-        // ...and override the content-type back to something normal... eww!
-        // hope there's no other headers that got set while we weren't looking.
-        header('Content-Type: text/html; charset=utf-8');
-
-        common_log(LOG_DEBUG, $feed);
+        $group = User_group::staticGet('id', $group_id);
+
+        $atom = new AtomGroupNoticeFeed($group);
+        $atom->addEntryFromNotice($this->notice);
+        $feed = $atom->getString();
+
         return $feed;
     }
 
-- 
cgit v1.2.3-54-g00ecf


From 24835c1164251e48037f6ddee14e4b696fe57320 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 3 Mar 2010 18:31:35 -0800
Subject: OStatus: catchable exception instead of fatal when parsing valid XML
 that isn't a valid XRD doc

---
 plugins/OStatus/lib/xrd.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'plugins/OStatus/lib')

diff --git a/plugins/OStatus/lib/xrd.php b/plugins/OStatus/lib/xrd.php
index f00e1f809..aa13ef024 100644
--- a/plugins/OStatus/lib/xrd.php
+++ b/plugins/OStatus/lib/xrd.php
@@ -57,6 +57,9 @@ class XRD
             throw new Exception("Invalid XML");
         }
         $xrd_element = $dom->getElementsByTagName('XRD')->item(0);
+        if (!$xrd_element) {
+            throw new Exception("Invalid XML, missing XRD root");
+        }
 
         // Check for host-meta host
         $host = $xrd_element->getElementsByTagName('Host')->item(0);
-- 
cgit v1.2.3-54-g00ecf


From 1c8399fde123fa2bc7b4ebf21fb323d215a9e7b4 Mon Sep 17 00:00:00 2001
From: James Walker <walkah@walkah.net>
Date: Wed, 3 Mar 2010 23:20:04 -0500
Subject: refactor xrd to allow for ownerxrd - xrd document for the site owner.
 introduced $config['webfinger']['owner'] for a custom xrd subject

---
 plugins/OStatus/OStatusPlugin.php    |   4 +-
 plugins/OStatus/actions/ownerxrd.php |  56 +++++++++++++++++
 plugins/OStatus/actions/userxrd.php  |  48 +++++++++++++++
 plugins/OStatus/actions/xrd.php      | 113 -----------------------------------
 plugins/OStatus/lib/xrdaction.php    | 105 ++++++++++++++++++++++++++++++++
 5 files changed, 212 insertions(+), 114 deletions(-)
 create mode 100644 plugins/OStatus/actions/ownerxrd.php
 create mode 100644 plugins/OStatus/actions/userxrd.php
 delete mode 100644 plugins/OStatus/actions/xrd.php
 create mode 100644 plugins/OStatus/lib/xrdaction.php

(limited to 'plugins/OStatus/lib')

diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index cc7e75976..8baa857d8 100644
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -44,7 +44,9 @@ class OStatusPlugin extends Plugin
         $m->connect('.well-known/host-meta',
                     array('action' => 'hostmeta'));
         $m->connect('main/xrd',
-                    array('action' => 'xrd'));
+                    array('action' => 'userxrd'));
+        $m->connect('main/ownerxrd',
+                    array('action' => 'ownerxrd'));
         $m->connect('main/ostatus',
                     array('action' => 'ostatusinit'));
         $m->connect('main/ostatus?nickname=:nickname',
diff --git a/plugins/OStatus/actions/ownerxrd.php b/plugins/OStatus/actions/ownerxrd.php
new file mode 100644
index 000000000..9c141d8c7
--- /dev/null
+++ b/plugins/OStatus/actions/ownerxrd.php
@@ -0,0 +1,56 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * @package OStatusPlugin
+ * @maintainer James Walker <james@status.net>
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+
+class OwnerxrdAction extends XrdAction
+{
+
+    public $uri;
+
+    function prepare($args)
+    {
+        $this->user = User::siteOwner();
+        
+        if (!$this->user) {
+            $this->clientError(_('No such user.'), 404);
+            return false;
+        }
+
+        $nick = common_canonical_nickname($this->user->nickname);
+        $acct = 'acct:' . $nick . '@' . common_config('site', 'server');
+        
+        $this->xrd = new XRD();
+
+        // Check to see if a $config['webfinger']['owner'] has been set
+        if ($owner = common_config('webfinger', 'owner')) {
+            $this->xrd->subject = Discovery::normalize($owner);
+            $this->xrd->alias[] = $acct;
+        } else {
+            $this->xrd->subject = $acct;
+        }
+
+        return true;
+    }
+}
diff --git a/plugins/OStatus/actions/userxrd.php b/plugins/OStatus/actions/userxrd.php
new file mode 100644
index 000000000..414de9364
--- /dev/null
+++ b/plugins/OStatus/actions/userxrd.php
@@ -0,0 +1,48 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * @package OStatusPlugin
+ * @maintainer James Walker <james@status.net>
+ */
+
+if (!defined('STATUSNET')) { exit(1); }
+
+class UserxrdAction extends XrdAction
+{
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $this->uri = $this->trimmed('uri');
+        $acct = Discovery::normalize($this->uri);
+
+        list($nick, $domain) = explode('@', substr(urldecode($acct), 5));
+        $nick = common_canonical_nickname($nick);
+
+        $this->user = User::staticGet('nickname', $nick);
+        if (!$this->user) {
+            $this->clientError(_('No such user.'), 404);
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/plugins/OStatus/actions/xrd.php b/plugins/OStatus/actions/xrd.php
deleted file mode 100644
index f574b60ee..000000000
--- a/plugins/OStatus/actions/xrd.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/*
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2010, StatusNet, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @package OStatusPlugin
- * @maintainer James Walker <james@status.net>
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
-
-class XrdAction extends Action
-{
-
-    public $uri;
-
-    function prepare($args)
-    {
-        parent::prepare($args);
-
-        $this->uri = $this->trimmed('uri');
-
-        return true;
-    }
-
-    function handle()
-    {
-        $acct = Discovery::normalize($this->uri);
-
-        $xrd = new XRD();
-
-        list($nick, $domain) = explode('@', substr(urldecode($acct), 5));
-        $nick = common_canonical_nickname($nick);
-
-        $this->user = User::staticGet('nickname', $nick);
-        if (!$this->user) {
-            $this->clientError(_('No such user.'), 404);
-            return false;
-        }
-
-        $xrd->subject = $this->uri;
-        $xrd->alias[] = common_profile_url($nick);
-        $xrd->links[] = array('rel' => Discovery::PROFILEPAGE,
-                              'type' => 'text/html',
-                              'href' => common_profile_url($nick));
-
-        $xrd->links[] = array('rel' => Discovery::UPDATESFROM,
-                              'href' => common_local_url('ApiTimelineUser',
-                                                         array('id' => $this->user->id,
-                                                               'format' => 'atom')),
-                              'type' => 'application/atom+xml');
-
-        // hCard
-        $xrd->links[] = array('rel' => Discovery::HCARD,
-                              'type' => 'text/html',
-                              'href' => common_local_url('hcard', array('nickname' => $nick)));
-
-        // XFN
-        $xrd->links[] = array('rel' => 'http://gmpg.org/xfn/11',
-                              'type' => 'text/html',
-                              'href' => common_profile_url($nick));
-        // FOAF
-        $xrd->links[] = array('rel' => 'describedby',
-                              'type' => 'application/rdf+xml',
-                              'href' => common_local_url('foaf',
-                                                         array('nickname' => $nick)));
-
-        // Salmon
-        $salmon_url = common_local_url('usersalmon',
-                                       array('id' => $this->user->id));
-
-        $xrd->links[] = array('rel' => Salmon::NS_REPLIES,
-                              'href' => $salmon_url);
-
-        $xrd->links[] = array('rel' => Salmon::NS_MENTIONS,
-                              'href' => $salmon_url);
-
-        // Get this user's keypair
-        $magickey = Magicsig::staticGet('user_id', $this->user->id);
-        if (!$magickey) {
-            // No keypair yet, let's generate one.
-            $magickey = new Magicsig();
-            $magickey->generate($this->user->id);
-        }
-
-        $xrd->links[] = array('rel' => Magicsig::PUBLICKEYREL,
-                              'href' => 'data:application/magic-public-key;'. $magickey->toString(false));
-
-        // TODO - finalize where the redirect should go on the publisher
-        $url = common_local_url('ostatussub') . '?profile={uri}';
-        $xrd->links[] = array('rel' => 'http://ostatus.org/schema/1.0/subscribe',
-                              'template' => $url );
-
-        header('Content-type: text/xml');
-        print $xrd->toXML();
-    }
-
-}
diff --git a/plugins/OStatus/lib/xrdaction.php b/plugins/OStatus/lib/xrdaction.php
new file mode 100644
index 000000000..6881292ad
--- /dev/null
+++ b/plugins/OStatus/lib/xrdaction.php
@@ -0,0 +1,105 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * @package OStatusPlugin
+ * @maintainer James Walker <james@status.net>
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+
+class XrdAction extends Action
+{
+
+    public $uri;
+    
+    public $user;
+
+    public $xrd;
+    
+    function handle()
+    {
+        $nick =  $this->user->nickname;
+
+        if (empty($this->xrd)) {
+            $xrd = new XRD();
+        } else {
+            $xrd = $this->xrd;
+        }
+
+        if (empty($xrd->subject)) {
+            $xrd->subject = Discovery::normalize($this->uri);
+        }
+        $xrd->alias[] = common_profile_url($nick);
+        $xrd->links[] = array('rel' => Discovery::PROFILEPAGE,
+                              'type' => 'text/html',
+                              'href' => common_profile_url($nick));
+
+        $xrd->links[] = array('rel' => Discovery::UPDATESFROM,
+                              'href' => common_local_url('ApiTimelineUser',
+                                                         array('id' => $this->user->id,
+                                                               'format' => 'atom')),
+                              'type' => 'application/atom+xml');
+
+        // hCard
+        $xrd->links[] = array('rel' => Discovery::HCARD,
+                              'type' => 'text/html',
+                              'href' => common_local_url('hcard', array('nickname' => $nick)));
+
+        // XFN
+        $xrd->links[] = array('rel' => 'http://gmpg.org/xfn/11',
+                              'type' => 'text/html',
+                              'href' => common_profile_url($nick));
+        // FOAF
+        $xrd->links[] = array('rel' => 'describedby',
+                              'type' => 'application/rdf+xml',
+                              'href' => common_local_url('foaf',
+                                                         array('nickname' => $nick)));
+
+        // Salmon
+        $salmon_url = common_local_url('usersalmon',
+                                       array('id' => $this->user->id));
+
+        $xrd->links[] = array('rel' => Salmon::NS_REPLIES,
+                              'href' => $salmon_url);
+
+        $xrd->links[] = array('rel' => Salmon::NS_MENTIONS,
+                              'href' => $salmon_url);
+
+        // Get this user's keypair
+        $magickey = Magicsig::staticGet('user_id', $this->user->id);
+        if (!$magickey) {
+            // No keypair yet, let's generate one.
+            $magickey = new Magicsig();
+            $magickey->generate($this->user->id);
+        }
+
+        $xrd->links[] = array('rel' => Magicsig::PUBLICKEYREL,
+                              'href' => 'data:application/magic-public-key;'. $magickey->toString(false));
+
+        // TODO - finalize where the redirect should go on the publisher
+        $url = common_local_url('ostatussub') . '?profile={uri}';
+        $xrd->links[] = array('rel' => 'http://ostatus.org/schema/1.0/subscribe',
+                              'template' => $url );
+
+        header('Content-type: text/xml');
+        print $xrd->toXML();
+    }
+
+}
-- 
cgit v1.2.3-54-g00ecf


From ddc4a7d2ffde5a925c2cfe7b57e51cd0b2cf0153 Mon Sep 17 00:00:00 2001
From: James Walker <walkah@walkah.net>
Date: Thu, 4 Mar 2010 01:46:34 -0500
Subject: Catch a previously uncaught exception and add some additional debug
 logs for signature verification

---
 plugins/OStatus/lib/magicenvelope.php | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'plugins/OStatus/lib')

diff --git a/plugins/OStatus/lib/magicenvelope.php b/plugins/OStatus/lib/magicenvelope.php
index 230d81ba1..fb8c57c71 100644
--- a/plugins/OStatus/lib/magicenvelope.php
+++ b/plugins/OStatus/lib/magicenvelope.php
@@ -156,18 +156,32 @@ class MagicEnvelope
     public function verify($env)
     {
         if ($env['alg'] != 'RSA-SHA256') {
+            common_log(LOG_DEBUG, "Salmon error: bad algorithm");
             return false;
         }
 
         if ($env['encoding'] != MagicEnvelope::ENCODING) {
+            common_log(LOG_DEBUG, "Salmon error: bad encoding");
             return false;
         }
 
         $text = base64_decode($env['data']);
         $signer_uri = $this->getAuthor($text);
 
-        $verifier = Magicsig::fromString($this->getKeyPair($signer_uri));
+        try {
+            $keypair = $this->getKeyPair($signer_uri);
+        } catch (Exception $e) {
+            common_log(LOG_DEBUG, "Salmon error: ".$e->getMessage());
+            return false;
+        }
+        
+        $verifier = Magicsig::fromString($keypair);
 
+        if (!$verifier) {
+            common_log(LOG_DEBUG, "Salmon error: unable to parse keypair");
+            return false;
+        }
+        
         return $verifier->verify($env['data'], $env['sig']);
     }
 
-- 
cgit v1.2.3-54-g00ecf


From 58192ad68758437a37d8af19d6676d35699ed070 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 9 Mar 2010 10:56:33 -0800
Subject: OStatus: fix exception thrown on HTTP error during feed discovery

---
 plugins/OStatus/lib/feeddiscovery.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/OStatus/lib')

diff --git a/plugins/OStatus/lib/feeddiscovery.php b/plugins/OStatus/lib/feeddiscovery.php
index 7afb71bdc..ff76b229e 100644
--- a/plugins/OStatus/lib/feeddiscovery.php
+++ b/plugins/OStatus/lib/feeddiscovery.php
@@ -129,7 +129,7 @@ class FeedDiscovery
     function initFromResponse($response)
     {
         if (!$response->isOk()) {
-            throw new FeedSubBadResponseException($response->getCode());
+            throw new FeedSubBadResponseException($response->getStatus());
         }
 
         $sourceurl = $response->getUrl();
-- 
cgit v1.2.3-54-g00ecf


From 89582e72262bdba65e6b07699536555d5fa6a497 Mon Sep 17 00:00:00 2001
From: James Walker <walkah@walkah.net>
Date: Tue, 9 Mar 2010 18:12:37 -0500
Subject: base64_encode/decode -> base64_url_encode/decode

---
 plugins/OStatus/lib/magicenvelope.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'plugins/OStatus/lib')

diff --git a/plugins/OStatus/lib/magicenvelope.php b/plugins/OStatus/lib/magicenvelope.php
index fb8c57c71..e8835165c 100644
--- a/plugins/OStatus/lib/magicenvelope.php
+++ b/plugins/OStatus/lib/magicenvelope.php
@@ -70,7 +70,7 @@ class MagicEnvelope
     public function signMessage($text, $mimetype, $keypair)
     {
         $signature_alg = Magicsig::fromString($keypair);
-        $armored_text = base64_encode($text);
+        $armored_text = base64_url_encode($text);
 
         return array(
             'data' => $armored_text,
@@ -108,7 +108,7 @@ class MagicEnvelope
     public function unfold($env)
     {
         $dom = new DOMDocument();
-        $dom->loadXML(base64_decode($env['data']));
+        $dom->loadXML(base64_url_decode($env['data']));
 
         if ($dom->documentElement->tagName != 'entry') {
             return false;
@@ -165,7 +165,7 @@ class MagicEnvelope
             return false;
         }
 
-        $text = base64_decode($env['data']);
+        $text = base64_url_decode($env['data']);
         $signer_uri = $this->getAuthor($text);
 
         try {
-- 
cgit v1.2.3-54-g00ecf


From 06612e35e433109e00167ac62d65299210ef0032 Mon Sep 17 00:00:00 2001
From: James Walker <walkah@walkah.net>
Date: Tue, 9 Mar 2010 18:47:20 -0500
Subject: remove hard-coded me:env check in magicenvelope

---
 plugins/OStatus/lib/magicenvelope.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'plugins/OStatus/lib')

diff --git a/plugins/OStatus/lib/magicenvelope.php b/plugins/OStatus/lib/magicenvelope.php
index e8835165c..c927209e4 100644
--- a/plugins/OStatus/lib/magicenvelope.php
+++ b/plugins/OStatus/lib/magicenvelope.php
@@ -193,11 +193,12 @@ class MagicEnvelope
 
     public function fromDom($dom)
     {
-        if ($dom->documentElement->tagName == 'entry') {
+        $env_element = $dom->getElementsByTagNameNS(MagicEnvelope::NS, 'env')->item(0);
+        if (!$env_element) {
             $env_element = $dom->getElementsByTagNameNS(MagicEnvelope::NS, 'provenance')->item(0);
-        } else if ($dom->documentElement->tagName == 'me:env') {
-            $env_element = $dom->documentElement;
-        } else {
+        }
+
+        if (!$env_element) {
             return false;
         }
 
-- 
cgit v1.2.3-54-g00ecf


From 512e51105372daf9c85af9284de1463084f03aa9 Mon Sep 17 00:00:00 2001
From: James Walker <walkah@walkah.net>
Date: Thu, 11 Mar 2010 14:32:22 -0500
Subject: fix invalid separator in magic-public-key XRD and matching parsing.

---
 plugins/OStatus/lib/magicenvelope.php | 6 +++++-
 plugins/OStatus/lib/xrdaction.php     | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'plugins/OStatus/lib')

diff --git a/plugins/OStatus/lib/magicenvelope.php b/plugins/OStatus/lib/magicenvelope.php
index c927209e4..9266cab5c 100644
--- a/plugins/OStatus/lib/magicenvelope.php
+++ b/plugins/OStatus/lib/magicenvelope.php
@@ -59,7 +59,11 @@ class MagicEnvelope
         }
         if ($xrd->links) {
             if ($link = Discovery::getService($xrd->links, Magicsig::PUBLICKEYREL)) {
-                list($type, $keypair) = explode(';', $link['href']);
+                list($type, $keypair) = explode(',', $link['href']);
+                if (empty($keypair)) {
+                    // Backwards compatibility check for separator bug in 0.9.0
+                    list($type, $keypair) = explode(';', $link['href']);
+                }
                 return $keypair;
             }
         }
diff --git a/plugins/OStatus/lib/xrdaction.php b/plugins/OStatus/lib/xrdaction.php
index 6881292ad..b3c1d8453 100644
--- a/plugins/OStatus/lib/xrdaction.php
+++ b/plugins/OStatus/lib/xrdaction.php
@@ -91,7 +91,7 @@ class XrdAction extends Action
         }
 
         $xrd->links[] = array('rel' => Magicsig::PUBLICKEYREL,
-                              'href' => 'data:application/magic-public-key;'. $magickey->toString(false));
+                              'href' => 'data:application/magic-public-key,'. $magickey->toString(false));
 
         // TODO - finalize where the redirect should go on the publisher
         $url = common_local_url('ostatussub') . '?profile={uri}';
-- 
cgit v1.2.3-54-g00ecf


From 85cf90cf0fb613bab38ce8e0142544a044fe0d1d Mon Sep 17 00:00:00 2001
From: James Walker <walkah@walkah.net>
Date: Sat, 13 Mar 2010 18:35:00 -0500
Subject: Performing & allowing host-meta discovery by http url (in addition to
 webfinger acct)

---
 plugins/OStatus/actions/userxrd.php | 15 +++++++++------
 plugins/OStatus/lib/discovery.php   | 11 ++++++-----
 2 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'plugins/OStatus/lib')

diff --git a/plugins/OStatus/actions/userxrd.php b/plugins/OStatus/actions/userxrd.php
index 414de9364..eb80a5ad4 100644
--- a/plugins/OStatus/actions/userxrd.php
+++ b/plugins/OStatus/actions/userxrd.php
@@ -32,12 +32,15 @@ class UserxrdAction extends XrdAction
         parent::prepare($args);
 
         $this->uri = $this->trimmed('uri');
-        $acct = Discovery::normalize($this->uri);
-
-        list($nick, $domain) = explode('@', substr(urldecode($acct), 5));
-        $nick = common_canonical_nickname($nick);
-
-        $this->user = User::staticGet('nickname', $nick);
+        $this->uri = Discovery::normalize($this->uri);
+        
+        if (Discovery::isWebfinger($this->uri)) {
+            list($nick, $domain) = explode('@', substr(urldecode($this->uri), 5));
+            $nick = common_canonical_nickname($nick);
+            $this->user = User::staticGet('nickname', $nick);
+        } else {
+            $this->user = User::staticGet('uri', $this->uri);
+        }
         if (!$this->user) {
             $this->clientError(_('No such user.'), 404);
             return false;
diff --git a/plugins/OStatus/lib/discovery.php b/plugins/OStatus/lib/discovery.php
index f8449b309..df2fea64f 100644
--- a/plugins/OStatus/lib/discovery.php
+++ b/plugins/OStatus/lib/discovery.php
@@ -157,12 +157,13 @@ class Discovery_LRDD_Host_Meta implements Discovery_LRDD
 {
     public function discover($uri)
     {
-        if (!Discovery::isWebfinger($uri)) {
-            return false;
+        if (Discovery::isWebfinger($uri)) {
+            // We have a webfinger acct: - start with host-meta
+            list($name, $domain) = explode('@', $uri);
+        } else {
+            $domain = parse_url($uri, PHP_URL_HOST);
         }
-
-        // We have a webfinger acct: - start with host-meta
-        list($name, $domain) = explode('@', $uri);
+        
         $url = 'http://'. $domain .'/.well-known/host-meta';
 
         $xrd = Discovery::fetchXrd($url);
-- 
cgit v1.2.3-54-g00ecf


From 7aa49b5e87efa2aa383b446b264f00608f1a5eac Mon Sep 17 00:00:00 2001
From: James Walker <walkah@walkah.net>
Date: Mon, 15 Mar 2010 15:17:31 -0400
Subject: use canonical user url in xrd

---
 plugins/OStatus/lib/xrdaction.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'plugins/OStatus/lib')

diff --git a/plugins/OStatus/lib/xrdaction.php b/plugins/OStatus/lib/xrdaction.php
index b3c1d8453..f1a56e0a8 100644
--- a/plugins/OStatus/lib/xrdaction.php
+++ b/plugins/OStatus/lib/xrdaction.php
@@ -46,10 +46,10 @@ class XrdAction extends Action
         if (empty($xrd->subject)) {
             $xrd->subject = Discovery::normalize($this->uri);
         }
-        $xrd->alias[] = common_profile_url($nick);
+        $xrd->alias[] = $this->user->uri;
         $xrd->links[] = array('rel' => Discovery::PROFILEPAGE,
                               'type' => 'text/html',
-                              'href' => common_profile_url($nick));
+                              'href' => $this->user->uri);
 
         $xrd->links[] = array('rel' => Discovery::UPDATESFROM,
                               'href' => common_local_url('ApiTimelineUser',
@@ -65,7 +65,7 @@ class XrdAction extends Action
         // XFN
         $xrd->links[] = array('rel' => 'http://gmpg.org/xfn/11',
                               'type' => 'text/html',
-                              'href' => common_profile_url($nick));
+                              'href' => $this->user->uri);
         // FOAF
         $xrd->links[] = array('rel' => 'describedby',
                               'type' => 'application/rdf+xml',
-- 
cgit v1.2.3-54-g00ecf


From dfac4bfd095684daf935544ed3ae8b9e4eb9c08e Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 15 Mar 2010 20:26:42 +0000
Subject: Fix feed discovery: html:link@rel can contain multiple values; saw
 rel="updates alternate" in the wild at http://tantek.com/ which broke old
 discovery code.

---
 plugins/OStatus/lib/feeddiscovery.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/OStatus/lib')

diff --git a/plugins/OStatus/lib/feeddiscovery.php b/plugins/OStatus/lib/feeddiscovery.php
index ff76b229e..7761ea583 100644
--- a/plugins/OStatus/lib/feeddiscovery.php
+++ b/plugins/OStatus/lib/feeddiscovery.php
@@ -211,11 +211,11 @@ class FeedDiscovery
                 $type = $node->attributes->getNamedItem('type');
                 $href = $node->attributes->getNamedItem('href');
                 if ($rel && $type && $href) {
-                    $rel = trim($rel->value);
+                    $rel = array_filter(explode(" ", $rel->value));
                     $type = trim($type->value);
                     $href = trim($href->value);
 
-                    if (trim($rel) == 'alternate' && array_key_exists($type, $feeds) && empty($feeds[$type])) {
+                    if (in_array('alternate', $rel) && array_key_exists($type, $feeds) && empty($feeds[$type])) {
                         // Save the first feed found of each type...
                         $feeds[$type] = $this->resolveURI($href, $base);
                     }
-- 
cgit v1.2.3-54-g00ecf


From f21f78364a9cbde2ca535a3983b384707ad097ae Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 16 Mar 2010 11:25:18 -0500
Subject: Change the workflow to get better discovery

Tried to re-structure the workflow of discovery to get more and richer
data and hints.
---
 plugins/OStatus/actions/ostatussub.php      |   5 +-
 plugins/OStatus/classes/Ostatus_profile.php | 233 ++++++++++++++++------------
 plugins/OStatus/lib/discovery.php           |  78 +++-------
 plugins/OStatus/lib/discoveryhints.php      | 182 ++++++++++++++++++++++
 plugins/OStatus/lib/feeddiscovery.php       |   4 +-
 plugins/OStatus/lib/linkheader.php          |  63 ++++++++
 6 files changed, 401 insertions(+), 164 deletions(-)
 create mode 100644 plugins/OStatus/lib/discoveryhints.php
 create mode 100644 plugins/OStatus/lib/linkheader.php

(limited to 'plugins/OStatus/lib')

diff --git a/plugins/OStatus/actions/ostatussub.php b/plugins/OStatus/actions/ostatussub.php
index 65dee2392..07081c2c6 100644
--- a/plugins/OStatus/actions/ostatussub.php
+++ b/plugins/OStatus/actions/ostatussub.php
@@ -149,7 +149,7 @@ class OStatusSubAction extends Action
         $fullname = $entity->fullname;
         $homepage = $entity->homepage;
         $location = $entity->location;
-        
+
         if (!$avatar) {
             $avatar = Avatar::defaultImage(AVATAR_PROFILE_SIZE);
         }
@@ -242,7 +242,7 @@ class OStatusSubAction extends Action
             if (Validate::email($this->profile_uri)) {
                 $this->oprofile = Ostatus_profile::ensureWebfinger($this->profile_uri);
             } else if (Validate::uri($this->profile_uri)) {
-                $this->oprofile = Ostatus_profile::ensureProfile($this->profile_uri);
+                $this->oprofile = Ostatus_profile::ensureProfileURL($this->profile_uri);
             } else {
                 $this->error = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname");
                 common_debug('Invalid address format.', __FILE__);
@@ -339,7 +339,6 @@ class OStatusSubAction extends Action
         }
     }
 
-
     /**
      * Handle posts to this form
      *
diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index 6ae8e4fd5..73f5d2322 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -708,18 +708,122 @@ class Ostatus_profile extends Memcached_DataObject
      * @return Ostatus_profile
      * @throws FeedSubException
      */
-    public static function ensureProfile($profile_uri, $hints=array())
+
+    public static function ensureProfileURL($profile_url, $hints=array())
     {
-        // Get the canonical feed URI and check it
+        $oprofile = self::getFromProfileURL($profile_url);
+
+        if (!empty($oprofile)) {
+            return $oprofile;
+        }
+
+        $hints['profileurl'] = $profile_url;
+
+        // Fetch the URL
+        // XXX: HTTP caching
+
+        $client = new HTTPClient();
+        $client->setHeader('Accept', 'text/html,application/xhtml+xml');
+        $response = $client->get($profile_url);
+
+        if (!$response->isOk()) {
+            return null;
+        }
+
+        // Check if we have a non-canonical URL
+
+        $finalUrl = $response->getUrl();
+
+        if ($finalUrl != $profile_url) {
+
+            $hints['profileurl'] = $finalUrl;
+
+            $oprofile = self::getFromProfileURL($finalUrl);
+
+            if (!empty($oprofile)) {
+                return $oprofile;
+            }
+        }
+
+        // Try to get some hCard data
+
+        $body = $response->getBody();
+
+        $hcardHints = DiscoveryHints::hcardHints($body, $finalUrl);
+
+        if (!empty($hcardHints)) {
+            $hints = array_merge($hints, $hcardHints);
+        }
+
+        // Check if they've got an LRDD header
+
+        $lrdd = LinkHeader::getLink($response, 'lrdd', 'application/xrd+xml');
+
+        if (!empty($lrdd)) {
+
+            $xrd = Discovery::fetchXrd($lrdd);
+            $xrdHints = DiscoveryHints::fromXRD($xrd);
+
+            $hints = array_merge($hints, $xrdHints);
+        }
+
+        // If discovery found a feedurl (probably from LRDD), use it.
+
+        if (array_key_exists('feedurl', $hints)) {
+            return self::ensureFeedURL($hints['feedurl'], $hints);
+        }
+
+        // Get the feed URL from HTML
+
         $discover = new FeedDiscovery();
-        if (isset($hints['feedurl'])) {
-            $feeduri = $hints['feedurl'];
-            $feeduri = $discover->discoverFromFeedURL($feeduri);
-        } else {
-            $feeduri = $discover->discoverFromURL($profile_uri);
-            $hints['feedurl'] = $feeduri;
+
+        $feedurl = $discover->discoverFromHTML($finalUrl, $body);
+
+        if (!empty($feedurl)) {
+            $hints['feedurl'] = $feedurl;
+
+            return self::ensureFeedURL($feedurl, $hints);
+        }
+    }
+
+    static function getFromProfileURL($profile_url)
+    {
+        $profile = Profile::staticGet('profileurl', $profile_url);
+
+        if (empty($profile)) {
+            return null;
+        }
+
+        // Is it a known Ostatus profile?
+
+        $oprofile = Ostatus_profile::staticGet('profile_id', $profile->id);
+
+        if (!empty($oprofile)) {
+            return $oprofile;
         }
 
+        // Is it a local user?
+
+        $user = User::staticGet('id', $profile->id);
+
+        if (!empty($user)) {
+            throw new Exception("'$profile_url' is the profile for local user '{$user->nickname}'.");
+        }
+
+        // Continue discovery; it's a remote profile
+        // for OMB or some other protocol, may also
+        // support OStatus
+
+        return null;
+    }
+
+    public static function ensureFeedURL($feed_url, $hints=array())
+    {
+        $discover = new FeedDiscovery();
+
+        $feeduri = $discover->discoverFromFeedURL($feed_url);
+        $hints['feedurl'] = $feeduri;
+
         $huburi = $discover->getAtomLink('hub');
         $hints['hub'] = $huburi;
         $salmonuri = $discover->getAtomLink(Salmon::NS_REPLIES);
@@ -1303,7 +1407,7 @@ class Ostatus_profile extends Memcached_DataObject
             }
         }
 
-        // First, look it up
+        // Try looking it up
 
         $oprofile = Ostatus_profile::staticGet('uri', 'acct:'.$addr);
 
@@ -1317,7 +1421,7 @@ class Ostatus_profile extends Memcached_DataObject
         $disco = new Discovery();
 
         try {
-            $result = $disco->lookup($addr);
+            $xrd = $disco->lookup($addr);
         } catch (Exception $e) {
             // Save negative cache entry so we don't waste time looking it up again.
             // @fixme distinguish temporary failures?
@@ -1327,38 +1431,26 @@ class Ostatus_profile extends Memcached_DataObject
 
         $hints = array('webfinger' => $addr);
 
-        foreach ($result->links as $link) {
-            switch ($link['rel']) {
-            case Discovery::PROFILEPAGE:
-                $hints['profileurl'] = $profileUrl = $link['href'];
-                break;
-            case Salmon::NS_REPLIES:
-                $hints['salmon'] = $salmonEndpoint = $link['href'];
-                break;
-            case Discovery::UPDATESFROM:
-                $hints['feedurl'] = $feedUrl = $link['href'];
-                break;
-            case Discovery::HCARD:
-                $hcardUrl = $link['href'];
-                break;
-            default:
-                common_log(LOG_NOTICE, "Don't know what to do with rel = '{$link['rel']}'");
-                break;
-            }
-        }
+        $dhints = DiscoveryHints::fromXRD($xrd);
+
+        $hints = array_merge($hints, $dhints);
+
+        // If there's an Hcard, let's grab its info
 
-        if (isset($hcardUrl)) {
-            $hcardHints = self::slurpHcard($hcardUrl);
-            // Note: Webfinger > hcard
-            $hints = array_merge($hcardHints, $hints);
+        if (array_key_exists('hcard', $hints)) {
+            if (!array_key_exists('profileurl', $hints) ||
+                $hints['hcard'] != $hints['profileurl']) {
+                $hcardHints = DiscoveryHints::fromHcardUrl($hints['hcard']);
+                $hints = array_merge($hcardHints, $hints);
+            }
         }
 
         // If we got a feed URL, try that
 
-        if (isset($feedUrl)) {
+        if (array_key_exists('feedurl', $hints)) {
             try {
                 common_log(LOG_INFO, "Discovery on acct:$addr with feed URL $feedUrl");
-                $oprofile = self::ensureProfile($feedUrl, $hints);
+                $oprofile = self::ensureFeedURL($hints['feedurl'], $hints);
                 self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->uri);
                 return $oprofile;
             } catch (Exception $e) {
@@ -1369,10 +1461,10 @@ class Ostatus_profile extends Memcached_DataObject
 
         // If we got a profile page, try that!
 
-        if (isset($profileUrl)) {
+        if (array_key_exists('profileurl', $hints)) {
             try {
                 common_log(LOG_INFO, "Discovery on acct:$addr with profile URL $profileUrl");
-                $oprofile = self::ensureProfile($profileUrl, $hints);
+                $oprofile = self::ensureProfile($hints['profileurl'], $hints);
                 self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->uri);
                 return $oprofile;
             } catch (Exception $e) {
@@ -1384,7 +1476,9 @@ class Ostatus_profile extends Memcached_DataObject
         // XXX: try hcard
         // XXX: try FOAF
 
-        if (isset($salmonEndpoint)) {
+        if (array_key_exists('salmon', $hints)) {
+
+            $salmonEndpoint = $hints['salmon'];
 
             // An account URL, a salmon endpoint, and a dream? Not much to go
             // on, but let's give it a try
@@ -1464,67 +1558,4 @@ class Ostatus_profile extends Memcached_DataObject
 
         return $file;
     }
-
-    protected static function slurpHcard($url)
-    {
-        set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/plugins/OStatus/extlib/hkit/');
-        require_once('hkit.class.php');
-
-        $h	= new hKit;
-
-        // Google Buzz hcards need to be tidied. Probably others too.
-
-        $h->tidy_mode = 'proxy'; // 'proxy', 'exec', 'php' or 'none'
-
-        // Get by URL
-        $hcards = $h->getByURL('hcard', $url);
-
-        if (empty($hcards)) {
-            return array();
-        }
-
-        // @fixme more intelligent guess on multi-hcard pages
-        $hcard = $hcards[0];
-
-        $hints = array();
-
-        $hints['profileurl'] = $url;
-
-        if (array_key_exists('nickname', $hcard)) {
-            $hints['nickname'] = $hcard['nickname'];
-        }
-
-        if (array_key_exists('fn', $hcard)) {
-            $hints['fullname'] = $hcard['fn'];
-        } else if (array_key_exists('n', $hcard)) {
-            $hints['fullname'] = implode(' ', $hcard['n']);
-        }
-
-        if (array_key_exists('photo', $hcard)) {
-            $hints['avatar'] = $hcard['photo'];
-        }
-
-        if (array_key_exists('note', $hcard)) {
-            $hints['bio'] = $hcard['note'];
-        }
-
-        if (array_key_exists('adr', $hcard)) {
-            if (is_string($hcard['adr'])) {
-                $hints['location'] = $hcard['adr'];
-            } else if (is_array($hcard['adr'])) {
-                $hints['location'] = implode(' ', $hcard['adr']);
-            }
-        }
-
-        if (array_key_exists('url', $hcard)) {
-            if (is_string($hcard['url'])) {
-                $hints['homepage'] = $hcard['url'];
-            } else if (is_array($hcard['url'])) {
-                // HACK get the last one; that's how our hcards look
-                $hints['homepage'] = $hcard['url'][count($hcard['url'])-1];
-            }
-        }
-
-        return $hints;
-    }
 }
diff --git a/plugins/OStatus/lib/discovery.php b/plugins/OStatus/lib/discovery.php
index f8449b309..6d245677a 100644
--- a/plugins/OStatus/lib/discovery.php
+++ b/plugins/OStatus/lib/discovery.php
@@ -40,7 +40,7 @@ class Discovery
     const PROFILEPAGE = 'http://webfinger.net/rel/profile-page';
     const UPDATESFROM = 'http://schemas.google.com/g/2010#updates-from';
     const HCARD = 'http://microformats.org/profile/hcard';
-    
+
     public $methods = array();
 
     public function __construct()
@@ -50,12 +50,11 @@ class Discovery
         $this->registerMethod('Discovery_LRDD_Link_HTML');
     }
 
-
     public function registerMethod($class)
     {
         $this->methods[] = $class;
     }
-    
+
     /**
      * Given a "user id" make sure it's normalized to either a webfinger
      * acct: uri or a profile HTTP URL.
@@ -78,7 +77,7 @@ class Discovery
     public static function isWebfinger($user_id)
     {
         $uri = Discovery::normalize($user_id);
-        
+
         return (substr($uri, 0, 5) == 'acct:');
     }
 
@@ -99,7 +98,7 @@ class Discovery
                 } else {
                     $xrd_uri = $link['href'];
                 }
-                
+
                 $xrd = $this->fetchXrd($xrd_uri);
                 if ($xrd) {
                     return $xrd;
@@ -114,14 +113,13 @@ class Discovery
         if (!is_array($links)) {
             return false;
         }
-        
+
         foreach ($links as $link) {
             if ($link['rel'] == $service) {
                 return $link;
             }
         }
     }
-    
 
     public static function applyTemplate($template, $id)
     {
@@ -130,7 +128,6 @@ class Discovery
         return $template;
     }
 
-    
     public static function fetchXrd($url)
     {
         try {
@@ -171,7 +168,7 @@ class Discovery_LRDD_Host_Meta implements Discovery_LRDD
             if ($xrd->host != $domain) {
                 return false;
             }
-            
+
             return $xrd->links;
         }
     }
@@ -187,7 +184,7 @@ class Discovery_LRDD_Link_Header implements Discovery_LRDD
         } catch (HTTP_Request2_Exception $e) {
             return false;
         }
-             
+
         if ($response->getStatus() != 200) {
             return false;
         }
@@ -196,51 +193,17 @@ class Discovery_LRDD_Link_Header implements Discovery_LRDD
         if (!$link_header) {
             //            return false;
         }
-        
+
         return Discovery_LRDD_Link_Header::parseHeader($link_header);
     }
 
     protected static function parseHeader($header)
     {
-        preg_match('/^<[^>]+>/', $header, $uri_reference);
-        //if (empty($uri_reference)) return;
-
-        $links = array();
-        
-        $link_uri = trim($uri_reference[0], '<>');
-        $link_rel = array();
-        $link_type = null;
-        
-        // remove uri-reference from header
-        $header = substr($header, strlen($uri_reference[0]));
-        
-        // parse link-params
-        $params = explode(';', $header);
-        
-        foreach ($params as $param) {
-            if (empty($param)) continue;
-            list($param_name, $param_value) = explode('=', $param, 2);
-            $param_name = trim($param_name);
-            $param_value = preg_replace('(^"|"$)', '', trim($param_value));
-            
-            // for now we only care about 'rel' and 'type' link params
-            // TODO do something with the other links-params
-            switch ($param_name) {
-            case 'rel':
-                $link_rel = trim($param_value);
-                break;
-                
-            case 'type':
-                $link_type = trim($param_value);
-            }
-        }
-
-        $links[] =  array(
-            'href' => $link_uri,
-            'rel' => $link_rel,
-            'type' => $link_type);
+        $lh = new LinkHeader($header);
 
-        return $links;
+        return array('href' => $lh->href,
+                     'rel'  => $lh->rel,
+                     'type' => $lh->type);
     }
 }
 
@@ -262,49 +225,48 @@ class Discovery_LRDD_Link_HTML implements Discovery_LRDD
         return Discovery_LRDD_Link_HTML::parse($response->getBody());
     }
 
-
     public function parse($html)
     {
         $links = array();
-        
+
         preg_match('/<head(\s[^>]*)?>(.*?)<\/head>/is', $html, $head_matches);
         $head_html = $head_matches[2];
-        
+
         preg_match_all('/<link\s[^>]*>/i', $head_html, $link_matches);
-        
+
         foreach ($link_matches[0] as $link_html) {
             $link_url = null;
             $link_rel = null;
             $link_type = null;
-            
+
             preg_match('/\srel=(("|\')([^\\2]*?)\\2|[^"\'\s]+)/i', $link_html, $rel_matches);
             if ( isset($rel_matches[3]) ) {
                 $link_rel = $rel_matches[3];
             } else if ( isset($rel_matches[1]) ) {
                 $link_rel = $rel_matches[1];
             }
-            
+
             preg_match('/\shref=(("|\')([^\\2]*?)\\2|[^"\'\s]+)/i', $link_html, $href_matches);
             if ( isset($href_matches[3]) ) {
                 $link_uri = $href_matches[3];
             } else if ( isset($href_matches[1]) ) {
                 $link_uri = $href_matches[1];
             }
-            
+
             preg_match('/\stype=(("|\')([^\\2]*?)\\2|[^"\'\s]+)/i', $link_html, $type_matches);
             if ( isset($type_matches[3]) ) {
                 $link_type = $type_matches[3];
             } else if ( isset($type_matches[1]) ) {
                 $link_type = $type_matches[1];
             }
-            
+
             $links[] = array(
                 'href' => $link_url,
                 'rel' => $link_rel,
                 'type' => $link_type,
             );
         }
-        
+
         return $links;
     }
 }
diff --git a/plugins/OStatus/lib/discoveryhints.php b/plugins/OStatus/lib/discoveryhints.php
new file mode 100644
index 000000000..db13793dd
--- /dev/null
+++ b/plugins/OStatus/lib/discoveryhints.php
@@ -0,0 +1,182 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * Some utilities for generating hint data
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+class DiscoveryHints {
+
+    static function fromXRD($xrd)
+    {
+        $hints = array();
+
+        foreach ($xrd->links as $link) {
+            switch ($link['rel']) {
+            case Discovery::PROFILEPAGE:
+                $hints['profileurl'] = $link['href'];
+                break;
+            case Salmon::NS_REPLIES:
+                $hints['salmon'] = $link['href'];
+                break;
+            case Discovery::UPDATESFROM:
+                $hints['feedurl'] = $link['href'];
+                break;
+            case Discovery::HCARD:
+                $hints['hcardurl'] = $link['href'];
+                break;
+            default:
+                break;
+            }
+        }
+
+        return $hints;
+    }
+
+    static function fromHcardUrl($url)
+    {
+        $client = new HTTPClient();
+        $client->setHeader('Accept', 'text/html,application/xhtml+xml');
+        $response = $client->get($url);
+
+        if (!$response->isOk()) {
+            return null;
+        }
+
+        return self::hcardHints($response->getBody(),
+                                $response->getUrl());
+    }
+
+    static function hcardHints($body, $url)
+    {
+        common_debug("starting tidy");
+
+        $body = self::_tidy($body);
+
+        common_debug("done with tidy");
+
+        set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/plugins/OStatus/extlib/hkit/');
+        require_once('hkit.class.php');
+
+        $h	= new hKit;
+
+        $hcards = $h->getByString('hcard', $body);
+
+        if (empty($hcards)) {
+            return array();
+        }
+
+        if (count($hcards) == 1) {
+            $hcard = $hcards[0];
+        } else {
+            foreach ($hcards as $try) {
+                if (array_key_exists('url', $try)) {
+                    if (is_string($try['url']) && $try['url'] == $url) {
+                        $hcard = $try;
+                        break;
+                    } else if (is_array($try['url'])) {
+                        foreach ($try['url'] as $tryurl) {
+                            if ($tryurl == $url) {
+                                $hcard = $try;
+                                break 2;
+                            }
+                        }
+                    }
+                }
+            }
+            // last chance; grab the first one
+            if (empty($hcard)) {
+                $hcard = $hcards[0];
+            }
+        }
+
+        $hints = array();
+
+        if (array_key_exists('nickname', $hcard)) {
+            $hints['nickname'] = $hcard['nickname'];
+        }
+
+        if (array_key_exists('fn', $hcard)) {
+            $hints['fullname'] = $hcard['fn'];
+        } else if (array_key_exists('n', $hcard)) {
+            $hints['fullname'] = implode(' ', $hcard['n']);
+        }
+
+        if (array_key_exists('photo', $hcard)) {
+            $hints['avatar'] = $hcard['photo'];
+        }
+
+        if (array_key_exists('note', $hcard)) {
+            $hints['bio'] = $hcard['note'];
+        }
+
+        if (array_key_exists('adr', $hcard)) {
+            if (is_string($hcard['adr'])) {
+                $hints['location'] = $hcard['adr'];
+            } else if (is_array($hcard['adr'])) {
+                $hints['location'] = implode(' ', $hcard['adr']);
+            }
+        }
+
+        if (array_key_exists('url', $hcard)) {
+            if (is_string($hcard['url'])) {
+                $hints['homepage'] = $hcard['url'];
+            } else if (is_array($hcard['url'])) {
+                // HACK get the last one; that's how our hcards look
+                $hints['homepage'] = $hcard['url'][count($hcard['url'])-1];
+            }
+        }
+
+        return $hints;
+    }
+
+    private static function _tidy($body)
+    {
+        if (function_exists('tidy_parse_string')) {
+            common_debug("Tidying with extension");
+            $text = tidy_parse_string($body);
+            $text = tidy_clean_repair($text);
+            return $body;
+        } else if ($fullpath = self::_findProgram('tidy')) {
+            common_debug("Tidying with program $fullpath");
+            $tempfile = tempnam('/tmp', 'snht'); // statusnet hcard tidy
+            file_put_contents($tempfile, $source);
+            exec("$fullpath -utf8 -indent -asxhtml -numeric -bare -quiet $tempfile", $tidy);
+            unlink($tempfile);
+            return implode("\n", $tidy);
+        } else {
+            common_debug("Not tidying.");
+            return $body;
+        }
+    }
+
+    private static function _findProgram($name)
+    {
+        $path = $_ENV['PATH'];
+
+        $parts = explode(':', $path);
+
+        foreach ($parts as $part) {
+            $fullpath = $part . '/' . $name;
+            if (is_executable($fullpath)) {
+                return $fullpath;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/plugins/OStatus/lib/feeddiscovery.php b/plugins/OStatus/lib/feeddiscovery.php
index ff76b229e..f9ea3e713 100644
--- a/plugins/OStatus/lib/feeddiscovery.php
+++ b/plugins/OStatus/lib/feeddiscovery.php
@@ -117,7 +117,7 @@ class FeedDiscovery
                 return $this->discoverFromURL($target, false);
             }
         }
-        
+
         return $this->initFromResponse($response);
     }
 
@@ -202,7 +202,7 @@ class FeedDiscovery
             'application/atom+xml' => false,
             'application/rss+xml' => false,
         );
-        
+
         $nodes = $dom->getElementsByTagName('link');
         for ($i = 0; $i < $nodes->length; $i++) {
             $node = $nodes->item($i);
diff --git a/plugins/OStatus/lib/linkheader.php b/plugins/OStatus/lib/linkheader.php
new file mode 100644
index 000000000..2f6c66dc9
--- /dev/null
+++ b/plugins/OStatus/lib/linkheader.php
@@ -0,0 +1,63 @@
+<?php
+
+class LinkHeader
+{
+    var $href;
+    var $rel;
+    var $type;
+
+    function __construct($str)
+    {
+        preg_match('/^<[^>]+>/', $str, $uri_reference);
+        //if (empty($uri_reference)) return;
+
+        $this->uri = trim($uri_reference[0], '<>');
+        $this->rel = array();
+        $this->type = null;
+
+        // remove uri-reference from header
+        $str = substr($str, strlen($uri_reference[0]));
+
+        // parse link-params
+        $params = explode(';', $str);
+
+        foreach ($params as $param) {
+            if (empty($param)) continue;
+            list($param_name, $param_value) = explode('=', $param, 2);
+            $param_name = trim($param_name);
+            $param_value = preg_replace('(^"|"$)', '', trim($param_value));
+
+            // for now we only care about 'rel' and 'type' link params
+            // TODO do something with the other links-params
+            switch ($param_name) {
+            case 'rel':
+                $this->rel = trim($param_value);
+                break;
+
+            case 'type':
+                $this->type = trim($param_value);
+            }
+        }
+    }
+
+    static function getLink($response, $rel=null, $type=null)
+    {
+        $headers = $response->getHeader('Link');
+
+        // Can get an array or string, so try to simplify the path
+        if (!is_array($headers)) {
+            $headers = array($headers);
+        }
+
+        foreach ($headers as $header) {
+            $lh = new LinkHeader($header);
+
+            if ((is_null($rel) || $lh->rel == $rel) &&
+                (is_null($type) || $lh->type == $type)) {
+                return $lh->href;
+            }
+        }
+
+        return null;
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf


From 1301877dfe89c57c182246c0d7ba0ff6335fd17b Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 18 Mar 2010 17:08:19 -0700
Subject: OStatus discover fixes: * Subscription::start was sometimes passing
 users instead of profiles to hooks, which broke OStatus subscription
 notifications; now normalizing to profiles for processing. * H-card parsing
 would trigger a lot of PHP warnings and notices in hKit. Now suppressing
 warnings and notices for the duration of the call to keep them out of output
 when display_errors is on. * H-card parsing would trigger a PHP fatal error
 if the source page was not well-formed XML and Tidy was not present on the
 system. Switched normalization to use the PHP DOM module which is always
 present, as we have no need for Tidy's extra features here. * Trying to fetch
 avatars from Google profiles failed and triggered a PHP warning due to the
 relative URL not being resolved during h-card parsing. Now passing profile
 page URL into hKit by sneaking a <base> tag in while we normalize the HTML
 source. * Profile pages without a "Link" header could trigger PHP notices due
 to a bad NULL -> array(NULL) conversion in LinkHeader::getLink(). Now
 checking that there was a return value before converting single return value
 into array.

---
 classes/Subscription.php               |  8 +++
 lib/activity.php                       |  4 +-
 plugins/OStatus/lib/discoveryhints.php | 91 ++++++++++++++++++++++------------
 plugins/OStatus/lib/linkheader.php     | 24 ++++-----
 4 files changed, 81 insertions(+), 46 deletions(-)

(limited to 'plugins/OStatus/lib')

diff --git a/classes/Subscription.php b/classes/Subscription.php
index 97c44a2e4..60c12cccc 100644
--- a/classes/Subscription.php
+++ b/classes/Subscription.php
@@ -62,6 +62,14 @@ class Subscription extends Memcached_DataObject
 
     static function start($subscriber, $other)
     {
+        // @fixme should we enforce this as profiles in callers instead?
+        if ($subscriber instanceof User) {
+            $subscriber = $subscriber->getProfile();
+        }
+        if ($other instanceof User) {
+            $other = $other->getProfile();
+        }
+
         if (!$subscriber->hasRight(Right::SUBSCRIBE)) {
             throw new Exception(_('You have been banned from subscribing.'));
         }
diff --git a/lib/activity.php b/lib/activity.php
index d84eabf7c..c67d090f7 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -720,7 +720,7 @@ class ActivityObject
         }
     }
 
-    static function fromNotice($notice)
+    static function fromNotice(Notice $notice)
     {
         $object = new ActivityObject();
 
@@ -734,7 +734,7 @@ class ActivityObject
         return $object;
     }
 
-    static function fromProfile($profile)
+    static function fromProfile(Profile $profile)
     {
         $object = new ActivityObject();
 
diff --git a/plugins/OStatus/lib/discoveryhints.php b/plugins/OStatus/lib/discoveryhints.php
index db13793dd..4da2ec0f1 100644
--- a/plugins/OStatus/lib/discoveryhints.php
+++ b/plugins/OStatus/lib/discoveryhints.php
@@ -65,17 +65,22 @@ class DiscoveryHints {
     {
         common_debug("starting tidy");
 
-        $body = self::_tidy($body);
+        $body = self::_tidy($body, $url);
 
         common_debug("done with tidy");
 
         set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/plugins/OStatus/extlib/hkit/');
         require_once('hkit.class.php');
 
-        $h	= new hKit;
+        // hKit code is not clean for notices and warnings
+        $old = error_reporting();
+        error_reporting($old & ~E_NOTICE & ~E_WARNING);
 
+        $h	= new hKit;
         $hcards = $h->getByString('hcard', $body);
 
+        error_reporting($old);
+
         if (empty($hcards)) {
             return array();
         }
@@ -144,39 +149,61 @@ class DiscoveryHints {
         return $hints;
     }
 
-    private static function _tidy($body)
+    /**
+     * hKit needs well-formed XML for its parsing.
+     * We'll take the HTML body here and normalize it to XML.
+     *
+     * @param string $body HTML document source, possibly not-well-formed
+     * @param string $url source URL
+     * @return string well-formed XML document source
+     * @throws Exception if HTML parsing failed.
+     */
+    private static function _tidy($body, $url)
     {
-        if (function_exists('tidy_parse_string')) {
-            common_debug("Tidying with extension");
-            $text = tidy_parse_string($body);
-            $text = tidy_clean_repair($text);
-            return $body;
-        } else if ($fullpath = self::_findProgram('tidy')) {
-            common_debug("Tidying with program $fullpath");
-            $tempfile = tempnam('/tmp', 'snht'); // statusnet hcard tidy
-            file_put_contents($tempfile, $source);
-            exec("$fullpath -utf8 -indent -asxhtml -numeric -bare -quiet $tempfile", $tidy);
-            unlink($tempfile);
-            return implode("\n", $tidy);
-        } else {
-            common_debug("Not tidying.");
-            return $body;
+        if (empty($body)) {
+            throw new Exception("Empty HTML could not be parsed.");
         }
-    }
-
-    private static function _findProgram($name)
-    {
-        $path = $_ENV['PATH'];
-
-        $parts = explode(':', $path);
-
-        foreach ($parts as $part) {
-            $fullpath = $part . '/' . $name;
-            if (is_executable($fullpath)) {
-                return $fullpath;
+        $dom = new DOMDocument();
+
+        // Some HTML errors will trigger warnings, but still work.
+        $old = error_reporting();
+        error_reporting($old & ~E_WARNING);
+        
+        $ok = $dom->loadHTML($body);
+
+        error_reporting($old);
+        
+        if ($ok) {
+            // hKit doesn't give us a chance to pass the source URL for
+            // resolving relative links, such as the avatar photo on a
+            // Google profile. We'll slip it into a <base> tag if there's
+            // not already one present.
+            $bases = $dom->getElementsByTagName('base');
+            if ($bases && $bases->length >= 1) {
+                $base = $bases->item(0);
+                if ($base->hasAttribute('href')) {
+                    $base->setAttribute('href', $url);
+                }
+            } else {
+                $base = $dom->createElement('base');
+                $base->setAttribute('href', $url);
+                $heads = $dom->getElementsByTagName('head');
+                if ($heads || $heads->length) {
+                    $head = $heads->item(0);
+                } else {
+                    $head = $dom->createElement('head');
+                    $root = $dom->documentRoot;
+                    if ($root->firstChild) {
+                        $root->insertBefore($head, $root->firstChild);
+                    } else {
+                        $root->appendChild($head);
+                    }
+                }
+                $head->appendChild($base);
             }
+            return $dom->saveXML();
+        } else {
+            throw new Exception("Invalid HTML could not be parsed.");
         }
-
-        return null;
     }
 }
diff --git a/plugins/OStatus/lib/linkheader.php b/plugins/OStatus/lib/linkheader.php
index 2f6c66dc9..afcd66d26 100644
--- a/plugins/OStatus/lib/linkheader.php
+++ b/plugins/OStatus/lib/linkheader.php
@@ -43,21 +43,21 @@ class LinkHeader
     static function getLink($response, $rel=null, $type=null)
     {
         $headers = $response->getHeader('Link');
+        if ($headers) {
+            // Can get an array or string, so try to simplify the path
+            if (!is_array($headers)) {
+                $headers = array($headers);
+            }
 
-        // Can get an array or string, so try to simplify the path
-        if (!is_array($headers)) {
-            $headers = array($headers);
-        }
-
-        foreach ($headers as $header) {
-            $lh = new LinkHeader($header);
+            foreach ($headers as $header) {
+                $lh = new LinkHeader($header);
 
-            if ((is_null($rel) || $lh->rel == $rel) &&
-                (is_null($type) || $lh->type == $type)) {
-                return $lh->href;
+                if ((is_null($rel) || $lh->rel == $rel) &&
+                    (is_null($type) || $lh->type == $type)) {
+                    return $lh->href;
+                }
             }
         }
-
         return null;
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-54-g00ecf


From 4a6c9e445149e42a4f81d5140296e7770c60bc6c Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 18 Mar 2010 17:55:21 -0700
Subject: Work around weird bug with HTML normalization via PHP DOM module; if
 source had xmlns and xml:lang I ended up with double output, breaking the
 subsequent parsing. Will have to track this down later and report upstream if
 not already resolved.

---
 plugins/OStatus/extlib/hkit/hkit.class.php |  2 +-
 plugins/OStatus/lib/discoveryhints.php     | 21 ++++++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

(limited to 'plugins/OStatus/lib')

diff --git a/plugins/OStatus/extlib/hkit/hkit.class.php b/plugins/OStatus/extlib/hkit/hkit.class.php
index c3a54cff6..fec6f4d8f 100644
--- a/plugins/OStatus/extlib/hkit/hkit.class.php
+++ b/plugins/OStatus/extlib/hkit/hkit.class.php
@@ -472,4 +472,4 @@
 	}
 
 
-?>
\ No newline at end of file
+?>
diff --git a/plugins/OStatus/lib/discoveryhints.php b/plugins/OStatus/lib/discoveryhints.php
index 4da2ec0f1..0273b5a92 100644
--- a/plugins/OStatus/lib/discoveryhints.php
+++ b/plugins/OStatus/lib/discoveryhints.php
@@ -174,6 +174,26 @@ class DiscoveryHints {
         error_reporting($old);
         
         if ($ok) {
+            // If the original had xmlns or xml:lang attributes on the
+            // <html>, we seen to end up with duplicates, which causes
+            // parse errors. Remove em!
+            //
+            // For some reason we have to iterate and remove them twice,
+            // *plus* they don't show up on hasAttribute() or removeAttribute().
+            // This might be some weird bug in PHP or libxml2, uncertain if
+            // it affects other folks consistently.
+            $root = $dom->documentElement;
+            foreach ($root->attributes as $i => $x) {
+                if ($i == 'xmlns' || $i == 'xml:lang') {
+                    $root->removeAttributeNode($x);
+                }
+            }
+            foreach ($root->attributes as $i => $x) {
+                if ($i == 'xmlns' || $i == 'xml:lang') {
+                    $root->removeAttributeNode($x);
+                }
+            }
+
             // hKit doesn't give us a chance to pass the source URL for
             // resolving relative links, such as the avatar photo on a
             // Google profile. We'll slip it into a <base> tag if there's
@@ -192,7 +212,6 @@ class DiscoveryHints {
                     $head = $heads->item(0);
                 } else {
                     $head = $dom->createElement('head');
-                    $root = $dom->documentRoot;
                     if ($root->firstChild) {
                         $root->insertBefore($head, $root->firstChild);
                     } else {
-- 
cgit v1.2.3-54-g00ecf


From 17c50f338ceb574780476f6b788f48e2d7d06017 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 18 Mar 2010 20:52:00 -0500
Subject: Remove hkit and do our own hcard parsing

Parsing hcards for the data we need wasn't hard enough to justify using
hkit. It was dependent on a number of external systems (something to
run tidy), and only could handle XHTML.

We now parse HTML with the PHP dom libraries used elsewhere, and
scrape out our own hcards. Seems to work nicer and faster and most of
all works with Google Buzz profile URLs.
---
 plugins/OStatus/extlib/hkit/hcard.profile.php | 105 ------
 plugins/OStatus/extlib/hkit/hkit.class.php    | 475 --------------------------
 plugins/OStatus/lib/discoveryhints.php        | 194 +++++++----
 3 files changed, 130 insertions(+), 644 deletions(-)
 delete mode 100644 plugins/OStatus/extlib/hkit/hcard.profile.php
 delete mode 100644 plugins/OStatus/extlib/hkit/hkit.class.php

(limited to 'plugins/OStatus/lib')

diff --git a/plugins/OStatus/extlib/hkit/hcard.profile.php b/plugins/OStatus/extlib/hkit/hcard.profile.php
deleted file mode 100644
index 6ec0dc890..000000000
--- a/plugins/OStatus/extlib/hkit/hcard.profile.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-	// hcard profile for hkit
-	
-	$this->root_class = 'vcard';
-	
-	$this->classes = array( 
-		'fn', array('honorific-prefix', 'given-name', 'additional-name', 'family-name', 'honorific-suffix'),
-		'n', array('honorific-prefix', 'given-name', 'additional-name', 'family-name', 'honorific-suffix'),
-		'adr', array('post-office-box', 'extended-address', 'street-address', 'postal-code', 'country-name', 'type', 'region', 'locality'),
-		'label', 'bday', 'agent', 'nickname', 'photo', 'class', 
-		'email', array('type', 'value'), 
-		'category', 'key', 'logo', 'mailer', 'note',
-		'org', array('organization-name', 'organization-unit'),
-		'tel', array('type', 'value'),
-		'geo', array('latitude', 'longitude'),
-		'tz', 'uid', 'url', 'rev', 'role', 'sort-string', 'sound', 'title'		
-	);
-	
-	// classes that must only appear once per card
-	$this->singles = array(
-		'fn'
-	);
-	
-	// classes that are required (not strictly enforced - give at least one!)
-	$this->required = array(
-		'fn'
-	);
-
-	$this->att_map = array(
-		'fn'	=> array('IMG|alt'),
-		'url'	=> array('A|href', 'IMG|src', 'AREA|href'),
-		'photo'	=> array('IMG|src'),
-		'bday'	=> array('ABBR|title'),
-		'logo'	=> array('IMG|src'),
-		'email' => array('A|href'),
-		'geo'	=> array('ABBR|title')
-	);
-
-	
-	$this->callbacks = array(
-		'url'	=> array($this, 'resolvePath'),
-		'photo'	=> array($this, 'resolvePath'),
-		'logo'	=> array($this, 'resolvePath'),
-		'email'	=> array($this, 'resolveEmail')
-	);
-
-
-
-	function hKit_hcard_post($a)
-	{
-		
-		foreach ($a as &$vcard){
-			
-			hKit_implied_n_optimization($vcard);
-			hKit_implied_n_from_fn($vcard);
-			
-		}
-		
-		return $a;
-	
-	}
-	
-	
-	function hKit_implied_n_optimization(&$vcard)
-	{
-		if (array_key_exists('fn', $vcard) && !is_array($vcard['fn']) && 
-			!array_key_exists('n', $vcard) && (!array_key_exists('org', $vcard) || $vcard['fn'] != $vcard['org'])){
-			
-			if (sizeof(explode(' ', $vcard['fn'])) == 2){
-				$patterns	= array();
-				$patterns[] = array('/^(\S+),\s*(\S{1})$/', 2, 1); 		// Lastname, Initial
-				$patterns[] = array('/^(\S+)\s*(\S{1})\.*$/', 2, 1); 	// Lastname Initial(.)
-				$patterns[] = array('/^(\S+),\s*(\S+)$/', 2, 1); 		// Lastname, Firstname
-				$patterns[] = array('/^(\S+)\s*(\S+)$/', 1, 2); 		// Firstname Lastname
-			
-				foreach ($patterns as $pattern){
-					if (preg_match($pattern[0], $vcard['fn'], $matches) === 1){
-						$n					= array();
-						$n['given-name']	= $matches[$pattern[1]];
-						$n['family-name']	= $matches[$pattern[2]];
-						$vcard['n']			= $n;
-						
-						
-						break;
-					}
-				}
-			}
-		}
-	}
-	
-	
-	function hKit_implied_n_from_fn(&$vcard)
-	{
-		if (array_key_exists('fn', $vcard) && is_array($vcard['fn']) 
-			&& !array_key_exists('n', $vcard) && (!array_key_exists('org', $vcard) || $vcard['fn'] != $vcard['org'])){
-				
-			$vcard['n']		= $vcard['fn'];
-		}
-
-		if (array_key_exists('fn', $vcard) && is_array($vcard['fn'])){
-			$vcard['fn']	= $vcard['fn']['text'];
-		}
-	}
-
-?>
\ No newline at end of file
diff --git a/plugins/OStatus/extlib/hkit/hkit.class.php b/plugins/OStatus/extlib/hkit/hkit.class.php
deleted file mode 100644
index c3a54cff6..000000000
--- a/plugins/OStatus/extlib/hkit/hkit.class.php
+++ /dev/null
@@ -1,475 +0,0 @@
-<?php
-
-	/* 
-	
-	hKit Library for PHP5 - a generic library for parsing Microformats
-	Copyright (C) 2006  Drew McLellan
-
-	This library is free software; you can redistribute it and/or
-	modify it under the terms of the GNU Lesser General Public
-	License as published by the Free Software Foundation; either
-	version 2.1 of the License, or (at your option) any later version.
-
-	This library is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-	Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public
-	License along with this library; if not, write to the Free Software
-	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-	
-	Author	
-		Drew McLellan - http://allinthehead.com/
-		
-	Contributors:
-		Scott Reynen - http://www.randomchaos.com/
-		
-	Version 0.5, 22-Jul-2006
-		fixed by-ref issue cropping up in PHP 5.0.5
-		fixed a bug with a@title
-		added support for new fn=n optimisation
-		added support for new a.include include-pattern
-	Version 0.4, 23-Jun-2006
-		prevented nested includes from causing infinite loops
-		returns false if URL can't be fetched
-		added pre-flight check for base support level
-		added deduping of once-only classnames
-		prevented accumulation of multiple 'value' values
-		tuned whitespace handling and treatment of DEL elements
-	Version 0.3, 21-Jun-2006
-		added post-processor callback method into profiles
-		fixed minor problems raised by hcard testsuite
-		added support for include-pattern
-		added support for td@headers pattern
-		added implied-n optimization into default hcard profile
-	Version 0.2, 20-Jun-2006
-		added class callback mechanism
-		added resolvePath & resolveEmail
-		added basic BASE support
-	Version 0.1.1, 19-Jun-2006 (different timezone, no time machine)
-		added external Tidy option
-	Version 0.1, 20-Jun-2006
-		initial release
-		
-	
-	
-	
-	*/
-
-	class hKit
-	{
-		
-		public $tidy_mode	= 'proxy'; // 'proxy', 'exec', 'php' or 'none'
-		public $tidy_proxy	= 'http://cgi.w3.org/cgi-bin/tidy?forceXML=on&docAddr='; // required only for tidy_mode=proxy
-		public $tmp_dir		= '/path/to/writable/dir/'; // required only for tidy_mode=exec
-		
-		private $root_class = '';
-		private $classes	= '';
-		private $singles	= '';
-		private $required	= '';
-		private $att_map	= '';
-		private $callbacks	= '';
-		private $processor 	= '';
-		
-		private $url		= '';
-		private $base 		= '';
-		private $doc		= '';
-		
-		
-		public function hKit()
-		{
-			// pre-flight checks
-			$pass 		= true; 
-			$required	= array('dom_import_simplexml', 'file_get_contents', 'simplexml_load_string');
-			$missing	= array();
-			
-			foreach ($required as $f){
-				if (!function_exists($f)){
-					$pass		= false;
-					$missing[] 	= $f . '()';
-				}
-			}
-			
-			if (!$pass)
-				die('hKit error: these required functions are not available: <strong>' . implode(', ', $missing) . '</strong>');
-			
-		}
-		
-
-		public function getByURL($profile='', $url='')
-		{
-			
-			if ($profile=='' || $url == '') return false;
-			
-			$this->loadProfile($profile);
-			
-			$source		= $this->loadURL($url);
-			
-			if ($source){
-				$tidy_xhtml	= $this->tidyThis($source);
-
-				$fragment	= false;
-			
-				if (strrchr($url, '#'))
-				$fragment	= array_pop(explode('#', $url));
-			
-				$doc		= $this->loadDoc($tidy_xhtml, $fragment);
-				$s			= $this->processNodes($doc, $this->classes);
-				$s			= $this->postProcess($profile, $s);
-			
-				return $s;
-			}else{
-				return false;
-			}
-		}
-		
-		public function getByString($profile='', $input_xml='')
-		{
-			if ($profile=='' || $input_xml == '') return false;
-			
-			$this->loadProfile($profile);
-
-			$doc	= $this->loadDoc($input_xml);
-			$s		= $this->processNodes($doc, $this->classes);
-			$s		= $this->postProcess($profile, $s);
-			
-			return $s;
-			
-		}
-		
-		private function processNodes($items, $classes, $allow_includes=true){
-
-			$out	= array();
-
-			foreach($items as $item){
-				$data	= array();
-
-				for ($i=0; $i<sizeof($classes); $i++){
-					
-					if (!is_array($classes[$i])){
-
-						$xpath			= ".//*[contains(concat(' ',normalize-space(@class),' '),' " . $classes[$i] . " ')]";
-						$results		= $item->xpath($xpath);
-						
-						if ($results){
-							foreach ($results as $result){ 
-								if (isset($classes[$i+1]) && is_array($classes[$i+1])){
-									$nodes				= $this->processNodes($results, $classes[$i+1]);
-									if (sizeof($nodes) > 0){
-										$nodes = array_merge(array('text'=>$this->getNodeValue($result, $classes[$i])), $nodes);
-										$data[$classes[$i]]	= $nodes;
-									}else{
-										$data[$classes[$i]]	= $this->getNodeValue($result, $classes[$i]);
-									}
-									
-								}else{								
-									if (isset($data[$classes[$i]])){
-										if (is_array($data[$classes[$i]])){
-											// is already an array - append
-											$data[$classes[$i]][]	= $this->getNodeValue($result, $classes[$i]);
-
-										}else{
-											// make it an array
-											if ($classes[$i] == 'value'){ // unless it's the 'value' of a type/value pattern
-												$data[$classes[$i]] .= $this->getNodeValue($result, $classes[$i]);
-											}else{
-												$old_val			= $data[$classes[$i]];
-												$data[$classes[$i]]	= array($old_val, $this->getNodeValue($result, $classes[$i]));
-												$old_val			= false;
-											}
-										}
-									}else{										
-										// set as normal value
-										$data[$classes[$i]]	= $this->getNodeValue($result, $classes[$i]);
-
-									}
-								}
-							
-								// td@headers pattern
-								if (strtoupper(dom_import_simplexml($result)->tagName)== "TD" && $result['headers']){
-									$include_ids	= explode(' ', $result['headers']);
-									$doc			= $this->doc;
-									foreach ($include_ids as $id){
-										$xpath			= "//*[@id='$id']/..";
-										$includes		= $doc->xpath($xpath);
-										foreach ($includes as $include){
-											$tmp = $this->processNodes($include, $this->classes);
-											if (is_array($tmp)) $data = array_merge($data, $tmp);
-										}
-									}
-								}
-							}					
-						}				
-					}
-					$result	= false;
-				}
-				
-				// include-pattern
-				if ($allow_includes){
-					$xpath			= ".//*[contains(concat(' ',normalize-space(@class),' '),' include ')]";
-					$results		= $item->xpath($xpath);
-				
-					if ($results){
-						foreach ($results as $result){
-							$tagName = strtoupper(dom_import_simplexml($result)->tagName);
-							if ((($tagName == "OBJECT" && $result['data']) || ($tagName == "A" && $result['href'])) 
-									&& preg_match('/\binclude\b/', $result['class'])){	
-								$att		= ($tagName == "OBJECT" ? 'data' : 'href');						
-								$id			= str_replace('#', '', $result[$att]);
-								$doc		= $this->doc;
-								$xpath		= "//*[@id='$id']";
-								$includes	= $doc->xpath($xpath);
-								foreach ($includes as $include){
-									$include	= simplexml_load_string('<root1><root2>'.$include->asXML().'</root2></root1>'); // don't ask.
-									$tmp 		= $this->processNodes($include, $this->classes, false);
-									if (is_array($tmp)) $data = array_merge($data, $tmp);
-								}
-							}
-						}
-					}
-				}
-				$out[]	= $data;
-			}
-			
-			if (sizeof($out) > 1){
-				return $out;
-			}else if (isset($data)){
-				return $data;
-			}else{
-				return array();
-			}
-		}
-
-
-		private function getNodeValue($node, $className)
-		{
-
-			$tag_name	= strtoupper(dom_import_simplexml($node)->tagName);
-			$s			= false;
-			
-			// ignore DEL tags
-			if ($tag_name == 'DEL') return $s;
-			
-			// look up att map values
-			if (array_key_exists($className, $this->att_map)){
-				
-				foreach ($this->att_map[$className] as $map){					
-					if (preg_match("/$tag_name\|/", $map)){
-						$s	= ''.$node[array_pop($foo = explode('|', $map))];
-					}
-				}
-			}
-			
-			// if nothing and OBJ, try data.
-			if (!$s && $tag_name=='OBJECT' && $node['data'])	$s	= ''.$node['data'];
-			
-			// if nothing and IMG, try alt.
-			if (!$s && $tag_name=='IMG' && $node['alt'])	$s	= ''.$node['alt'];
-			
-			// if nothing and AREA, try alt.
-			if (!$s && $tag_name=='AREA' && $node['alt'])	$s	= ''.$node['alt'];
-			
-			//if nothing and not A, try title.
-			if (!$s && $tag_name!='A' && $node['title'])	$s	= ''.$node['title'];
-				
-			
-			// if nothing found, go with node text
-			$s	= ($s ? $s : implode(array_filter($node->xpath('child::node()'), array(&$this, "filterBlankValues")), ' '));			
-
-			// callbacks			
-			if (array_key_exists($className, $this->callbacks)){
-				$s	= preg_replace_callback('/.*/', $this->callbacks[$className], $s, 1);
-			}
-			
-			// trim and remove line breaks
-			if ($tag_name != 'PRE'){
-				$s	= trim(preg_replace('/[\r\n\t]+/', '', $s));
-				$s	= trim(preg_replace('/(\s{2})+/', ' ', $s));
-			}
-			
-			return $s;
-		}
-
-		private function filterBlankValues($s){
-			return preg_match("/\w+/", $s);
-		}
-		
-		
-		private function tidyThis($source)
-		{
-			switch ( $this->tidy_mode )
-			{
-				case 'exec':
-					$tmp_file	= $this->tmp_dir.md5($source).'.txt';
-					file_put_contents($tmp_file, $source);
-					exec("tidy -utf8 -indent -asxhtml -numeric -bare -quiet $tmp_file", $tidy);
-					unlink($tmp_file);
-					return implode("\n", $tidy);
-				break;
-				
-				case 'php':
-					$tidy 	= tidy_parse_string($source);
-					return tidy_clean_repair($tidy);
-				break;
-						
-				default:
-					return $source;
-				break;
-			}
-			
-		}
-		
-		
-		private function loadProfile($profile)
-		{
-			require_once("$profile.profile.php");
-		}
-		
-		
-		private function loadDoc($input_xml, $fragment=false)
-		{
-			$xml 		= simplexml_load_string($input_xml);
-			
-			$this->doc	= $xml;
-			
-			if ($fragment){
-				$doc	= $xml->xpath("//*[@id='$fragment']");
-				$xml	= simplexml_load_string($doc[0]->asXML());
-				$doc	= null;
-			}
-			
-			// base tag
-			if ($xml->head->base['href']) $this->base = $xml->head->base['href'];			
-
-			// xml:base attribute - PITA with SimpleXML
-			preg_match('/xml:base="(.*)"/', $xml->asXML(), $matches);
-			if (is_array($matches) && sizeof($matches)>1) $this->base = $matches[1];
-								
-			return 	$xml->xpath("//*[contains(concat(' ',normalize-space(@class),' '),' $this->root_class ')]");
-			
-		}
-		
-		
-		private function loadURL($url)
-		{
-			$this->url	= $url;
-			
-			if ($this->tidy_mode == 'proxy' && $this->tidy_proxy != ''){
-				$url	= $this->tidy_proxy . $url;
-			}
-		
-			return @file_get_contents($url);
-			
-		}
-		
-		
-		private function postProcess($profile, $s)
-		{
-			$required	= $this->required;
-			
-			if (is_array($s) && array_key_exists($required[0], $s)){
-				$s	= array($s);
-			}
-			
-			$s	= $this->dedupeSingles($s);
-			
-			if (function_exists('hKit_'.$profile.'_post')){
-				$s		= call_user_func('hKit_'.$profile.'_post', $s);
-			}
-			
-			$s	= $this->removeTextVals($s);
-			
-			return $s;
-		}
-		
-		
-		private function resolvePath($filepath)
-		{	// ugly code ahoy: needs a serious tidy up
-					
-			$filepath	= $filepath[0];
-			
-			$base 	= $this->base;
-			$url	= $this->url;
-			
-			if ($base != '' &&  strpos($base, '://') !== false)
-				$url	= $base;
-			
-			$r		= parse_url($url);
-			$domain	= $r['scheme'] . '://' . $r['host'];
-
-			if (!isset($r['path'])) $r['path'] = '/';
-			$path	= explode('/', $r['path']);
-			$file	= explode('/', $filepath);
-			$new	= array('');
-
-			if (strpos($filepath, '://') !== false || strpos($filepath, 'data:') !== false){
-				return $filepath;
-			}
-
-			if ($file[0] == ''){
-				// absolute path
-				return ''.$domain . implode('/', $file);
-			}else{
-				// relative path
-				if ($path[sizeof($path)-1] == '') array_pop($path);
-				if (strpos($path[sizeof($path)-1], '.') !== false) array_pop($path);
-
-				foreach ($file as $segment){
-					if ($segment == '..'){
-						array_pop($path);
-					}else{
-						$new[]	= $segment;
-					}
-				}
-				return ''.$domain . implode('/', $path) . implode('/', $new);
-			}	
-		}
-		
-		private function resolveEmail($v)
-		{
-			$parts	= parse_url($v[0]);
-			return ($parts['path']);
-		}
-		
-		
-		private function dedupeSingles($s)
-		{
-			$singles	= $this->singles;
-			
-			foreach ($s as &$item){
-				foreach ($singles as $classname){
-					if (array_key_exists($classname, $item) && is_array($item[$classname])){
-						if (isset($item[$classname][0])) $item[$classname]	= $item[$classname][0];
-					}
-				}
-			}
-			
-			return $s;
-		}
-		
-		private function removeTextVals($s)
-		{
-			foreach ($s as $key => &$val){
-				if ($key){
-					$k = $key;
-				}else{
-					$k = '';
-				}
-				
-				if (is_array($val)){
-					$val = $this->removeTextVals($val);
-				}else{
-					if ($k == 'text'){
-						$val = '';
-					}
-				}
-			}
-			
-			return array_filter($s);
-		}
-
-	}
-
-
-?>
\ No newline at end of file
diff --git a/plugins/OStatus/lib/discoveryhints.php b/plugins/OStatus/lib/discoveryhints.php
index db13793dd..1bb0ad2ae 100644
--- a/plugins/OStatus/lib/discoveryhints.php
+++ b/plugins/OStatus/lib/discoveryhints.php
@@ -63,49 +63,12 @@ class DiscoveryHints {
 
     static function hcardHints($body, $url)
     {
-        common_debug("starting tidy");
-
-        $body = self::_tidy($body);
-
-        common_debug("done with tidy");
-
-        set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/plugins/OStatus/extlib/hkit/');
-        require_once('hkit.class.php');
-
-        $h	= new hKit;
-
-        $hcards = $h->getByString('hcard', $body);
-
-        if (empty($hcards)) {
-            return array();
-        }
-
-        if (count($hcards) == 1) {
-            $hcard = $hcards[0];
-        } else {
-            foreach ($hcards as $try) {
-                if (array_key_exists('url', $try)) {
-                    if (is_string($try['url']) && $try['url'] == $url) {
-                        $hcard = $try;
-                        break;
-                    } else if (is_array($try['url'])) {
-                        foreach ($try['url'] as $tryurl) {
-                            if ($tryurl == $url) {
-                                $hcard = $try;
-                                break 2;
-                            }
-                        }
-                    }
-                }
-            }
-            // last chance; grab the first one
-            if (empty($hcard)) {
-                $hcard = $hcards[0];
-            }
-        }
+        $hcard = self::_hcard($body, $url);
 
         $hints = array();
 
+        // XXX: don't copy stuff into an array and then copy it again
+
         if (array_key_exists('nickname', $hcard)) {
             $hints['nickname'] = $hcard['nickname'];
         }
@@ -117,7 +80,7 @@ class DiscoveryHints {
         }
 
         if (array_key_exists('photo', $hcard)) {
-            $hints['avatar'] = $hcard['photo'];
+            $hints['avatar'] = $hcard['photo'][0];
         }
 
         if (array_key_exists('note', $hcard)) {
@@ -144,39 +107,142 @@ class DiscoveryHints {
         return $hints;
     }
 
-    private static function _tidy($body)
+    static function _hcard($body, $url)
     {
-        if (function_exists('tidy_parse_string')) {
-            common_debug("Tidying with extension");
-            $text = tidy_parse_string($body);
-            $text = tidy_clean_repair($text);
-            return $body;
-        } else if ($fullpath = self::_findProgram('tidy')) {
-            common_debug("Tidying with program $fullpath");
-            $tempfile = tempnam('/tmp', 'snht'); // statusnet hcard tidy
-            file_put_contents($tempfile, $source);
-            exec("$fullpath -utf8 -indent -asxhtml -numeric -bare -quiet $tempfile", $tidy);
-            unlink($tempfile);
-            return implode("\n", $tidy);
+        // DOMDocument::loadHTML may throw warnings on unrecognized elements.
+
+        $old = error_reporting(error_reporting() & ~E_WARNING);
+
+        $doc = new DOMDocument();
+        $doc->loadHTML($body);
+
+        error_reporting($old);
+
+        $xp = new DOMXPath($doc);
+
+        $hcardNodes = self::_getChildrenByClass($doc->documentElement, 'vcard', $xp);
+
+        $hcards = array();
+
+        for ($i = 0; $i < $hcardNodes->length; $i++) {
+
+            $hcardNode = $hcardNodes->item($i);
+
+            $hcard = self::_hcardFromNode($hcardNode, $xp, $url);
+
+            $hcards[] = $hcard;
+        }
+
+        $repr = null;
+
+        foreach ($hcards as $hcard) {
+            if (in_array($url, $hcard['url'])) {
+                $repr = $hcard;
+                break;
+            }
+        }
+
+        if (!is_null($repr)) {
+            return $repr;
+        } else if (count($hcards) > 0) {
+            return $hcards[0];
         } else {
-            common_debug("Not tidying.");
-            return $body;
+            return null;
         }
     }
 
-    private static function _findProgram($name)
+    function _getChildrenByClass($el, $cls, $xp)
+    {
+        // borrowed from hkit. Thanks dudes!
+
+        $qry = ".//*[contains(concat(' ',normalize-space(@class),' '),' $cls ')]";
+
+        $nodes = $xp->query($qry, $el);
+
+        return $nodes;
+    }
+
+    function _hcardFromNode($hcardNode, $xp, $base)
     {
-        $path = $_ENV['PATH'];
+        $hcard = array();
+
+        $hcard['url'] = array();
+
+        $urlNodes = self::_getChildrenByClass($hcardNode, 'url', $xp);
+
+        for ($j = 0; $j < $urlNodes->length; $j++) {
+
+            $urlNode = $urlNodes->item($j);
+
+            if ($urlNode->hasAttribute('href')) {
+                $url = $urlNode->getAttribute('href');
+            } else {
+                $url = $urlNode->textContent;
+            }
+
+            $hcard['url'][] = self::_rel2abs($url, $base);
+        }
+
+        $hcard['photo'] = array();
+
+        $photoNodes = self::_getChildrenByClass($hcardNode, 'photo', $xp);
+
+        for ($j = 0; $j < $photoNodes->length; $j++) {
+            $photoNode = $photoNodes->item($j);
+            if ($photoNode->hasAttribute('src')) {
+                $url = $photoNode->getAttribute('src');
+            } else if ($photoNode->hasAttribute('href')) {
+                $url = $photoNode->getAttribute('href');
+            } else {
+                $url = $photoNode->textContent;
+            }
+            $hcard['photo'][] = self::_rel2abs($url, $base);
+        }
+
+        $singles = array('nickname', 'note', 'fn', 'n', 'adr');
 
-        $parts = explode(':', $path);
+        foreach ($singles as $single) {
 
-        foreach ($parts as $part) {
-            $fullpath = $part . '/' . $name;
-            if (is_executable($fullpath)) {
-                return $fullpath;
+            $nodes = self::_getChildrenByClass($hcardNode, $single, $xp);
+
+            if ($nodes->length > 0) {
+                $node = $nodes->item(0);
+                $hcard[$single] = $node->textContent;
             }
         }
 
-        return null;
+        return $hcard;
+    }
+
+    // XXX: this is a first pass; we probably need
+    // to handle things like ../ and ./ and so on
+
+    static function _rel2abs($rel, $wrt)
+    {
+        $parts = parse_url($rel);
+
+        if ($parts === false) {
+            return false;
+        }
+
+        // If it's got a scheme, use it
+
+        if ($parts['scheme'] != '') {
+            return $rel;
+        }
+
+        $w = parse_url($wrt);
+
+        $base = $w['scheme'].'://'.$w['host'];
+
+        if ($rel[0] == '/') {
+            return $base.$rel;
+        }
+
+        $wp = explode('/', $w['path']);
+
+        array_pop($wp);
+
+        return $base.implode('/', $wp).'/'.$rel;
     }
 }
-- 
cgit v1.2.3-54-g00ecf


From 1e03968d911fe4bc757c01036365a5f544621088 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 19 Mar 2010 15:23:30 -0500
Subject: define a 'root' attribute for the channel or feed

---
 plugins/OStatus/lib/feeddiscovery.php | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

(limited to 'plugins/OStatus/lib')

diff --git a/plugins/OStatus/lib/feeddiscovery.php b/plugins/OStatus/lib/feeddiscovery.php
index 7de80b335..4809f9d35 100644
--- a/plugins/OStatus/lib/feeddiscovery.php
+++ b/plugins/OStatus/lib/feeddiscovery.php
@@ -73,6 +73,7 @@ class FeedDiscovery
     public $uri;
     public $type;
     public $feed;
+    public $root;
 
     /** Post-initialize query helper... */
     public function getLink($rel, $type=null)
@@ -83,7 +84,7 @@ class FeedDiscovery
 
     public function getAtomLink($rel, $type=null)
     {
-        return ActivityUtils::getLink($this->feed->documentElement, $rel, $type);
+        return ActivityUtils::getLink($this->root, $rel, $type);
     }
 
     /**
@@ -154,9 +155,27 @@ class FeedDiscovery
             $this->uri = $sourceurl;
             $this->type = $type;
             $this->feed = $feed;
+
+            $el = $this->feed->documentElement;
+
+            // Looking for the "root" element: RSS channel or Atom feed
+
+            if ($el->tagName == 'rss') {
+                $channels = $el->getElementsByTagName('channel');
+                if ($channels->length > 0) {
+                    $this->root = $channels->item(0);
+                } else {
+                    throw new FeedSubBadXmlException($sourceurl);
+                }
+            } else if ($el->tagName == 'feed') {
+                $this->root = $el;
+            } else {
+                throw new FeedSubBadXmlException($sourceurl);
+            }
+
             return $this->uri;
         } else {
-            throw new FeedSubBadXmlException($url);
+            throw new FeedSubBadXmlException($sourceurl);
         }
     }
 
-- 
cgit v1.2.3-54-g00ecf


From 5092f98c0d7a7db24189aaaf285b6670741fde39 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 19 Mar 2010 15:28:06 -0500
Subject: return empty hints if no hcard in the html

---
 plugins/OStatus/lib/discoveryhints.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'plugins/OStatus/lib')

diff --git a/plugins/OStatus/lib/discoveryhints.php b/plugins/OStatus/lib/discoveryhints.php
index 1bb0ad2ae..9102788e6 100644
--- a/plugins/OStatus/lib/discoveryhints.php
+++ b/plugins/OStatus/lib/discoveryhints.php
@@ -65,6 +65,10 @@ class DiscoveryHints {
     {
         $hcard = self::_hcard($body, $url);
 
+        if (empty($hcard)) {
+            return array();
+        }
+
         $hints = array();
 
         // XXX: don't copy stuff into an array and then copy it again
-- 
cgit v1.2.3-54-g00ecf


From db0cf50f658a91d0d0a019256e6e85d73b7a3ff6 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 19 Mar 2010 15:54:16 -0700
Subject: Avoid notices for accessing undefined array indices in hcard
 processing

---
 plugins/OStatus/lib/discoveryhints.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/OStatus/lib')

diff --git a/plugins/OStatus/lib/discoveryhints.php b/plugins/OStatus/lib/discoveryhints.php
index 9102788e6..80cfbbf15 100644
--- a/plugins/OStatus/lib/discoveryhints.php
+++ b/plugins/OStatus/lib/discoveryhints.php
@@ -102,7 +102,7 @@ class DiscoveryHints {
         if (array_key_exists('url', $hcard)) {
             if (is_string($hcard['url'])) {
                 $hints['homepage'] = $hcard['url'];
-            } else if (is_array($hcard['url'])) {
+            } else if (is_array($hcard['url']) && !empty($hcard['url'])) {
                 // HACK get the last one; that's how our hcards look
                 $hints['homepage'] = $hcard['url'][count($hcard['url'])-1];
             }
@@ -231,7 +231,7 @@ class DiscoveryHints {
 
         // If it's got a scheme, use it
 
-        if ($parts['scheme'] != '') {
+        if (!empty($parts['scheme'])) {
             return $rel;
         }
 
-- 
cgit v1.2.3-54-g00ecf


From a20880ee1e526efafd89ad9b823089f71245c481 Mon Sep 17 00:00:00 2001
From: James Walker <walkah@walkah.net>
Date: Mon, 22 Mar 2010 13:44:05 -0400
Subject: Fixing HTTP Header LRDD parsing (sites in subdirectories need this)

---
 plugins/OStatus/lib/discovery.php  | 2 +-
 plugins/OStatus/lib/linkheader.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/OStatus/lib')

diff --git a/plugins/OStatus/lib/discovery.php b/plugins/OStatus/lib/discovery.php
index 44fad62fb..7187c1f3e 100644
--- a/plugins/OStatus/lib/discovery.php
+++ b/plugins/OStatus/lib/discovery.php
@@ -195,7 +195,7 @@ class Discovery_LRDD_Link_Header implements Discovery_LRDD
             //            return false;
         }
 
-        return Discovery_LRDD_Link_Header::parseHeader($link_header);
+        return array(Discovery_LRDD_Link_Header::parseHeader($link_header));
     }
 
     protected static function parseHeader($header)
diff --git a/plugins/OStatus/lib/linkheader.php b/plugins/OStatus/lib/linkheader.php
index afcd66d26..cd78d31ce 100644
--- a/plugins/OStatus/lib/linkheader.php
+++ b/plugins/OStatus/lib/linkheader.php
@@ -11,7 +11,7 @@ class LinkHeader
         preg_match('/^<[^>]+>/', $str, $uri_reference);
         //if (empty($uri_reference)) return;
 
-        $this->uri = trim($uri_reference[0], '<>');
+        $this->href = trim($uri_reference[0], '<>');
         $this->rel = array();
         $this->type = null;
 
-- 
cgit v1.2.3-54-g00ecf


From 27bfd1211d64298ee3c3b2d82d7b38ca1e1167ad Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 22 Mar 2010 12:17:45 -0700
Subject: Math_BigInteger doesn't correctly handle
 serialization/deserialization for a value of 0, which can end up spewing
 notices to output and otherwise intefering with Salmon signature setup and
 verification when using memcached. Worked around this with a subclass that
 fixes the wakeup, used for the stored 0 value in the subclassed Crypt_RSA.

---
 plugins/OStatus/classes/Magicsig.php        | 10 ++++------
 plugins/OStatus/lib/safecrypt_rsa.php       | 18 ++++++++++++++++++
 plugins/OStatus/lib/safemath_biginteger.php | 20 ++++++++++++++++++++
 3 files changed, 42 insertions(+), 6 deletions(-)
 create mode 100644 plugins/OStatus/lib/safecrypt_rsa.php
 create mode 100644 plugins/OStatus/lib/safemath_biginteger.php

(limited to 'plugins/OStatus/lib')

diff --git a/plugins/OStatus/classes/Magicsig.php b/plugins/OStatus/classes/Magicsig.php
index 5705ecc11..87c684c93 100644
--- a/plugins/OStatus/classes/Magicsig.php
+++ b/plugins/OStatus/classes/Magicsig.php
@@ -27,8 +27,6 @@
  * @link      http://status.net/
  */
 
-require_once 'Crypt/RSA.php';
-
 class Magicsig extends Memcached_DataObject
 {
 
@@ -102,16 +100,16 @@ class Magicsig extends Memcached_DataObject
 
     public function generate($user_id)
     {
-        $rsa = new Crypt_RSA();
+        $rsa = new SafeCrypt_RSA();
         
         $keypair = $rsa->createKey();
 
         $rsa->loadKey($keypair['privatekey']);
 
-        $this->privateKey = new Crypt_RSA();
+        $this->privateKey = new SafeCrypt_RSA();
         $this->privateKey->loadKey($keypair['privatekey']);
 
-        $this->publicKey = new Crypt_RSA();
+        $this->publicKey = new SafeCrypt_RSA();
         $this->publicKey->loadKey($keypair['publickey']);
         
         $this->user_id = $user_id;
@@ -163,7 +161,7 @@ class Magicsig extends Memcached_DataObject
     {
         common_log(LOG_DEBUG, "Adding ".$type." key: (".$mod .', '. $exp .")");
 
-        $rsa = new Crypt_RSA();
+        $rsa = new SafeCrypt_RSA();
         $rsa->signatureMode = CRYPT_RSA_SIGNATURE_PKCS1;
         $rsa->setHash('sha256');
         $rsa->modulus = new Math_BigInteger(base64_url_decode($mod), 256);
diff --git a/plugins/OStatus/lib/safecrypt_rsa.php b/plugins/OStatus/lib/safecrypt_rsa.php
new file mode 100644
index 000000000..f3aa2c928
--- /dev/null
+++ b/plugins/OStatus/lib/safecrypt_rsa.php
@@ -0,0 +1,18 @@
+<?php
+
+require_once 'Crypt/RSA.php';
+
+/**
+ * Crypt_RSA stores a Math_BigInteger with value 0, which triggers a bug
+ * in Math_BigInteger's wakeup function which spews notices to log or output.
+ * This wrapper replaces it with a version that survives serialization.
+ */
+class SafeCrypt_RSA extends Crypt_RSA
+{
+    function __construct()
+    {
+        parent::__construct();
+        $this->zero = new SafeMath_BigInteger();
+    }
+}
+
diff --git a/plugins/OStatus/lib/safemath_biginteger.php b/plugins/OStatus/lib/safemath_biginteger.php
new file mode 100644
index 000000000..c05e24d1e
--- /dev/null
+++ b/plugins/OStatus/lib/safemath_biginteger.php
@@ -0,0 +1,20 @@
+<?php
+
+require_once 'Math/BigInteger.php';
+
+/**
+ * Crypt_RSA stores a Math_BigInteger with value 0, which triggers a bug
+ * in Math_BigInteger's wakeup function which spews notices to log or output.
+ * This wrapper replaces it with a version that survives serialization.
+ */
+class SafeMath_BigInteger extends Math_BigInteger
+{
+    function __wakeup()
+    {
+        if ($this->hex == '') {
+            $this->hex = '0';
+        }
+        parent::__wakeup();
+    }
+}
+
-- 
cgit v1.2.3-54-g00ecf


From 5f32cf32cd7d4a5df7ba64d4f1e7d9edee8d418c Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 23 Mar 2010 14:18:45 -0700
Subject: Don't spew XML parse warnings to output when checking a remote XRD
 page

---
 plugins/OStatus/lib/xrd.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'plugins/OStatus/lib')

diff --git a/plugins/OStatus/lib/xrd.php b/plugins/OStatus/lib/xrd.php
index aa13ef024..34b28790b 100644
--- a/plugins/OStatus/lib/xrd.php
+++ b/plugins/OStatus/lib/xrd.php
@@ -53,7 +53,14 @@ class XRD
         $xrd = new XRD();
 
         $dom = new DOMDocument();
-        if (!$dom->loadXML($xml)) {
+
+        // Don't spew XML warnings to output
+        $old = error_reporting();
+        error_reporting($old & ~E_WARNING);
+        $ok = $dom->loadXML($xml);
+        error_reporting($old);
+
+        if (!$ok) {
             throw new Exception("Invalid XML");
         }
         $xrd_element = $dom->getElementsByTagName('XRD')->item(0);
-- 
cgit v1.2.3-54-g00ecf


From 10410907a0a6f1af9fb18cb3341db792baa49cf3 Mon Sep 17 00:00:00 2001
From: James Walker <walkah@walkah.net>
Date: Wed, 24 Mar 2010 14:27:35 -0400
Subject: A bit safer checking in the keypair parsing

---
 plugins/OStatus/lib/magicenvelope.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'plugins/OStatus/lib')

diff --git a/plugins/OStatus/lib/magicenvelope.php b/plugins/OStatus/lib/magicenvelope.php
index 9266cab5c..799b5e307 100644
--- a/plugins/OStatus/lib/magicenvelope.php
+++ b/plugins/OStatus/lib/magicenvelope.php
@@ -59,12 +59,21 @@ class MagicEnvelope
         }
         if ($xrd->links) {
             if ($link = Discovery::getService($xrd->links, Magicsig::PUBLICKEYREL)) {
-                list($type, $keypair) = explode(',', $link['href']);
-                if (empty($keypair)) {
+                $keypair = false;
+                $parts = explode(',', $link['href']);
+                if (count($parts) == 2) {
+                    $keypair = $parts[1];
+                } else {
                     // Backwards compatibility check for separator bug in 0.9.0
-                    list($type, $keypair) = explode(';', $link['href']);
+                    $parts = explode(';', $link['href']);
+                    if (count($parts) == 2) {
+                        $keypair = $parts[1];
+                    }
+                }
+                
+                if ($keypair) {
+                    return $keypair;
                 }
-                return $keypair;
             }
         }
         throw new Exception('Unable to locate signer public key');
-- 
cgit v1.2.3-54-g00ecf


From cfca789b34eeac6c531c4c7aac622ed2e2510390 Mon Sep 17 00:00:00 2001
From: James Walker <walkah@walkah.net>
Date: Wed, 24 Mar 2010 15:18:41 -0400
Subject: Updated Math_Biginteger from upstream - removing safe* workarounds

---
 plugins/OStatus/classes/Magicsig.php        |  8 ++++----
 plugins/OStatus/extlib/Math/BigInteger.php  |  8 ++++----
 plugins/OStatus/lib/safecrypt_rsa.php       | 18 ------------------
 plugins/OStatus/lib/safemath_biginteger.php | 20 --------------------
 4 files changed, 8 insertions(+), 46 deletions(-)
 delete mode 100644 plugins/OStatus/lib/safecrypt_rsa.php
 delete mode 100644 plugins/OStatus/lib/safemath_biginteger.php

(limited to 'plugins/OStatus/lib')

diff --git a/plugins/OStatus/classes/Magicsig.php b/plugins/OStatus/classes/Magicsig.php
index 1a9541495..c7dd17c26 100644
--- a/plugins/OStatus/classes/Magicsig.php
+++ b/plugins/OStatus/classes/Magicsig.php
@@ -108,16 +108,16 @@ class Magicsig extends Memcached_DataObject
 
     public function generate($user_id)
     {
-        $rsa = new SafeCrypt_RSA();
+        $rsa = new Crypt_RSA();
         
         $keypair = $rsa->createKey();
 
         $rsa->loadKey($keypair['privatekey']);
 
-        $this->privateKey = new SafeCrypt_RSA();
+        $this->privateKey = new Crypt_RSA();
         $this->privateKey->loadKey($keypair['privatekey']);
 
-        $this->publicKey = new SafeCrypt_RSA();
+        $this->publicKey = new Crypt_RSA();
         $this->publicKey->loadKey($keypair['publickey']);
         
         $this->user_id = $user_id;
@@ -169,7 +169,7 @@ class Magicsig extends Memcached_DataObject
     {
         common_log(LOG_DEBUG, "Adding ".$type." key: (".$mod .', '. $exp .")");
 
-        $rsa = new SafeCrypt_RSA();
+        $rsa = new Crypt_RSA();
         $rsa->signatureMode = CRYPT_RSA_SIGNATURE_PKCS1;
         $rsa->setHash('sha256');
         $rsa->modulus = new Math_BigInteger(base64_url_decode($mod), 256);
diff --git a/plugins/OStatus/extlib/Math/BigInteger.php b/plugins/OStatus/extlib/Math/BigInteger.php
index 9733351d4..4373805f9 100644
--- a/plugins/OStatus/extlib/Math/BigInteger.php
+++ b/plugins/OStatus/extlib/Math/BigInteger.php
@@ -67,7 +67,7 @@
  * @author     Jim Wigginton <terrafrost@php.net>
  * @copyright  MMVI Jim Wigginton
  * @license    http://www.gnu.org/licenses/lgpl.txt
- * @version    $Id: BigInteger.php,v 1.31 2010/03/01 17:28:19 terrafrost Exp $
+ * @version    $Id: BigInteger.php,v 1.33 2010/03/22 22:32:03 terrafrost Exp $
  * @link       http://pear.php.net/package/Math_BigInteger
  */
 
@@ -294,7 +294,7 @@ class Math_BigInteger {
                 $this->value = array();
         }
 
-        if ($x === 0) {
+        if (empty($x)) {
             return;
         }
 
@@ -718,7 +718,7 @@ class Math_BigInteger {
      *
      * Will be called, automatically, when serialize() is called on a Math_BigInteger object.
      *
-     * @see __wakeup
+     * @see __wakeup()
      * @access public
      */
     function __sleep()
@@ -740,7 +740,7 @@ class Math_BigInteger {
      *
      * Will be called, automatically, when unserialize() is called on a Math_BigInteger object.
      *
-     * @see __sleep
+     * @see __sleep()
      * @access public
      */
     function __wakeup()
diff --git a/plugins/OStatus/lib/safecrypt_rsa.php b/plugins/OStatus/lib/safecrypt_rsa.php
deleted file mode 100644
index f3aa2c928..000000000
--- a/plugins/OStatus/lib/safecrypt_rsa.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-require_once 'Crypt/RSA.php';
-
-/**
- * Crypt_RSA stores a Math_BigInteger with value 0, which triggers a bug
- * in Math_BigInteger's wakeup function which spews notices to log or output.
- * This wrapper replaces it with a version that survives serialization.
- */
-class SafeCrypt_RSA extends Crypt_RSA
-{
-    function __construct()
-    {
-        parent::__construct();
-        $this->zero = new SafeMath_BigInteger();
-    }
-}
-
diff --git a/plugins/OStatus/lib/safemath_biginteger.php b/plugins/OStatus/lib/safemath_biginteger.php
deleted file mode 100644
index c05e24d1e..000000000
--- a/plugins/OStatus/lib/safemath_biginteger.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-require_once 'Math/BigInteger.php';
-
-/**
- * Crypt_RSA stores a Math_BigInteger with value 0, which triggers a bug
- * in Math_BigInteger's wakeup function which spews notices to log or output.
- * This wrapper replaces it with a version that survives serialization.
- */
-class SafeMath_BigInteger extends Math_BigInteger
-{
-    function __wakeup()
-    {
-        if ($this->hex == '') {
-            $this->hex = '0';
-        }
-        parent::__wakeup();
-    }
-}
-
-- 
cgit v1.2.3-54-g00ecf


From c6c451019253ca5b8be94e8bcc9722d373a10840 Mon Sep 17 00:00:00 2001
From: James Walker <walkah@walkah.net>
Date: Fri, 26 Mar 2010 13:37:46 -0400
Subject: move base64_url_(encode|decode) to static functions in Magicsig

---
 plugins/OStatus/classes/Magicsig.php  | 34 ++++++++++++++++++----------------
 plugins/OStatus/lib/magicenvelope.php |  6 +++---
 2 files changed, 21 insertions(+), 19 deletions(-)

(limited to 'plugins/OStatus/lib')

diff --git a/plugins/OStatus/classes/Magicsig.php b/plugins/OStatus/classes/Magicsig.php
index 864fef628..f8c56a05f 100644
--- a/plugins/OStatus/classes/Magicsig.php
+++ b/plugins/OStatus/classes/Magicsig.php
@@ -129,11 +129,11 @@ class Magicsig extends Memcached_DataObject
 
     public function toString($full_pair = true)
     {
-        $mod = base64_url_encode($this->publicKey->modulus->toBytes());
-        $exp = base64_url_encode($this->publicKey->exponent->toBytes());
+        $mod = Magicsig::base64_url_encode($this->publicKey->modulus->toBytes());
+        $exp = Magicsig::base64_url_encode($this->publicKey->exponent->toBytes());
         $private_exp = '';
         if ($full_pair && $this->privateKey->exponent->toBytes()) {
-            $private_exp = '.' . base64_url_encode($this->privateKey->exponent->toBytes());
+            $private_exp = '.' . Magicsig::base64_url_encode($this->privateKey->exponent->toBytes());
         }
 
         return 'RSA.' . $mod . '.' . $exp . $private_exp; 
@@ -174,9 +174,9 @@ class Magicsig extends Memcached_DataObject
         $rsa = new Crypt_RSA();
         $rsa->signatureMode = CRYPT_RSA_SIGNATURE_PKCS1;
         $rsa->setHash('sha256');
-        $rsa->modulus = new Math_BigInteger(base64_url_decode($mod), 256);
+        $rsa->modulus = new Math_BigInteger(Magicsig::base64_url_decode($mod), 256);
         $rsa->k = strlen($rsa->modulus->toBytes());
-        $rsa->exponent = new Math_BigInteger(base64_url_decode($exp), 256);
+        $rsa->exponent = new Math_BigInteger(Magicsig::base64_url_decode($exp), 256);
 
         if ($type == 'private') {
             $this->privateKey = $rsa;
@@ -203,23 +203,25 @@ class Magicsig extends Memcached_DataObject
     public function sign($bytes)
     {
         $sig = $this->privateKey->sign($bytes);
-        return base64_url_encode($sig);
+        return Magicsig::base64_url_encode($sig);
     }
 
     public function verify($signed_bytes, $signature)
     {
-        $signature = base64_url_decode($signature);
+        $signature = Magicsig::base64_url_decode($signature);
         return $this->publicKey->verify($signed_bytes, $signature);
     }
-        
-}
 
-function base64_url_encode($input)
-{
-    return strtr(base64_encode($input), '+/', '-_');
-}
 
-function base64_url_decode($input)
-{
-    return base64_decode(strtr($input, '-_', '+/'));
+    public static function base64_url_encode($input)
+    {
+        return strtr(base64_encode($input), '+/', '-_');
+    }
+
+    public static function base64_url_decode($input)
+    {
+        return base64_decode(strtr($input, '-_', '+/'));
+    }
 }
+
+
diff --git a/plugins/OStatus/lib/magicenvelope.php b/plugins/OStatus/lib/magicenvelope.php
index 799b5e307..f39686b71 100644
--- a/plugins/OStatus/lib/magicenvelope.php
+++ b/plugins/OStatus/lib/magicenvelope.php
@@ -83,7 +83,7 @@ class MagicEnvelope
     public function signMessage($text, $mimetype, $keypair)
     {
         $signature_alg = Magicsig::fromString($keypair);
-        $armored_text = base64_url_encode($text);
+        $armored_text = Magicsig::base64_url_encode($text);
 
         return array(
             'data' => $armored_text,
@@ -121,7 +121,7 @@ class MagicEnvelope
     public function unfold($env)
     {
         $dom = new DOMDocument();
-        $dom->loadXML(base64_url_decode($env['data']));
+        $dom->loadXML(Magicsig::base64_url_decode($env['data']));
 
         if ($dom->documentElement->tagName != 'entry') {
             return false;
@@ -178,7 +178,7 @@ class MagicEnvelope
             return false;
         }
 
-        $text = base64_url_decode($env['data']);
+        $text = Magicsig::base64_url_decode($env['data']);
         $signer_uri = $this->getAuthor($text);
 
         try {
-- 
cgit v1.2.3-54-g00ecf


From 5f5d9518bdc5daec5a9250a852777d3015856c78 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 4 May 2010 17:11:43 -0700
Subject: Avoid spewing giant debug backtrace into exception in certain OStatus
 subscription failure cases.

The code pattern 'new XXXException($e)' to chain exceptions doesn't actually work as intended, as exceptions are actually expecting a string message here.
This caused an implicit string conversion from HTTP_Request2_Exception, which is a PEAR_Exception, which defines an absurdly detailed __toString() method including a giant HTML table with a backtrace if you happen to be on a web request.
Simply passing $e->getMessage() instead clears this up, as we'll get the nice short message like 'Couldn't connect to tcp://blahblah:80'
---
 plugins/OStatus/lib/feeddiscovery.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/OStatus/lib')

diff --git a/plugins/OStatus/lib/feeddiscovery.php b/plugins/OStatus/lib/feeddiscovery.php
index 4809f9d35..4ac243832 100644
--- a/plugins/OStatus/lib/feeddiscovery.php
+++ b/plugins/OStatus/lib/feeddiscovery.php
@@ -104,7 +104,7 @@ class FeedDiscovery
             $response = $client->get($url);
         } catch (HTTP_Request2_Exception $e) {
             common_log(LOG_ERR, __METHOD__ . " Failure for $url - " . $e->getMessage());
-            throw new FeedSubBadURLException($e);
+            throw new FeedSubBadURLException($e->getMessage());
         }
 
         if ($htmlOk) {
-- 
cgit v1.2.3-54-g00ecf


From 1999b836c0681c44171d849028fb2d5d0c3d01b8 Mon Sep 17 00:00:00 2001
From: James Walker <walkah@walkah.net>
Date: Fri, 14 May 2010 16:43:21 -0400
Subject: accept either salmon endpoint (until they're unified in the spec)

---
 plugins/OStatus/lib/discoveryhints.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins/OStatus/lib')

diff --git a/plugins/OStatus/lib/discoveryhints.php b/plugins/OStatus/lib/discoveryhints.php
index 80cfbbf15..ca54a0f5f 100644
--- a/plugins/OStatus/lib/discoveryhints.php
+++ b/plugins/OStatus/lib/discoveryhints.php
@@ -30,6 +30,7 @@ class DiscoveryHints {
             case Discovery::PROFILEPAGE:
                 $hints['profileurl'] = $link['href'];
                 break;
+            case Salmon::NS_MENTIONS:
             case Salmon::NS_REPLIES:
                 $hints['salmon'] = $link['href'];
                 break;
-- 
cgit v1.2.3-54-g00ecf


From cbf2e7cfea6c4360f9cc9037b242f2508964ccac Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 21 May 2010 10:18:13 -0700
Subject: Avoid PHP notice about undefined array index when no avatar photo
 available from Google profile

---
 plugins/OStatus/lib/discoveryhints.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/OStatus/lib')

diff --git a/plugins/OStatus/lib/discoveryhints.php b/plugins/OStatus/lib/discoveryhints.php
index ca54a0f5f..34c9be277 100644
--- a/plugins/OStatus/lib/discoveryhints.php
+++ b/plugins/OStatus/lib/discoveryhints.php
@@ -84,7 +84,7 @@ class DiscoveryHints {
             $hints['fullname'] = implode(' ', $hcard['n']);
         }
 
-        if (array_key_exists('photo', $hcard)) {
+        if (array_key_exists('photo', $hcard) && count($hcard['photo'])) {
             $hints['avatar'] = $hcard['photo'][0];
         }
 
-- 
cgit v1.2.3-54-g00ecf


From 41e9dba7297d43b7de0cb7665901869910d1047a Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 4 Jun 2010 11:48:54 -0700
Subject: OStatus plugin: Rolling batch queueing for PuSH output to >50
 subscribing sites. Keeps latency down for other things enqueued while we
 work...

---
 plugins/OStatus/OStatusPlugin.php           |  2 ++
 plugins/OStatus/classes/HubSub.php          | 20 +++++++++++++++++++
 plugins/OStatus/lib/ostatusqueuehandler.php | 31 ++++++++++++++++++++++++++++-
 3 files changed, 52 insertions(+), 1 deletion(-)

(limited to 'plugins/OStatus/lib')

diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index 5a657c83d..c61e2cc5f 100644
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -87,6 +87,8 @@ class OStatusPlugin extends Plugin
 
         // Outgoing from our internal PuSH hub
         $qm->connect('hubconf', 'HubConfQueueHandler');
+        $qm->connect('hubprep', 'HubPrepQueueHandler');
+
         $qm->connect('hubout', 'HubOutQueueHandler');
 
         // Outgoing Salmon replies (when we don't need a return value)
diff --git a/plugins/OStatus/classes/HubSub.php b/plugins/OStatus/classes/HubSub.php
index 9748b4a56..7db528a4e 100644
--- a/plugins/OStatus/classes/HubSub.php
+++ b/plugins/OStatus/classes/HubSub.php
@@ -304,6 +304,26 @@ class HubSub extends Memcached_DataObject
         $qm->enqueue($data, 'hubout');
     }
 
+    /**
+     * Queue up a large batch of pushes to multiple subscribers
+     * for this same topic update.
+     * 
+     * If queues are disabled, this will run immediately.
+     * 
+     * @param string $atom well-formed Atom feed
+     * @param array $pushCallbacks list of callback URLs
+     */
+    function bulkDistribute($atom, $pushCallbacks)
+    {
+        $data = array('atom' => $atom,
+                      'topic' => $this->topic,
+                      'pushCallbacks' => $pushCallbacks);
+        common_log(LOG_INFO, "Queuing PuSH batch: $this->topic to " .
+                             count($pushCallbacks) . " sites");
+        $qm = QueueManager::get();
+        $qm->enqueue($data, 'hubprep');
+    }
+
     /**
      * Send a 'fat ping' to the subscriber's callback endpoint
      * containing the given Atom feed chunk.
diff --git a/plugins/OStatus/lib/ostatusqueuehandler.php b/plugins/OStatus/lib/ostatusqueuehandler.php
index d1e58f1d6..8905d2e21 100644
--- a/plugins/OStatus/lib/ostatusqueuehandler.php
+++ b/plugins/OStatus/lib/ostatusqueuehandler.php
@@ -25,6 +25,18 @@
  */
 class OStatusQueueHandler extends QueueHandler
 {
+    // If we have more than this many subscribing sites on a single feed,
+    // break up the PuSH distribution into smaller batches which will be
+    // rolled into the queue progressively. This reduces disruption to
+    // other, shorter activities being enqueued while we work.
+    const MAX_UNBATCHED = 50;
+
+    // Each batch (a 'hubprep' entry) will have this many items.
+    // Selected to provide a balance between queue packet size
+    // and number of batches that will end up getting processed.
+    // For 20,000 target sites, 1000 should work acceptably.
+    const BATCH_SIZE = 1000;
+
     function transport()
     {
         return 'ostatus';
@@ -147,14 +159,31 @@ class OStatusQueueHandler extends QueueHandler
 
     /**
      * Queue up direct feed update pushes to subscribers on our internal hub.
+     * If there are a large number of subscriber sites, intermediate bulk
+     * distribution triggers may be queued.
+     * 
      * @param string $atom update feed, containing only new/changed items
      * @param HubSub $sub open query of subscribers
      */
     function pushFeedInternal($atom, $sub)
     {
         common_log(LOG_INFO, "Preparing $sub->N PuSH distribution(s) for $sub->topic");
+        $n = 0;
+        $batch = array();
         while ($sub->fetch()) {
-            $sub->distribute($atom);
+            $n++;
+            if ($n < self::MAX_UNBATCHED) {
+                $sub->distribute($atom);
+            } else {
+                $batch[] = $sub->callback;
+                if (count($batch) >= self::BATCH_SIZE) {
+                    $sub->bulkDistribute($atom, $batch);
+                    $batch = array();
+                }
+            }
+        }
+        if (count($batch) >= 0) {
+            $sub->bulkDistribute($atom, $batch);
         }
     }
 
-- 
cgit v1.2.3-54-g00ecf