nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Apply 2 suggestion(s) to 2 file(s)

Browse source
This commit is contained in:
feld 2020-10-07 19:16:53 +00:00
parent b90eda3d8b
commit d0eca5b125
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/plugs/remote_ip.ex
View file

@ -43,6 +43,6 @@ defp maybe_add_cidr(proxy) when is_binary(proxy) do
InetCidr.v6?(InetCidr.parse_address!(proxy)) -> proxy <> "/128" InetCidr.v6?(InetCidr.parse_address!(proxy)) -> proxy <> "/128"
end end
InetCidr.parse(proxy) InetCidr.parse(proxy, true)
end end
end end

13
test/plugs/remote_ip_test.exs
View file

@ -92,5 +92,18 @@ test "proxies set without CIDR format" do
|> RemoteIp.call(nil) |> RemoteIp.call(nil)
assert conn.remote_ip == {1, 1, 1, 1} assert conn.remote_ip == {1, 1, 1, 1}
test "proxies set `nonsensical` CIDR" do
Pleroma.Config.put([RemoteIp, :reserved], ["127.0.0.0/8"])
Pleroma.Config.put([RemoteIp, :proxies], ["10.0.0.3/24"])
conn =
conn(:get, "/")
|> put_req_header("x-forwarded-for", "10.0.0.3, 1.1.1.1")
|> RemoteIp.call(nil)
assert conn.remote_ip == {1, 1, 1, 1}
end
end end
end end