From: Mark Felder <feld@FreeBSD.org>
Date: Mon, 5 Oct 2020 16:48:41 +0000 (-0500)
Subject: Add helper function to convert single IPs into CIDR format if they were not provided... 
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=35ee759e74d0737598311d8e4245168f981812d3;p=akkoma

Add helper function to convert single IPs into CIDR format if they were not provided that way
---

diff --git a/lib/pleroma/plugs/remote_ip.ex b/lib/pleroma/plugs/remote_ip.ex
index 0ac9050d0..d1b1f793a 100644
--- a/lib/pleroma/plugs/remote_ip.ex
+++ b/lib/pleroma/plugs/remote_ip.ex
@@ -47,8 +47,19 @@ defmodule Pleroma.Plugs.RemoteIp do
       config
       |> Keyword.get(:proxies, [])
       |> Enum.concat(reserved)
-      |> Enum.map(&InetCidr.parse/1)
+      |> Enum.map(&maybe_add_cidr/1)
 
     {headers, proxies}
   end
+
+  defp maybe_add_cidr(proxy) when is_binary(proxy) do
+    proxy =
+      cond do
+        "/" in String.codepoints(proxy) -> proxy
+        InetCidr.v4?(InetCidr.parse_address!(proxy)) -> proxy <> "/32"
+        InetCidr.v6?(InetCidr.parse_address!(proxy)) -> proxy <> "/128"
+      end
+
+    InetCidr.parse(proxy)
+  end
 end