Merge branch 'reenable-rate-limit-and-remote-ip' into 'develop'

Re-enable rate limiter and enable remote ip See merge request pleroma/pleroma!2164
2020-01-30 18:47:44 +00:00 · 2020-01-30 18:47:44 +00:00 · 774cba84f5
commit 774cba84f5
parent e52e78a937 01537cc1d6
4 changed files with 39 additions and 15 deletions
--- a/lib/pleroma/plugs/remote_ip.ex
+++ b/lib/pleroma/plugs/remote_ip.ex
@ -10,10 +10,7 @@ defmodule Pleroma.Plugs.RemoteIp do
  @behaviour Plug

  @headers ~w[
-    forwarded
    x-forwarded-for
-    x-client-ip
-    x-real-ip
  ]

  # https://en.wikipedia.org/wiki/Localhost