pleroma

commit: ded909120614e5b1fa1f9469c753a30b2d9b16ed
parent: 643fae6e36881b8883e247df28568e9b54e1b086
Author: William Pitcock <nenolod@dereferenced.org>
Date:   Wed, 29 Aug 2018 08:51:51 +0000

mastodon api: use bounded AP object graph query to enforce containment of private statuses

Diffstat:
M
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
9
+++++++--

1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -850,9 +850,14 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
         |> Map.put("type", "Create")
         |> Map.put("blocking_user", user)
 
-      # adding title is a hack to not make empty lists function like a public timeline
+      # we must filter the following list for the user to avoid leaking statuses the user
+      # does not actually have permission to see (for more info, peruse security issue #270).
+      following_to =
+        following
+        |> Enum.filter(fn x -> x in user.following end)
+
       activities =
-        ActivityPub.fetch_activities([title | following], params)
+        ActivityPub.fetch_activities_bounded(following_to, following, params)
         |> Enum.reverse()
 
       conn