Make quarentine work with list of tuples instead of strings

This commit is contained in:
Ilja 2020-10-02 14:51:39 +02:00 committed by Haelwenn (lanodan) Monnier
parent dd947d9bc8
commit 27fe7b0274
No known key found for this signature in database
GPG key ID: D5B7A8E43C997DEE
5 changed files with 18 additions and 5 deletions

View file

@ -100,6 +100,11 @@ def subdomain_match?(domains, host) do
Enum.any?(domains, fn domain -> Regex.match?(domain, host) end)
end
@spec instance_list_from_tuples([{String.t(), String.t()}]) :: [String.t()]
def instance_list_from_tuples(list) do
Enum.map(list, fn {instance, _} -> instance end)
end
def describe(policies) do
{:ok, policy_configs} =
policies

View file

@ -187,9 +187,7 @@ defp check_object(object), do: {:ok, object}
defp instance_list(config_key) do
Config.get([:mrf_simple, config_key])
|> Enum.map(fn
{instance, _} -> instance
end)
|> MRF.instance_list_from_tuples()
end
@impl true

View file

@ -112,6 +112,7 @@ defp should_federate?(inbox, public) do
quarantined_instances =
Config.get([:instance, :quarantined_instances], [])
|> Pleroma.Web.ActivityPub.MRF.instance_list_from_tuples()
|> Pleroma.Web.ActivityPub.MRF.subdomains_regex()
!Pleroma.Web.ActivityPub.MRF.subdomain_match?(quarantined_instances, host)

View file

@ -63,6 +63,15 @@ test "matches are case-insensitive" do
end
end
describe "instance_list_from_tuples/1" do
test "returns a list of instances from a list of {instance, reason} tuples" do
list = [{"some.tld", "a reason"}, {"other.tld", "another reason"}]
expected = ["some.tld", "other.tld"]
assert MRF.instance_list_from_tuples(list) == expected
end
end
describe "describe/0" do
test "it works as expected with noop policy" do
clear_config([:mrf, :policies], [Pleroma.Web.ActivityPub.MRF.NoOpPolicy])

View file

@ -271,7 +271,7 @@ test "publish to url with with different ports" do
Pleroma.Web.Federator.Publisher,
[:passthrough],
[] do
Config.put([:instance, :quarantined_instances], ["domain.com"])
Config.put([:instance, :quarantined_instances], [{"domain.com", "some reason"}])
follower =
insert(:user, %{
@ -308,7 +308,7 @@ test "publish to url with with different ports" do
Pleroma.Web.Federator.Publisher,
[:passthrough],
[] do
Config.put([:instance, :quarantined_instances], ["somedomain.com"])
Config.put([:instance, :quarantined_instances], [{"somedomain.com", "some reason"}])
follower =
insert(:user, %{