diff options
| author | lambda <pleromagit@rogerbraun.net> | 2019-02-11 12:33:58 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2019-02-11 12:33:58 +0000 |
| commit | 044616292b6d441c2259d423d98b38f71019aae9 (patch) | |
| tree | cf15ec83ee37adcaf01113e44fe83a6dad0b6301 /lib | |
| parent | 48552b38b2dd26bb832e940a0e52c0e1c2165b31 (diff) | |
| parent | 45e57dd187ecb9463f0114f75a05f03dbc9e206a (diff) | |
| download | pleroma-044616292b6d441c2259d423d98b38f71019aae9.tar.gz | |
Merge branch 'feature/rich-media-limits' into 'develop'
rich media: tighten fetching timeouts and size limits
See merge request pleroma/pleroma!809
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 |