From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 18 Aug 2017 01:21:59 +0000 (+0200)
Subject: Make ActivityPub::TagManager#local_uri? recognize local URIs with ports (#4628)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=4edf9d849f5241aed42042577c889549a5b6beaa;p=mastodon.git

Make ActivityPub::TagManager#local_uri? recognize local URIs with ports (#4628)
---

diff --git a/app/lib/activitypub/tag_manager.rb b/app/lib/activitypub/tag_manager.rb
index bd5dddcac..3d7f08cd3 100644
--- a/app/lib/activitypub/tag_manager.rb
+++ b/app/lib/activitypub/tag_manager.rb
@@ -70,7 +70,10 @@ class ActivityPub::TagManager
   end
 
   def local_uri?(uri)
-    host = Addressable::URI.parse(uri).normalized_host
+    uri  = Addressable::URI.parse(uri)
+    host = uri.normalized_host
+    host = "#{host}:#{uri.port}" if uri.port
+
     !host.nil? && (::TagManager.instance.local_domain?(host) || ::TagManager.instance.web_domain?(host))
   end