X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Frich_media%2Fparser.ex;h=1d4cad0100e2ebcb8092b96555f5b5dfa938fa70;hb=bf7ff6a337a6a329524d3607b5ac2b4caa2df93a;hp=d7a49119818a433b9fae494e6b4e85a281ebf14a;hpb=cbce88007672dc810cb345bb9872a009cbdc93d8;p=akkoma
diff --git a/lib/pleroma/web/rich_media/parser.ex b/lib/pleroma/web/rich_media/parser.ex
index d7a491198..1d4cad010 100644
--- a/lib/pleroma/web/rich_media/parser.ex
+++ b/lib/pleroma/web/rich_media/parser.ex
@@ -1,5 +1,5 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors
+# Copyright © 2017-2021 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.RichMedia.Parser do
@@ -15,7 +15,7 @@ defmodule Pleroma.Web.RichMedia.Parser do
if Pleroma.Config.get(:env) == :test do
@spec parse(String.t()) :: {:ok, map()} | {:error, any()}
- def parse(url), do: parse_url(url)
+ def parse(url), do: parse_with_timeout(url)
else
@spec parse(String.t()) :: {:ok, map()} | {:error, any()}
def parse(url) do
@@ -27,7 +27,7 @@ defmodule Pleroma.Web.RichMedia.Parser do
defp get_cached_or_parse(url) do
case @cachex.fetch(:rich_media_cache, url, fn ->
- case parse_url(url) do
+ case parse_with_timeout(url) do
{:ok, _} = res ->
{:commit, res}
@@ -141,6 +141,21 @@ defmodule Pleroma.Web.RichMedia.Parser do
end
end
+ def parse_with_timeout(url) do
+ try do
+ task =
+ Task.Supervisor.async_nolink(Pleroma.TaskSupervisor, fn ->
+ parse_url(url)
+ end)
+
+ Task.await(task, 5000)
+ catch
+ :exit, {:timeout, _} ->
+ Logger.warn("Timeout while fetching rich media for #{url}")
+ {:error, :timeout}
+ end
+ end
+
defp maybe_parse(html) do
Enum.reduce_while(parsers(), %{}, fn parser, acc ->
case parser.parse(html, acc) do