diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2019-02-10 21:37:51 +0000 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2019-02-10 21:54:08 +0000 |
| commit | 45e57dd187ecb9463f0114f75a05f03dbc9e206a (patch) | |
| tree | 66ab2f0319135d580dae39ddf9107b3fe6535690 /lib | |
| parent | 06c4935c11fc58f5ede18706bc46dcc502e64052 (diff) | |
| download | pleroma-45e57dd187ecb9463f0114f75a05f03dbc9e206a.tar.gz | |
rich media: tighten fetching timeouts and size limits
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/rich_media/parser.ex | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/pleroma/web/rich_media/parser.ex b/lib/pleroma/web/rich_media/parser.ex index 38f1cdeec..4341141df 100644 --- a/lib/pleroma/web/rich_media/parser.ex +++ b/lib/pleroma/web/rich_media/parser.ex @@ -9,6 +9,13 @@ defmodule Pleroma.Web.RichMedia.Parser do Pleroma.Web.RichMedia.Parsers.OEmbed ] + @hackney_options [ + pool: :media, + timeout: 2_000, + recv_timeout: 2_000, + max_body: 2_000_000 + ] + def parse(nil), do: {:error, "No URL provided"} if Mix.env() == :test do @@ -28,7 +35,7 @@ defmodule Pleroma.Web.RichMedia.Parser do defp parse_url(url) do try do - {:ok, %Tesla.Env{body: html}} = Pleroma.HTTP.get(url, [], adapter: [pool: :media]) + {:ok, %Tesla.Env{body: html}} = Pleroma.HTTP.get(url, [], adapter: @hackney_options) html |> maybe_parse() |> clean_parsed_data() |> check_parsed_data() rescue |