Merge branch 'develop' into 'mastopost'

# Conflicts:
#   .gitignore

.gitignore

@@ -27,5 +27,5 @@ erl_crash.dump
 .DS_Store
 .env
 
-# Editor configs
+# Editor config
 /.vscode

config/config.exs

@@ -54,7 +54,8 @@
   registrations_open: true,
   federating: true,
   rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
-  public: true
+  public: true,
+  quarantined_instances: []
 
 config :pleroma, :activitypub, accept_blocks: true
 

lib/pleroma/web/activity_pub/activity_pub.ex

@@ -562,6 +562,17 @@ def make_user_from_nickname(nickname) do
     end
   end
 
+  @quarantined_instances Keyword.get(@instance, :quarantined_instances, [])
+
+  def should_federate?(inbox, public) do
+    if public do
+      true
+    else
+      inbox_info = URI.parse(inbox)
+      inbox_info.host not in @quarantined_instances
+    end
+  end
+
   def publish(actor, activity) do
     followers =
       if actor.follower_address in activity.recipients do
@@ -571,6 +582,8 @@ def publish(actor, activity) do
         []
       end
 
+    public = is_public?(activity)
+
     remote_inboxes =
       (Pleroma.Web.Salmon.remote_users(activity) ++ followers)
       |> Enum.filter(fn user -> User.ap_enabled?(user) end)
@@ -578,6 +591,7 @@ def publish(actor, activity) do
         (data["endpoints"] && data["endpoints"]["sharedInbox"]) || data["inbox"]
       end)
       |> Enum.uniq()
+      |> Enum.filter(fn inbox -> should_federate?(inbox, public) end)
 
     {:ok, data} = Transmogrifier.prepare_outgoing(activity.data)
     json = Jason.encode!(data)

lib/pleroma/web/twitter_api/controllers/util_controller.ex

@@ -189,7 +189,7 @@ def follow_import(%{assigns: %{user: user}} = conn, %{"list" => list}) do
              {:ok, follower} <- User.follow(follower, followed) do
           ActivityPub.follow(follower, followed)
         else
-          _e -> Logger.debug("follow_import: following #{account} failed")
+          err -> Logger.debug("follow_import: following #{account} failed with #{inspect(err)}")
         end
       end)
     end)

lib/pleroma/web/web_finger/web_finger.ex

@@ -144,41 +144,50 @@ def ensure_keys_present(user) do
     end
   end
 
-  defp webfinger_from_xml(doc) do
+  defp get_magic_key(magic_key) do
-    magic_key = XML.string_from_xpath(~s{//Link[@rel="magic-public-key"]/@href}, doc)
     "data:application/magic-public-key," <> magic_key = magic_key
+    {:ok, magic_key}
+  rescue
+    MatchError -> {:error, "Missing magic key data."}
+  end
 
-    topic =
+  defp webfinger_from_xml(doc) do
-      XML.string_from_xpath(
+    with magic_key <- XML.string_from_xpath(~s{//Link[@rel="magic-public-key"]/@href}, doc),
-        ~s{//Link[@rel="http://schemas.google.com/g/2010#updates-from"]/@href},
+         {:ok, magic_key} <- get_magic_key(magic_key),
-        doc
+         topic <-
-      )
+           XML.string_from_xpath(
+             ~s{//Link[@rel="http://schemas.google.com/g/2010#updates-from"]/@href},
+             doc
+           ),
+         subject <- XML.string_from_xpath("//Subject", doc),
+         salmon <- XML.string_from_xpath(~s{//Link[@rel="salmon"]/@href}, doc),
+         subscribe_address <-
+           XML.string_from_xpath(
+             ~s{//Link[@rel="http://ostatus.org/schema/1.0/subscribe"]/@template},
+             doc
+           ),
+         ap_id <-
+           XML.string_from_xpath(
+             ~s{//Link[@rel="self" and @type="application/activity+json"]/@href},
+             doc
+           ) do
+      data = %{
+        "magic_key" => magic_key,
+        "topic" => topic,
+        "subject" => subject,
+        "salmon" => salmon,
+        "subscribe_address" => subscribe_address,
+        "ap_id" => ap_id
+      }
 
-    subject = XML.string_from_xpath("//Subject", doc)
+      {:ok, data}
-    salmon = XML.string_from_xpath(~s{//Link[@rel="salmon"]/@href}, doc)
+    else
+      {:error, e} ->
+        {:error, e}
 
-    subscribe_address =
+      e ->
-      XML.string_from_xpath(
+        {:error, e}
-        ~s{//Link[@rel="http://ostatus.org/schema/1.0/subscribe"]/@template},
+    end
-        doc
-      )
-
-    ap_id =
-      XML.string_from_xpath(
-        ~s{//Link[@rel="self" and @type="application/activity+json"]/@href},
-        doc
-      )
-
-    data = %{
-      "magic_key" => magic_key,
-      "topic" => topic,
-      "subject" => subject,
-      "salmon" => salmon,
-      "subscribe_address" => subscribe_address,
-      "ap_id" => ap_id
-    }
-
-    {:ok, data}
   end
 
   defp webfinger_from_json(doc) do
@@ -268,8 +277,11 @@ def finger(account) do
       if doc != :error do
         webfinger_from_xml(doc)
       else
-        {:ok, doc} = Jason.decode(body)
+        with {:ok, doc} <- Jason.decode(body) do
-        webfinger_from_json(doc)
+          webfinger_from_json(doc)
+        else
+          {:error, e} -> e
+        end
       end
     else
       e ->