limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity

[#1560] Misc. improvements in ActivityPubController federation state restrictions.

Browse source
This commit is contained in:
Ivan Tashkinov 2020-03-05 21:19:21 +03:00
parent b6fc98d9cd
commit 40765875d4
3 changed files with 32 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/pleroma/plugs/federating_plug.ex
View file

@ -13,13 +13,17 @@ defmodule Pleroma.Web.FederatingPlug do
if federating?() do if federating?() do
conn conn
else else
conn fail(conn)
|> put_status(404)
|> Phoenix.Controller.put_view(Pleroma.Web.ErrorView)
|> Phoenix.Controller.render("404.json")
|> halt()
end end
end end
def federating?, do: Pleroma.Config.get([:instance, :federating]) def federating?, do: Pleroma.Config.get([:instance, :federating])
def fail(conn) do
conn
|> put_status(404)
|> Phoenix.Controller.put_view(Pleroma.Web.ErrorView)
|> Phoenix.Controller.render("404.json")
|> halt()
end
end end

25
lib/pleroma/web/activity_pub/activity_pub_controller.ex
View file

@ -29,6 +29,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
@client_to_server_actions [ @client_to_server_actions [
:whoami, :whoami,
:read_inbox, :read_inbox,
:outbox,
:update_outbox, :update_outbox,
:upload_media, :upload_media,
:followers, :followers,
@ -140,10 +141,14 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
# GET /relay/following # GET /relay/following
def following(%{assigns: %{relay: true}} = conn, _params) do def following(%{assigns: %{relay: true}} = conn, _params) do
conn if FederatingPlug.federating?() do
|> put_resp_content_type("application/activity+json") conn
|> put_view(UserView) |> put_resp_content_type("application/activity+json")
|> render("following.json", %{user: Relay.get_actor()}) |> put_view(UserView)
|> render("following.json", %{user: Relay.get_actor()})
else
FederatingPlug.fail(conn)
end
end end
def following(%{assigns: %{user: for_user}} = conn, %{"nickname" => nickname, "page" => page}) do def following(%{assigns: %{user: for_user}} = conn, %{"nickname" => nickname, "page" => page}) do
@ -177,10 +182,14 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
# GET /relay/followers # GET /relay/followers
def followers(%{assigns: %{relay: true}} = conn, _params) do def followers(%{assigns: %{relay: true}} = conn, _params) do
conn if FederatingPlug.federating?() do
|> put_resp_content_type("application/activity+json") conn
|> put_view(UserView) |> put_resp_content_type("application/activity+json")
|> render("followers.json", %{user: Relay.get_actor()}) |> put_view(UserView)
|> render("followers.json", %{user: Relay.get_actor()})
else
FederatingPlug.fail(conn)
end
end end
def followers(%{assigns: %{user: for_user}} = conn, %{"nickname" => nickname, "page" => page}) do def followers(%{assigns: %{user: for_user}} = conn, %{"nickname" => nickname, "page" => page}) do

9
test/web/activity_pub/activity_pub_controller_test.exs
View file

@ -577,7 +577,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
end end
end end
describe "/users/:nickname/outbox" do describe "GET /users/:nickname/outbox" do
test "it will not bomb when there is no activity", %{conn: conn} do test "it will not bomb when there is no activity", %{conn: conn} do
user = insert(:user) user = insert(:user)
@ -614,7 +614,9 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
assert response(conn, 200) =~ announce_activity.data["object"] assert response(conn, 200) =~ announce_activity.data["object"]
end end
end
describe "POST /users/:nickname/outbox" do
test "it rejects posts from other users", %{conn: conn} do test "it rejects posts from other users", %{conn: conn} do
data = File.read!("test/fixtures/activitypub-client-post-activity.json") |> Poison.decode!() data = File.read!("test/fixtures/activitypub-client-post-activity.json") |> Poison.decode!()
user = insert(:user) user = insert(:user)
@ -1059,9 +1061,10 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
get_uris = [ get_uris = [
"/users/#{user.nickname}", "/users/#{user.nickname}",
"/users/#{user.nickname}/outbox",
"/internal/fetch", "/internal/fetch",
"/relay" "/relay",
"/relay/following",
"/relay/followers"
] ]
for get_uri <- get_uris do for get_uri <- get_uris do