From 59a76ea464998476f8c4814324647f4ae4a7f2cb Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Tue, 13 Mar 2018 17:46:37 +0000 Subject: [PATCH] activitypub transmogrifier: rewrite non-http URLs using the object's external URL Signed-off-by: lain --- .../web/activity_pub/transmogrifier.ex | 20 +++++++++++++++++++ test/web/activity_pub/transmogrifier_test.exs | 13 ++++++++++++ 2 files changed, 33 insertions(+) diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex index 8b1a26ae5..d759ca2b2 100644 --- a/lib/pleroma/web/activity_pub/transmogrifier.ex +++ b/lib/pleroma/web/activity_pub/transmogrifier.ex @@ -210,11 +210,31 @@ def prepare_outgoing(%{"type" => "Create", "object" => %{"type" => "Note"} = obj def prepare_outgoing(%{"type" => type} = data) do data = data + |> maybe_fix_object_url |> Map.put("@context", "https://www.w3.org/ns/activitystreams") {:ok, data} end + def maybe_fix_object_url(data) do + if is_binary(data["object"]) and not String.starts_with?(data["object"], "http") do + case ActivityPub.fetch_object_from_id(data["object"]) do + {:ok, relative_object} -> + if relative_object.data["external_url"] do + data = data + |> Map.put("object", relative_object.data["external_url"]) + else + data + end + e -> + Logger.error("Couldn't fetch #{data["object"]} #{inspect(e)}") + data + end + else + data + end + end + def add_hashtags(object) do tags = (object["tag"] || []) |> Enum.map fn (tag) -> %{"href" => Pleroma.Web.Endpoint.url() <> "/tags/#{tag}", "name" => "##{tag}", "type" => "Hashtag"} end diff --git a/test/web/activity_pub/transmogrifier_test.exs b/test/web/activity_pub/transmogrifier_test.exs index c0ee209f1..51b09b166 100644 --- a/test/web/activity_pub/transmogrifier_test.exs +++ b/test/web/activity_pub/transmogrifier_test.exs @@ -1,6 +1,7 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do use Pleroma.DataCase alias Pleroma.Web.ActivityPub.Transmogrifier + alias Pleroma.Web.OStatus alias Pleroma.Activity alias Pleroma.User alias Pleroma.Repo @@ -220,6 +221,18 @@ test "it sets the 'attributedTo' property to the actor of the object if it doesn assert modified["object"]["actor"] == modified["object"]["attributedTo"] end + + test "it translates ostatus IDs to external URLs" do + incoming = File.read!("test/fixtures/incoming_note_activity.xml") + {:ok, [referent_activity]} = OStatus.handle_incoming(incoming) + + user = insert(:user) + + {:ok, activity, _} = CommonAPI.favorite(referent_activity.id, user) + {:ok, modified} = Transmogrifier.prepare_outgoing(activity.data) + + assert modified["object"] == "http://gs.example.org:4040/index.php/notice/29" + end end describe "user upgrade" do