Merge pull request 'Respect activity restrictions in account statuses' (#7943) from mkljczk/pleroma:issue-2604-restrict-account-statuses into develop

Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7943
This commit is contained in:
lain 2026-07-29 06:44:26 +00:00
commit 1dd6a345bf
4 changed files with 212 additions and 0 deletions

View file

@ -458,6 +458,170 @@ defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do
assert [%{"id" => ^image_post_id}] = json_response_and_validate_schema(conn, 200)
end
test "media respects activity restrictions when unauthenticated profiles are enabled", %{
conn: conn
} do
clear_config([:instance, :public], false)
clear_config([:restrict_unauthenticated, :profiles, :local], false)
user = insert(:user)
file = %Plug.Upload{
content_type: "image/jpeg",
path: Path.absname("test/fixtures/image.jpg"),
filename: "an_image.jpg"
}
{:ok, %{id: media_id}} = ActivityPub.upload(file, actor: user.ap_id)
{:ok, activity} = CommonAPI.post(user, %{status: "cofe", media_ids: [media_id]})
user_id = user.id
assert %{"id" => ^user_id} =
build_conn()
|> get("/api/v1/accounts/#{user.id}")
|> json_response_and_validate_schema(200)
assert [] =
build_conn()
|> get("/api/v1/accounts/#{user.id}/statuses?only_media=true")
|> json_response_and_validate_schema(200)
assert [%{"id" => activity_id}] =
conn
|> get("/api/v1/accounts/#{user.id}/statuses?only_media=true")
|> json_response_and_validate_schema(200)
assert activity_id == activity.id
end
test "remote activity restrictions apply to created and boosted objects", %{conn: conn} do
clear_config([:restrict_unauthenticated, :activities, :local], false)
clear_config([:restrict_unauthenticated, :activities, :remote], true)
local_user = insert(:user)
remote_user = insert(:user, local: false, domain: "example.com")
local_activity = insert(:note_activity, user: local_user)
mixed_create =
insert(:note_activity, local: true, object_local: false, user: local_user)
remote_activity =
insert(:note_activity, local: false, object_local: false, user: remote_user)
{:ok, announce} = CommonAPI.repeat(remote_activity.id, local_user)
status_ids =
build_conn()
|> get("/api/v1/accounts/#{local_user.id}/statuses")
|> json_response_and_validate_schema(200)
|> Enum.map(& &1["id"])
assert local_activity.id in status_ids
refute mixed_create.id in status_ids
refute announce.id in status_ids
authenticated_status_ids =
conn
|> get("/api/v1/accounts/#{local_user.id}/statuses")
|> json_response_and_validate_schema(200)
|> Enum.map(& &1["id"])
assert local_activity.id in authenticated_status_ids
assert mixed_create.id in authenticated_status_ids
assert announce.id in authenticated_status_ids
end
test "local activity restrictions apply to created and boosted objects", %{conn: conn} do
clear_config([:restrict_unauthenticated, :activities, :local], true)
clear_config([:restrict_unauthenticated, :activities, :remote], false)
local_user = insert(:user)
remote_user = insert(:user, local: false, domain: "example.com")
local_activity = insert(:note_activity, user: local_user)
remote_activity =
insert(:note_activity, local: false, object_local: false, user: remote_user)
mixed_create =
insert(:note_activity, local: false, object_local: true, user: remote_user)
remote_announce =
insert(:announce_activity, note_activity: local_activity, user: remote_user)
|> Ecto.Changeset.change(%{
local: false,
recipients: ["https://www.w3.org/ns/activitystreams#Public"]
})
|> Repo.update!()
status_ids =
build_conn()
|> get("/api/v1/accounts/#{remote_user.id}/statuses")
|> json_response_and_validate_schema(200)
|> Enum.map(& &1["id"])
assert remote_activity.id in status_ids
refute mixed_create.id in status_ids
refute remote_announce.id in status_ids
authenticated_status_ids =
conn
|> get("/api/v1/accounts/#{remote_user.id}/statuses")
|> json_response_and_validate_schema(200)
|> Enum.map(& &1["id"])
assert remote_activity.id in authenticated_status_ids
assert mixed_create.id in authenticated_status_ids
assert remote_announce.id in authenticated_status_ids
end
test "restricted local accounts reject activities with mismatched remote origins", %{
conn: conn
} do
clear_config([:restrict_unauthenticated, :activities, :local], true)
clear_config([:restrict_unauthenticated, :activities, :remote], false)
local_user = insert(:user)
mismatched_activity =
insert(:note_activity, local: false, object_local: false, user: local_user)
assert [] =
build_conn()
|> get("/api/v1/accounts/#{local_user.id}/statuses")
|> json_response_and_validate_schema(200)
assert [%{"id" => activity_id}] =
conn
|> get("/api/v1/accounts/#{local_user.id}/statuses")
|> json_response_and_validate_schema(200)
assert activity_id == mismatched_activity.id
end
test "restricted remote accounts reject activities with mismatched local origins", %{
conn: conn
} do
clear_config([:restrict_unauthenticated, :activities, :local], false)
clear_config([:restrict_unauthenticated, :activities, :remote], true)
remote_user = insert(:user, local: false, domain: "example.com")
mismatched_activity =
insert(:note_activity, local: true, object_local: true, user: remote_user)
assert [] =
build_conn()
|> get("/api/v1/accounts/#{remote_user.id}/statuses")
|> json_response_and_validate_schema(200)
assert [%{"id" => activity_id}] =
conn
|> get("/api/v1/accounts/#{remote_user.id}/statuses")
|> json_response_and_validate_schema(200)
assert activity_id == mismatched_activity.id
end
test "gets a user's statuses without reblogs", %{user: user, conn: conn} do
{:ok, %{id: post_id}} = CommonAPI.post(user, %{status: "HI!!!"})
{:ok, _} = CommonAPI.repeat(post_id, user)