Skip to content

GitLab

pleroma
pleroma
Commit 45e57dd1 authored by William Pitcock's avatar William Pitcock
Browse files
Options

rich media: tighten fetching timeouts and size limits

parent 06c4935c
Pipeline #7396 passed with stages
      in 6 minutes and 28 seconds
      Hide whitespace changes
      Inline Side-by-side
      Showing with 8 additions and 1 deletion
      lib/pleroma/web/rich_media/parser.ex
      View file @ 45e57dd1
      ......@@ -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 @@ def parse(url) 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
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment