Merge branch 'fix-3241' into 'develop'

Consider a case when users.inbox is nil (Fix 3241)

Closes #3241

See merge request pleroma/pleroma!4083
This commit is contained in:
lain 2024-03-17 13:38:59 +00:00
commit 56e456fb5b
3 changed files with 23 additions and 11 deletions

View File

@ -0,0 +1 @@
Handle cases when users.inbox is nil.

View File

@ -158,10 +158,10 @@ defp signature_host(%URI{port: port, scheme: scheme, host: host}) do
end end
end end
defp should_federate?(inbox, public) do def should_federate?(nil, _), do: false
if public do def should_federate?(_, true), do: true
true
else def should_federate?(inbox, _) do
%{host: host} = URI.parse(inbox) %{host: host} = URI.parse(inbox)
quarantined_instances = quarantined_instances =
@ -171,7 +171,6 @@ defp should_federate?(inbox, public) do
!Pleroma.Web.ActivityPub.MRF.subdomain_match?(quarantined_instances, host) !Pleroma.Web.ActivityPub.MRF.subdomain_match?(quarantined_instances, host)
end end
end
@spec recipients(User.t(), Activity.t()) :: [[User.t()]] @spec recipients(User.t(), Activity.t()) :: [[User.t()]]
defp recipients(actor, activity) do defp recipients(actor, activity) do

View File

@ -25,6 +25,17 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
setup_all do: clear_config([:instance, :federating], true) setup_all do: clear_config([:instance, :federating], true)
describe "should_federate?/1" do
test "it returns false when the inbox is nil" do
refute Publisher.should_federate?(nil, false)
refute Publisher.should_federate?(nil, true)
end
test "it returns true when public is true" do
assert Publisher.should_federate?(false, true)
end
end
describe "gather_webfinger_links/1" do describe "gather_webfinger_links/1" do
test "it returns links" do test "it returns links" do
user = insert(:user) user = insert(:user)
@ -205,6 +216,7 @@ test "publish to url with with different ports" do
refute called(Instances.set_reachable(inbox)) refute called(Instances.set_reachable(inbox))
end end
@tag capture_log: true
test_with_mock "calls `Instances.set_unreachable` on target inbox on non-2xx HTTP response code", test_with_mock "calls `Instances.set_unreachable` on target inbox on non-2xx HTTP response code",
Instances, Instances,
[:passthrough], [:passthrough],