Browse Source

OTP: Fix runtime upload limit config being ignored

Closes #1109
tags/v1.1.7^2
rinpatch 4 years ago
parent
commit
2199d15000
2 changed files with 22 additions and 8 deletions
  1. +21
    -0
      lib/pleroma/plugs/parsers_plug.ex
  2. +1
    -8
      lib/pleroma/web/endpoint.ex

+ 21
- 0
lib/pleroma/plugs/parsers_plug.ex View File

@@ -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

+ 1
- 8
lib/pleroma/web/endpoint.ex View File

@@ -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)


Loading…
Cancel
Save