forked from AkkomaGang/akkoma
Apply 2 suggestion(s) to 2 file(s)
This commit is contained in:
parent
b90eda3d8b
commit
d0eca5b125
2 changed files with 14 additions and 1 deletions
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue