Page MenuHomePhorge
Files F85831609

No OneTemporary
Actions

Authored By
Unknown
Size
13 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/changelog.d/object-age-non-public.security b/changelog.d/object-age-non-public.security
new file mode 100644
index 000000000..aee358d38
--- /dev/null
+++ b/changelog.d/object-age-non-public.security
@@ -0,0 +1 @@
+ObjectAgePolicy no longer makes old DMs and followers-only posts public
diff --git a/lib/pleroma/web/activity_pub/mrf/object_age_policy.ex b/lib/pleroma/web/activity_pub/mrf/object_age_policy.ex
index 00f4cf84b..25ae02f60 100644
--- a/lib/pleroma/web/activity_pub/mrf/object_age_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/object_age_policy.ex
@@ -1,143 +1,161 @@
# Pleroma: A lightweight social networking server
# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy do
@moduledoc "Filter activities depending on their age"
@behaviour Pleroma.Web.ActivityPub.MRF.Policy
alias Pleroma.Config
alias Pleroma.User
require Pleroma.Constants
use Pleroma.Web.ActivityPub.MRF.Policy
defp check_date(%{"object" => %{"published" => published}} = activity) do
with %DateTime{} = now <- DateTime.utc_now(),
{:ok, %DateTime{} = then, _} <- DateTime.from_iso8601(published),
max_ttl <- Config.get([:mrf_object_age, :threshold]),
{:ttl, false} <- {:ttl, DateTime.diff(now, then) > max_ttl} do
{:ok, activity}
else
{:ttl, true} ->
{:reject, nil}
e ->
{:error, e}
end
end
defp check_reject(activity, actions) do
if :reject in actions do
{:reject, "[ObjectAgePolicy]"}
else
{:ok, activity}
end
end
+ @spec delete_and_count(list(), term()) :: {integer(), list()}
+ defp delete_and_count(list, element), do: delete_and_count(list, element, {0, [], list})
+
+ defp delete_and_count([], _element, {0, _nlist, olist}), do: {0, olist}
+ defp delete_and_count([], _element, {count, nlist, _olist}), do: {count, Enum.reverse(nlist)}
+
+ defp delete_and_count([h | r], h, {count, nlist, olist}),
+ do: delete_and_count(r, h, {count + 1, nlist, olist})
+
+ defp delete_and_count([h | r], element, {count, nlist, olist}),
+ do: delete_and_count(r, element, {count, [h | nlist], olist})
+
+ defp insert_if_needed(list, oldcount, element) do
+ if oldcount <= 0 || Enum.member?(list, element) do
+ list
+ else
+ [element | list]
+ end
+ end
+
defp check_delist(activity, actions) do
if :delist in actions do
with %User{} = user <- User.get_cached_by_ap_id(activity["actor"]) do
- to =
- List.delete(activity["to"] || [], Pleroma.Constants.as_public()) ++
- [user.follower_address]
+ {pubcnt, to} = delete_and_count(activity["to"] || [], Pleroma.Constants.as_public())
+ {flwcnt, cc} = delete_and_count(activity["cc"] || [], user.follower_address)
- cc =
- List.delete(activity["cc"] || [], user.follower_address) ++
- [Pleroma.Constants.as_public()]
+ cc = insert_if_needed(cc, pubcnt, Pleroma.Constants.as_public())
+ to = insert_if_needed(to, flwcnt, user.follower_address)
activity =
activity
|> Map.put("to", to)
|> Map.put("cc", cc)
|> Kernel.put_in(["object", "to"], to)
|> Kernel.put_in(["object", "cc"], cc)
{:ok, activity}
else
_e ->
{:reject, "[ObjectAgePolicy] Unhandled error"}
end
else
{:ok, activity}
end
end
defp check_strip_followers(activity, actions) do
if :strip_followers in actions do
with %User{} = user <- User.get_cached_by_ap_id(activity["actor"]) do
- to = List.delete(activity["to"] || [], user.follower_address)
- cc = List.delete(activity["cc"] || [], user.follower_address)
+ {_, to} = delete_and_count(activity["to"] || [], user.follower_address)
+ {_, cc} = delete_and_count(activity["cc"] || [], user.follower_address)
activity =
activity
|> Map.put("to", to)
|> Map.put("cc", cc)
|> Kernel.put_in(["object", "to"], to)
|> Kernel.put_in(["object", "cc"], cc)
{:ok, activity}
else
_e ->
{:reject, "[ObjectAgePolicy] Unhandled error"}
end
else
{:ok, activity}
end
end
@impl true
def filter(%{"type" => "Create", "object" => %{"published" => _}} = activity) do
with actions <- Config.get([:mrf_object_age, :actions]),
{:reject, _} <- check_date(activity),
{:ok, activity} <- check_reject(activity, actions),
{:ok, activity} <- check_delist(activity, actions),
{:ok, activity} <- check_strip_followers(activity, actions) do
{:ok, activity}
else
# check_date() is allowed to short-circuit the pipeline
e -> e
end
end
@impl true
def filter(activity), do: {:ok, activity}
@impl true
def describe do
mrf_object_age =
Config.get(:mrf_object_age)
|> Enum.into(%{})
{:ok, %{mrf_object_age: mrf_object_age}}
end
@impl true
def config_description do
%{
key: :mrf_object_age,
related_policy: "Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy",
label: "MRF Object Age",
description:
"Rejects or delists posts based on their timestamp deviance from your server's clock.",
children: [
%{
key: :threshold,
type: :integer,
description: "Required age (in seconds) of a post before actions are taken.",
suggestions: [172_800]
},
%{
key: :actions,
type: {:list, :atom},
description:
"A list of actions to apply to the post. `:delist` removes the post from public timelines; " <>
"`:strip_followers` removes followers from the ActivityPub recipient list ensuring they won't be delivered to home timelines, additionally for followers-only it degrades to a direct activity; " <>
"`:reject` rejects the activity entirely",
suggestions: [:delist, :strip_followers, :reject]
}
]
}
end
end
diff --git a/test/pleroma/web/activity_pub/mrf/object_age_policy_test.exs b/test/pleroma/web/activity_pub/mrf/object_age_policy_test.exs
index 7a67645aa..119a54717 100644
--- a/test/pleroma/web/activity_pub/mrf/object_age_policy_test.exs
+++ b/test/pleroma/web/activity_pub/mrf/object_age_policy_test.exs
@@ -1,148 +1,234 @@
# Pleroma: A lightweight social networking server
# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.MRF.ObjectAgePolicyTest do
use Pleroma.DataCase
alias Pleroma.User
alias Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy
alias Pleroma.Web.ActivityPub.Visibility
+ require Pleroma.Constants
+
setup do:
clear_config(:mrf_object_age,
threshold: 172_800,
actions: [:delist, :strip_followers]
)
setup_all do
Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
:ok
end
defp get_old_message do
File.read!("test/fixtures/mastodon-post-activity.json")
|> Jason.decode!()
|> Map.drop(["published"])
end
defp get_new_message do
old_message = get_old_message()
new_object =
old_message
|> Map.get("object")
|> Map.put("published", DateTime.utc_now() |> DateTime.to_iso8601())
old_message
|> Map.put("object", new_object)
end
describe "with reject action" do
test "works with objects with empty to or cc fields" do
clear_config([:mrf_object_age, :actions], [:reject])
data =
get_old_message()
|> Map.put("cc", nil)
|> Map.put("to", nil)
assert match?({:reject, _}, ObjectAgePolicy.filter(data))
end
test "it rejects an old post" do
clear_config([:mrf_object_age, :actions], [:reject])
data = get_old_message()
assert match?({:reject, _}, ObjectAgePolicy.filter(data))
end
test "it allows a new post" do
clear_config([:mrf_object_age, :actions], [:reject])
data = get_new_message()
assert match?({:ok, _}, ObjectAgePolicy.filter(data))
end
end
describe "with delist action" do
test "works with objects with empty to or cc fields" do
clear_config([:mrf_object_age, :actions], [:delist])
data =
get_old_message()
|> Map.put("cc", nil)
|> Map.put("to", nil)
{:ok, _u} = User.get_or_fetch_by_ap_id(data["actor"])
{:ok, data} = ObjectAgePolicy.filter(data)
- assert Visibility.get_visibility(%{data: data}) == "unlisted"
+ assert Visibility.get_visibility(%{data: data}) == "direct"
end
test "it delists an old post" do
clear_config([:mrf_object_age, :actions], [:delist])
data = get_old_message()
{:ok, _u} = User.get_or_fetch_by_ap_id(data["actor"])
{:ok, data} = ObjectAgePolicy.filter(data)
assert Visibility.get_visibility(%{data: data}) == "unlisted"
end
+ test "it keeps an old followers-only post private" do
+ clear_config([:mrf_object_age, :actions], [:delist])
+
+ data = get_old_message()
+ {:ok, user} = User.get_or_fetch_by_ap_id(data["actor"])
+
+ data =
+ data
+ |> Map.put("to", [user.follower_address])
+ |> Map.put("cc", [])
+ |> put_in(["object", "to"], [user.follower_address])
+ |> put_in(["object", "cc"], [])
+
+ {:ok, data} = ObjectAgePolicy.filter(data)
+
+ assert data["to"] == [user.follower_address]
+ assert data["cc"] == []
+ assert Visibility.get_visibility(%{data: data}) == "private"
+ assert data["object"]["to"] == data["to"]
+ assert data["object"]["cc"] == data["cc"]
+ end
+
+ test "it keeps an old direct message direct" do
+ clear_config([:mrf_object_age, :actions], [:delist])
+
+ data = get_old_message()
+ {:ok, _user} = User.get_or_fetch_by_ap_id(data["actor"])
+ recipient = "https://example.com/users/someone"
+
+ data =
+ data
+ |> Map.put("to", [recipient])
+ |> Map.put("cc", [])
+ |> put_in(["object", "to"], [recipient])
+ |> put_in(["object", "cc"], [])
+
+ {:ok, data} = ObjectAgePolicy.filter(data)
+
+ assert data["to"] == [recipient]
+ assert data["cc"] == []
+ assert Visibility.get_visibility(%{data: data}) == "direct"
+ end
+
+ test "it removes every copy of the follower address" do
+ clear_config([:mrf_object_age, :actions], [:strip_followers])
+
+ data = get_old_message()
+ {:ok, user} = User.get_or_fetch_by_ap_id(data["actor"])
+ public = Pleroma.Constants.as_public()
+ followers = [user.follower_address, user.follower_address]
+
+ data =
+ data
+ |> Map.put("to", [public])
+ |> Map.put("cc", followers)
+ |> put_in(["object", "to"], [public])
+ |> put_in(["object", "cc"], followers)
+
+ {:ok, data} = ObjectAgePolicy.filter(data)
+
+ assert data["to"] == [public]
+ assert data["cc"] == []
+ end
+
+ test "it does not duplicate addresses of an old unlisted post" do
+ clear_config([:mrf_object_age, :actions], [:delist, :strip_followers])
+
+ data = get_old_message()
+ {:ok, user} = User.get_or_fetch_by_ap_id(data["actor"])
+ public = Pleroma.Constants.as_public()
+
+ data =
+ data
+ |> Map.put("to", [user.follower_address])
+ |> Map.put("cc", [public])
+ |> put_in(["object", "to"], [user.follower_address])
+ |> put_in(["object", "cc"], [public])
+
+ {:ok, data} = ObjectAgePolicy.filter(data)
+
+ assert data["to"] == []
+ assert data["cc"] == [public]
+ end
+
test "it allows a new post" do
clear_config([:mrf_object_age, :actions], [:delist])
data = get_new_message()
{:ok, _user} = User.get_or_fetch_by_ap_id(data["actor"])
assert match?({:ok, ^data}, ObjectAgePolicy.filter(data))
end
end
describe "with strip_followers action" do
test "works with objects with empty to or cc fields" do
clear_config([:mrf_object_age, :actions], [:strip_followers])
data =
get_old_message()
|> Map.put("cc", nil)
|> Map.put("to", nil)
{:ok, user} = User.get_or_fetch_by_ap_id(data["actor"])
{:ok, data} = ObjectAgePolicy.filter(data)
refute user.follower_address in data["to"]
refute user.follower_address in data["cc"]
end
test "it strips followers collections from an old post" do
clear_config([:mrf_object_age, :actions], [:strip_followers])
data = get_old_message()
{:ok, user} = User.get_or_fetch_by_ap_id(data["actor"])
{:ok, data} = ObjectAgePolicy.filter(data)
refute user.follower_address in data["to"]
refute user.follower_address in data["cc"]
end
test "it allows a new post" do
clear_config([:mrf_object_age, :actions], [:strip_followers])
data = get_new_message()
{:ok, _u} = User.get_or_fetch_by_ap_id(data["actor"])
assert match?({:ok, ^data}, ObjectAgePolicy.filter(data))
end
end
end

File Metadata

Mime Type
text/x-diff
Expires
Sun, Nov 1, 6:39 PM (13 h, 49 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1803253
Default Alt Text
(13 KB)

Event Timeline