diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-12-08 21:08:25 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-12-13 21:16:26 +0300 |
| commit | 2199d1500035d16b772f6a909f2a5afc52ae209b (patch) | |
| tree | 02417b27e57269bf7830eae26ec179bb8793e5f5 | |
| parent | 0ba3f1ffb28792c21809fa9a30fc03a7a52d9361 (diff) | |
| download | pleroma-2199d1500035d16b772f6a909f2a5afc52ae209b.tar.gz | |
OTP: Fix runtime upload limit config being ignored
Closes #1109
| -rw-r--r-- | lib/pleroma/plugs/parsers_plug.ex | 21 | ||||
| -rw-r--r-- | lib/pleroma/web/endpoint.ex | 9 |
2 files changed, 22 insertions, 8 deletions
diff --git a/lib/pleroma/plugs/parsers_plug.ex b/lib/pleroma/plugs/parsers_plug.ex new file mode 100644 index 000000000..2e493ce0e --- /dev/null +++ b/lib/pleroma/plugs/parsers_plug.ex @@ -0,0 +1,21 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/> +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Plugs.Parsers do + @moduledoc "Initializes Plug.Parsers with upload limit set at boot time" + + @behaviour Plug + + def init(_opts) do + Plug.Parsers.init( + parsers: [:urlencoded, :multipart, :json], + pass: ["*/*"], + json_decoder: Jason, + length: Pleroma.Config.get([:instance, :upload_limit]), + body_reader: {Pleroma.Web.Plugs.DigestPlug, :read_body, []} + ) + end + + defdelegate call(conn, opts), to: Plug.Parsers +end diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex index eb805e853..e33e18be3 100644 --- a/lib/pleroma/web/endpoint.ex +++ b/lib/pleroma/web/endpoint.ex @@ -61,14 +61,7 @@ defmodule Pleroma.Web.Endpoint do plug(Plug.RequestId) plug(Plug.Logger) - plug( - Plug.Parsers, - parsers: [:urlencoded, :multipart, :json], - pass: ["*/*"], - json_decoder: Jason, - length: Pleroma.Config.get([:instance, :upload_limit]), - body_reader: {Pleroma.Web.Plugs.DigestPlug, :read_body, []} - ) + plug(Pleroma.Plugs.Parsers) plug(Plug.MethodOverride) plug(Plug.Head) |