From fcb614d0eb1f98bf8704654ed06e1f9d9733d359 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Sun, 21 Mar 2010 16:25:12 -0700
Subject: [PATCH] Pull <atom:author> info as well as <activity:actor> when we
 have an old-style ActivityStreams feed. This fixes subscription setup for
 Cliqset feeds, which currently have a bogus activity:actor/atom:id but a good
 atom:author/atom:uri

---
 lib/activityobject.php                      | 21 ++++++++++++++++++--
 lib/activityutils.php                       | 22 +++++++++++++++++++++
 plugins/OStatus/classes/Ostatus_profile.php |  6 +-----
 3 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/lib/activityobject.php b/lib/activityobject.php
index e5cea727b7..0a358ccabb 100644
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -156,7 +156,11 @@ class ActivityObject
     {
         $this->type  = self::PERSON; // XXX: is this fair?
         $this->title = $this->_childContent($element, self::NAME);
-        $this->id    = $this->_childContent($element, self::URI);
+
+        $id = $this->_childContent($element, self::URI);
+        if (ActivityUtils::validateUri($id)) {
+            $this->id = $id;
+        }
 
         if (empty($this->id)) {
             $email = $this->_childContent($element, self::EMAIL);
@@ -169,6 +173,15 @@ class ActivityObject
 
     private function _fromAtomEntry($element)
     {
+        if ($element->localName == 'actor') {
+            // Old-fashioned <activity:actor>...
+            // First pull anything from <author>, then we'll add on top.
+            $author = ActivityUtils::child($element->parentNode, 'author');
+            if ($author) {
+                $this->_fromAuthor($author);
+            }
+        }
+
         $this->type = $this->_childContent($element, Activity::OBJECTTYPE,
                                            Activity::SPEC);
 
@@ -176,7 +189,11 @@ class ActivityObject
             $this->type = ActivityObject::NOTE;
         }
 
-        $this->id      = $this->_childContent($element, self::ID);
+        $id = $this->_childContent($element, self::ID);
+        if (ActivityUtils::validateUri($id)) {
+            $this->id = $id;
+        }
+
         $this->summary = ActivityUtils::childHtmlContent($element, self::SUMMARY);
         $this->content = ActivityUtils::getContent($element);
 
diff --git a/lib/activityutils.php b/lib/activityutils.php
index c85a3db556..a7e99fb11e 100644
--- a/lib/activityutils.php
+++ b/lib/activityutils.php
@@ -240,4 +240,26 @@ class ActivityUtils
             throw new ClientException(_("Can't handle embedded Base64 content yet."));
         }
     }
+
+    /**
+     * Is this a valid URI for remote profile/notice identification?
+     * Does not have to be a resolvable URL.
+     * @param string $uri
+     * @return boolean
+     */
+    static function validateUri($uri)
+    {
+        if (Validate::uri($uri)) {
+            return true;
+        }
+
+        // Possibly an upstream bug; tag: URIs aren't validated properly
+        // unless you explicitly ask for them. All other schemes are accepted
+        // for basic URI validation without asking.
+        if (Validate::uri($uri, array('allowed_scheme' => array('tag')))) {
+            return true;
+        }
+
+        return false;
+    }
 }
diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index 5595a9d298..e33509c471 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -1170,11 +1170,7 @@ class Ostatus_profile extends Memcached_DataObject
     protected static function getActivityObjectProfileURI($object)
     {
         if ($object->id) {
-            // Possibly an upstream bug; tag: URIs are rejected unless you
-            // explicitly ask for them. All other schemes are accepted for
-            // basic URI validation without asking.
-            if (Validate::uri($object->id) ||
-                Validate::uri($object->id, array('allowed_scheme' => array('tag')))) {
+            if (ActivityUtils::validateUri($object->id)) {
                 return $object->id;
             }
         }