MIX FORMAT

CHANGELOG.md

@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## Fixed
 - Documentation issue in which a non-existing nginx file was referenced
+- Issue where a bad inbox URL could break federation
 
 ## 2023.08
 

lib/pleroma/web/activity_pub/publisher.ex

@@ -115,13 +115,18 @@ defp allowed_instances do
   def should_federate?(url) do
     %{host: host} = URI.parse(url)
 
-    with allowed <- allowed_instances(),
+    with {nil, false} <- {nil, is_nil(host)},
+         allowed <- allowed_instances(),
          false <- Enum.empty?(allowed) do
       allowed
       |> Pleroma.Web.ActivityPub.MRF.instance_list_from_tuples()
       |> Pleroma.Web.ActivityPub.MRF.subdomains_regex()
       |> Pleroma.Web.ActivityPub.MRF.subdomain_match?(host)
     else
+      # oi!
+      {nil, true} ->
+        false
+
       _ ->
         quarantined_instances =
           blocked_instances()

lib/pleroma/web/activity_pub/views/user_view.ex

@@ -18,16 +18,16 @@ defmodule Pleroma.Web.ActivityPub.UserView do
   import Ecto.Query
 
   def render("endpoints.json", %{user: %User{nickname: nil, local: true} = _user}) do
-    %{"sharedInbox" => ~p"/inbox"}
+    %{"sharedInbox" => url(~p"/inbox")}
   end
 
   def render("endpoints.json", %{user: %User{local: true} = _user}) do
     %{
-      "oauthAuthorizationEndpoint" => ~p"/oauth/authorize",
-      "oauthRegistrationEndpoint" => ~p"/api/v1/apps",
-      "oauthTokenEndpoint" => ~p"/oauth/token",
-      "sharedInbox" => ~p"/inbox",
-      "uploadMedia" => ~p"/api/ap/upload_media"
+      "oauthAuthorizationEndpoint" => url(~p"/oauth/authorize"),
+      "oauthRegistrationEndpoint" => url(~p"/api/v1/apps"),
+      "oauthTokenEndpoint" => url(~p"/oauth/token"),
+      "sharedInbox" => url(~p"/inbox"),
+      "uploadMedia" => url(~p"/api/ap/upload_media")
     }
   end
 

test/pleroma/web/activity_pub/publisher_test.exs

@@ -487,4 +487,11 @@ test "publish to url with with different ports" do
              )
     end
   end
+
+  describe "should_federate/1" do
+    test "should not obliterate itself if the inbox URL is bad" do
+      url = "/inbox"
+      refute Pleroma.Web.ActivityPub.Publisher.should_federate?(url)
+    end
+  end
 end