moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bugfix/favicon-none-found' into 'develop' 

instance: Handle not getting a favicon

See merge request pleroma/pleroma!2988
This commit is contained in:
rinpatch 2020-09-11 10:42:25 +00:00
parent 03d1730f30 dbc013f24c
commit 53dc61ba90
2 changed files with 50 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/pleroma/instances/instance.ex
View File

@ -159,13 +159,11 @@ defp scrape_favicon(%URI{} = instance_uri) do
Pleroma.HTTP.get(to_string(instance_uri), [{"accept", "text/html"}], Pleroma.HTTP.get(to_string(instance_uri), [{"accept", "text/html"}],
adapter: [pool: :media] adapter: [pool: :media]
), ),
favicon_rel <- {_, [favicon_rel | _]} when is_binary(favicon_rel) <-
html {:parse,
|> Floki.parse_document!() html |> Floki.parse_document!() |> Floki.attribute("link[rel=icon]", "href")},
|> Floki.attribute("link[rel=icon]", "href") {_, favicon} when is_binary(favicon) <-
|> List.first(), {:merge, URI.merge(instance_uri, favicon_rel) |> to_string()} do
favicon <- URI.merge(instance_uri, favicon_rel) |> to_string(),
true <- is_binary(favicon) do
favicon favicon
else else
_ -> nil _ -> nil

71
test/web/instances/instance_test.exs
View File

@ -99,35 +99,54 @@ test "does NOT modify `unreachable_since` value of existing record in case it's
end end
end end
test "Scrapes favicon URLs" do describe "get_or_update_favicon/1" do
Tesla.Mock.mock(fn %{url: "https://favicon.example.org/"} -> test "Scrapes favicon URLs" do
%Tesla.Env{ Tesla.Mock.mock(fn %{url: "https://favicon.example.org/"} ->
status: 200, %Tesla.Env{
body: ~s[<html><head><link rel="icon" href="/favicon.png"></head></html>] status: 200,
} body: ~s[<html><head><link rel="icon" href="/favicon.png"></head></html>]
end) }
end)
assert "https://favicon.example.org/favicon.png" == assert "https://favicon.example.org/favicon.png" ==
Instance.get_or_update_favicon(URI.parse("https://favicon.example.org/")) Instance.get_or_update_favicon(URI.parse("https://favicon.example.org/"))
end end
test "Returns nil on too long favicon URLs" do test "Returns nil on too long favicon URLs" do
long_favicon_url = long_favicon_url =
"https://Lorem.ipsum.dolor.sit.amet/consecteturadipiscingelit/Praesentpharetrapurusutaliquamtempus/Mauriseulaoreetarcu/atfacilisisorci/Nullamporttitor/nequesedfeugiatmollis/dolormagnaefficiturlorem/nonpretiumsapienorcieurisus/Nullamveleratsem/Maecenassedaccumsanexnam/favicon.png" "https://Lorem.ipsum.dolor.sit.amet/consecteturadipiscingelit/Praesentpharetrapurusutaliquamtempus/Mauriseulaoreetarcu/atfacilisisorci/Nullamporttitor/nequesedfeugiatmollis/dolormagnaefficiturlorem/nonpretiumsapienorcieurisus/Nullamveleratsem/Maecenassedaccumsanexnam/favicon.png"
Tesla.Mock.mock(fn %{url: "https://long-favicon.example.org/"} -> Tesla.Mock.mock(fn %{url: "https://long-favicon.example.org/"} ->
%Tesla.Env{ %Tesla.Env{
status: 200, status: 200,
body: ~s[<html><head><link rel="icon" href="] <> long_favicon_url <> ~s["></head></html>] body:
} ~s[<html><head><link rel="icon" href="] <> long_favicon_url <> ~s["></head></html>]
end) }
end)
assert capture_log(fn -> assert capture_log(fn ->
assert nil == assert nil ==
Instance.get_or_update_favicon( Instance.get_or_update_favicon(
URI.parse("https://long-favicon.example.org/") URI.parse("https://long-favicon.example.org/")
) )
end) =~ end) =~
"Instance.get_or_update_favicon(\"long-favicon.example.org\") error: %Postgrex.Error{" "Instance.get_or_update_favicon(\"long-favicon.example.org\") error: %Postgrex.Error{"
end
test "Handles not getting a favicon URL properly" do
Tesla.Mock.mock(fn %{url: "https://no-favicon.example.org/"} ->
%Tesla.Env{
status: 200,
body: ~s[<html><head><h1>I wil look down and whisper "GNO.."</h1></head></html>]
}
end)
refute capture_log(fn ->
assert nil ==
Instance.get_or_update_favicon(
URI.parse("https://no-favicon.example.org/")
)
end) =~ "Instance.scrape_favicon(\"https://no-favicon.example.org/\") error: "
end
end end
end end