Browse Source

Add ActivityExpirationPolicy

namespace-move-notification
Egor Kislitsyn 4 years ago
parent
commit
241a3d744a
No known key found for this signature in database GPG Key ID: 1B49CB15B71E7805
4 changed files with 77 additions and 5 deletions
  1. +2
    -0
      config/config.exs
  2. +2
    -5
      lib/pleroma/web/activity_pub/mrf.ex
  3. +35
    -0
      lib/pleroma/web/activity_pub/mrf/activity_expiration_policy.ex
  4. +38
    -0
      test/web/activity_pub/mrf/activity_expiration_policy_test.exs

+ 2
- 0
config/config.exs View File

@@ -361,6 +361,8 @@ config :pleroma, :mrf_keyword,

config :pleroma, :mrf_subchain, match_actor: %{}

config :pleroma, :mrf_activity_expiration, days: 365

config :pleroma, :mrf_vocabulary,
accept: [],
reject: []


+ 2
- 5
lib/pleroma/web/activity_pub/mrf.ex View File

@@ -8,11 +8,8 @@ defmodule Pleroma.Web.ActivityPub.MRF do
def filter(policies, %{} = object) do
policies
|> Enum.reduce({:ok, object}, fn
policy, {:ok, object} ->
policy.filter(object)

_, error ->
error
policy, {:ok, object} -> policy.filter(object)
_, error -> error
end)
end



+ 35
- 0
lib/pleroma/web/activity_pub/mrf/activity_expiration_policy.ex View File

@@ -0,0 +1,35 @@
# Pleroma: A lightweight social networking server
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only

defmodule Pleroma.Web.ActivityPub.MRF.ActivityExpirationPolicy do
@moduledoc "Adds expiration to all local activities"
@behaviour Pleroma.Web.ActivityPub.MRF

@impl true
def filter(%{"id" => id} = activity) do
activity =
if String.starts_with?(id, Pleroma.Web.Endpoint.url()) do
maybe_add_expiration(activity)
else
activity
end

{:ok, activity}
end

@impl true
def describe, do: {:ok, %{}}

defp maybe_add_expiration(activity) do
days = Pleroma.Config.get([:mrf_activity_expiration, :days], 365)
expires_at = NaiveDateTime.utc_now() |> Timex.shift(days: days)

with %{"expires_at" => existing_expires_at} <- activity,
:lt <- NaiveDateTime.compare(existing_expires_at, expires_at) do
activity
else
_ -> Map.put(activity, "expires_at", expires_at)
end
end
end

+ 38
- 0
test/web/activity_pub/mrf/activity_expiration_policy_test.exs View File

@@ -0,0 +1,38 @@
# Pleroma: A lightweight social networking server
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only

defmodule Pleroma.Web.ActivityPub.MRF.ActivityExpirationPolicyTest do
use ExUnit.Case, async: true
alias Pleroma.Web.ActivityPub.MRF.ActivityExpirationPolicy

@id Pleroma.Web.Endpoint.url() <> "/activities/cofe"

test "adds `expires_at` property" do
assert {:ok, %{"expires_at" => expires_at}} = ActivityExpirationPolicy.filter(%{"id" => @id})

assert Timex.diff(expires_at, NaiveDateTime.utc_now(), :days) == 364
end

test "keeps existing `expires_at` if it less than the config setting" do
expires_at = NaiveDateTime.utc_now() |> Timex.shift(days: 1)

assert {:ok, %{"expires_at" => ^expires_at}} =
ActivityExpirationPolicy.filter(%{"id" => @id, "expires_at" => expires_at})
end

test "owerwrites existing `expires_at` if it greater than the config setting" do
too_distant_future = NaiveDateTime.utc_now() |> Timex.shift(years: 2)

assert {:ok, %{"expires_at" => expires_at}} =
ActivityExpirationPolicy.filter(%{"id" => @id, "expires_at" => too_distant_future})

assert Timex.diff(expires_at, NaiveDateTime.utc_now(), :days) == 364
end

test "ignores remote activities" do
assert {:ok, activity} = ActivityExpirationPolicy.filter(%{"id" => "https://example.com/123"})

refute Map.has_key?(activity, "expires_at")
end
end

Loading…
Cancel
Save