Fixed banned domain check (again), optimise domain and IP checks by using MapSet

Author: L-e-x-o-n

lib/teiserver/moderation.ex

@@ -880,22 +880,38 @@ defmodule Teiserver.Moderation do
     Repo.all(BannedDomain)
   end
 
-  @spec list_banned_domains_cache :: [String.t()]
+  @spec list_banned_domains_cache :: MapSet.t(String.t())
   def list_banned_domains_cache do
-    Teiserver.cache_get(:application_metadata_cache, "banned_domains", [])
+    Teiserver.cache_get(:application_metadata_cache, "banned_domains", MapSet.new())
   end
 
   @spec banned_domain?(String.t()) :: boolean()
   def banned_domain?(email) do
     case String.split(email, "@") do
       [_start, domain] ->
-        String.contains?(domain, list_banned_domains_cache())
+        banned_domains = list_banned_domains_cache()
+
+        domain
+        |> String.downcase()
+        |> split_domain_segments()
+        |> Enum.any?(&MapSet.member?(banned_domains, &1))
 
       _no_email ->
         false
     end
   end
 
+  defp split_domain_segments(domain) do
+    parts = String.split(domain, ".")
+    count = length(parts)
+
+    Enum.map(0..(count - 1), fn i ->
+      parts
+      |> Enum.drop(i)
+      |> Enum.join(".")
+    end)
+  end
+
   @doc """
   Gets a single banned_domain.
 
@@ -993,9 +1009,9 @@ defmodule Teiserver.Moderation do
     Repo.all(BannedIP)
   end
 
-  @spec list_banned_ips_cache :: [BannedIP.t()]
+  @spec list_banned_ips_cache :: MapSet.t(BannedIP.t())
   def list_banned_ips_cache do
-    Teiserver.cache_get(:application_metadata_cache, "banned_ip_ranges", [])
+    Teiserver.cache_get(:application_metadata_cache, "banned_ip_ranges", MapSet.new())
   end
 
   @doc """
@@ -1199,9 +1215,9 @@ defmodule Teiserver.Moderation do
   end
 
   # VPNs
-  @spec list_vpn_cache :: [String.t()]
+  @spec list_vpn_cache :: MapSet.t(String.t())
   def list_vpn_cache do
-    Teiserver.cache_get(:application_metadata_cache, "blocked_vpn_ranges", [])
+    Teiserver.cache_get(:application_metadata_cache, "banned_vpn_ranges", MapSet.new())
   end
 
   @spec vpn_ip?(String.t() | nil) :: boolean()

lib/teiserver/moderation/tasks/load_banned_domains_task.ex

@@ -33,7 +33,7 @@ defmodule Teiserver.Moderation.LoadBannedDomainsTask do
     CacheHelper.store_put(
       :application_metadata_cache,
       "banned_domains",
-      external_banned_domains ++ internal_banned_domains
+      MapSet.new(external_banned_domains ++ internal_banned_domains)
     )
   end
 

lib/teiserver/moderation/tasks/load_banned_ips_task.ex

@@ -17,7 +17,7 @@ defmodule Teiserver.Moderation.LoadBannedIPsTask do
     CacheHelper.store_put(
       :application_metadata_cache,
       "banned_ip_ranges",
-      banned_ip_ranges
+      MapSet.new(banned_ip_ranges)
     )
   end
 

lib/teiserver/moderation/tasks/load_vpns_task.ex

@@ -13,7 +13,7 @@ defmodule Teiserver.Moderation.Tasks.LoadVPNsTask do
   def perform do
     url = Config.get_site_config_cache("teiserver.VPN blocklist URL")
 
-    blocked_vpn_ranges =
+    banned_vpn_ranges =
       with true <- url != nil and url != "",
            {:ok, %Response{status: 200, body: body}} <- Req.get(url),
            cidr_list <- String.split(body, "\n") do
@@ -35,8 +35,8 @@ defmodule Teiserver.Moderation.Tasks.LoadVPNsTask do
 
     CacheHelper.store_put(
       :application_metadata_cache,
-      "blocked_vpn_ranges",
-      blocked_vpn_ranges
+      "banned_vpn_ranges",
+      MapSet.new(banned_vpn_ranges)
     )
   end
 end

test/teiserver/moderation/banned_domain_test.exs

@@ -79,6 +79,7 @@ defmodule Teiserver.Moderation.BannedDomainTest do
       assert Moderation.banned_domain?("me@some_domain.foo.bar")
       assert Moderation.banned_domain?("me@some_subdomain.some_domain.com")
       assert Moderation.banned_domain?("me@some_subdomain.some_domain.foo.bar")
+      refute Moderation.banned_domain?("me@different_some_domain.foo.bar")
       refute Moderation.banned_domain?("me@not me")
     end