diff options
| author | lain <lain@soykaf.club> | 2020-08-25 15:16:20 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-08-25 15:38:12 +0200 |
| commit | ea2b5c07e32eba6d8a5783fb1a45b79557e1c7b2 (patch) | |
| tree | f2e44671aac832afbf8264c728c0e9c507ea6caf /lib | |
| parent | 361aa22e2862c1c914baf8257fdc8b20cbc7941d (diff) | |
| parent | f891e2b2f1d1daa122b9856e4b660be394d31e34 (diff) | |
| download | pleroma-ea2b5c07e32eba6d8a5783fb1a45b79557e1c7b2.tar.gz pleroma-ea2b5c07e32eba6d8a5783fb1a45b79557e1c7b2.zip | |
Merge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/plugs/remote_ip.ex | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/pleroma/plugs/remote_ip.ex b/lib/pleroma/plugs/remote_ip.ex index 2eca4f8f6..0ac9050d0 100644 --- a/lib/pleroma/plugs/remote_ip.ex +++ b/lib/pleroma/plugs/remote_ip.ex @@ -7,6 +7,8 @@ defmodule Pleroma.Plugs.RemoteIp do This is a shim to call [`RemoteIp`](https://git.pleroma.social/pleroma/remote_ip) but with runtime configuration. """ + import Plug.Conn + @behaviour Plug @headers ~w[ @@ -26,11 +28,12 @@ defmodule Pleroma.Plugs.RemoteIp do def init(_), do: nil - def call(conn, _) do + def call(%{remote_ip: original_remote_ip} = conn, _) do config = Pleroma.Config.get(__MODULE__, []) if Keyword.get(config, :enabled, false) do - RemoteIp.call(conn, remote_ip_opts(config)) + %{remote_ip: new_remote_ip} = conn = RemoteIp.call(conn, remote_ip_opts(config)) + assign(conn, :remote_ip_found, original_remote_ip != new_remote_ip) else conn end |