Improve ShownoticeAction remote redirect code

[quix0rs-gnu-social.git] / classes / Notice.php

diff --git a/classes/Notice.php b/classes/Notice.php
index cdf6a202320a7f7619d9b7e673f449f2a0144b6a..e46ed227a179cbb4cd4f9119a2b2bcb4a7e13ffd 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -213,7 +213,19 @@ class Notice extends Managed_DataObject
     public function getUrl()
     {
         // The risk is we start having empty urls and non-http uris...
-        return $this->url ?: $this->uri;
+        // and we can't really handle any other protocol right now.
+        switch (true) {
+        case common_valid_http_url($this->url): // should we allow non-http/https URLs?
+            return $this->url;
+        case $this->isLocal():
+            // let's generate a valid link to our locally available notice on demand
+            return common_local_url('shownotice', array('notice' => $this->id), null, null, false);
+        case common_valid_http_url($this->uri):
+            return $this->uri;
+        default:
+            common_debug('No URL available for notice: id='.$this->id);
+            throw new InvalidUrlException($this->url);
+        }
     }
 
     public function get_object_type($canonical=false) {
@@ -416,6 +428,16 @@ class Notice extends Managed_DataObject
             $notice->created = common_sql_now();
         }
 
+        if (!$notice->isLocal()) {
+            // Only do these checks for non-local notices. Local notices will generate these values later.
+            if (!common_valid_http_url($url)) {
+                common_debug('Bad notice URL: ['.$url.'], URI: ['.$uri.']. Cannot link back to original! This is normal for shared notices etc.');
+            }
+            if (empty($uri)) {
+                throw new ServerException('No URI for remote notice. Cannot accept that.');
+            }
+        }
+
         $notice->content = $final;
 
         $notice->source = $source;
@@ -584,8 +606,10 @@ class Notice extends Managed_DataObject
 
             $changed = false;
 
-            if (empty($uri)) {
-                $notice->uri = sprintf('%s:%s=%d:%s=%s',
+            // We can only get here if it's a local notice, since remote notices
+            // should've bailed out earlier due to lacking a URI.
+            if (empty($notice->uri)) {
+                $notice->uri = sprintf('%s%s=%d:%s=%s',
                                     TagURI::mint(),
                                     'noticeId', $notice->id,
                                     'objectType', $notice->get_object_type(true));