pleroma

commit: 9d0839504e5a3b11dcdf7686c3526c7cb3a6178c
parent ed76323776f2506cfefbe78c369fdb7ccfe3b650
Author: feld <feld@feld.me>
Date:   Mon,  7 Dec 2020 22:49:45 +0000

Merge branch 'features/favicon-unreachable-instance' into 'develop'

instance: Do not fetch unreachable instances

Closes #2346

See merge request pleroma/pleroma!3189
Diffstat:
M
lib/pleroma/instances/instance.ex
15
++++++++++++---
M
test/pleroma/instances/instance_test.exs
9
+++++++++
M
test/pleroma/instances_test.exs
6
+++---

3 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/lib/pleroma/instances/instance.ex b/lib/pleroma/instances/instance.ex
@@ -77,7 +77,7 @@ defmodule Pleroma.Instances.Instance do
     )
   end
 
-  def reachable?(_), do: true
+  def reachable?(url_or_host) when is_binary(url_or_host), do: true
 
   def set_reachable(url_or_host) when is_binary(url_or_host) do
     with host <- host(url_or_host),
@@ -166,7 +166,8 @@ defmodule Pleroma.Instances.Instance do
 
   defp scrape_favicon(%URI{} = instance_uri) do
     try do
-      with {:ok, %Tesla.Env{body: html}} <-
+      with {_, true} <- {:reachable, reachable?(instance_uri.host)},
+           {:ok, %Tesla.Env{body: html}} <-
              Pleroma.HTTP.get(to_string(instance_uri), [{"accept", "text/html"}], pool: :media),
            {_, [favicon_rel | _]} when is_binary(favicon_rel) <-
              {:parse,
@@ -175,7 +176,15 @@ defmodule Pleroma.Instances.Instance do
              {:merge, URI.merge(instance_uri, favicon_rel) |> to_string()} do
         favicon
       else
-        _ -> nil
+        {:reachable, false} ->
+          Logger.debug(
+            "Instance.scrape_favicon(\"#{to_string(instance_uri)}\") ignored unreachable host"
+          )
+
+          nil
+
+        _ ->
+          nil
       end
     rescue
       e ->
diff --git a/test/pleroma/instances/instance_test.exs b/test/pleroma/instances/instance_test.exs
@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Instances.InstanceTest do
+  alias Pleroma.Instances
   alias Pleroma.Instances.Instance
   alias Pleroma.Repo
 
@@ -148,5 +149,13 @@ defmodule Pleroma.Instances.InstanceTest do
                         )
              end) =~ "Instance.scrape_favicon(\"https://no-favicon.example.org/\") error: "
     end
+
+    test "Doesn't scrapes unreachable instances" do
+      instance = insert(:instance, unreachable_since: Instances.reachability_datetime_threshold())
+      url = "https://" <> instance.host
+
+      assert capture_log(fn -> assert nil == Instance.get_or_update_favicon(URI.parse(url)) end) =~
+               "Instance.scrape_favicon(\"#{url}\") ignored unreachable host"
+    end
   end
 end
diff --git a/test/pleroma/instances_test.exs b/test/pleroma/instances_test.exs
@@ -32,9 +32,9 @@ defmodule Pleroma.InstancesTest do
       assert Instances.reachable?(URI.parse(url).host)
     end
 
-    test "returns true on non-binary input" do
-      assert Instances.reachable?(nil)
-      assert Instances.reachable?(1)
+    test "raises FunctionClauseError exception on non-binary input" do
+      assert_raise FunctionClauseError, fn -> Instances.reachable?(nil) end
+      assert_raise FunctionClauseError, fn -> Instances.reachable?(1) end
     end
   end