Skip cache when /objects or /activities is authenticated

Ref: fix-local-public
This commit is contained in:
Tusooa Zhu 2022-05-05 19:20:32 -04:00 committed by Haelwenn (lanodan) Monnier
parent e2d24eda57
commit 57c030a0a7
3 changed files with 47 additions and 9 deletions

View file

@ -84,6 +84,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
user <- Map.get(assigns, :user, nil), user <- Map.get(assigns, :user, nil),
{_, true} <- {:visible?, Visibility.visible_for_user?(object, user)} do {_, true} <- {:visible?, Visibility.visible_for_user?(object, user)} do
conn conn
|> maybe_skip_cache(user)
|> assign(:tracking_fun_data, object.id) |> assign(:tracking_fun_data, object.id)
|> set_cache_ttl_for(object) |> set_cache_ttl_for(object)
|> put_resp_content_type("application/activity+json") |> put_resp_content_type("application/activity+json")
@ -112,6 +113,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
user <- Map.get(assigns, :user, nil), user <- Map.get(assigns, :user, nil),
{_, true} <- {:visible?, Visibility.visible_for_user?(activity, user)} do {_, true} <- {:visible?, Visibility.visible_for_user?(activity, user)} do
conn conn
|> maybe_skip_cache(user)
|> maybe_set_tracking_data(activity) |> maybe_set_tracking_data(activity)
|> set_cache_ttl_for(activity) |> set_cache_ttl_for(activity)
|> put_resp_content_type("application/activity+json") |> put_resp_content_type("application/activity+json")
@ -151,6 +153,15 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
assign(conn, :cache_ttl, ttl) assign(conn, :cache_ttl, ttl)
end end
def maybe_skip_cache(conn, user) do
if user do
conn
|> assign(:skip_cache, true)
else
conn
end
end
# GET /relay/following # GET /relay/following
def relay_following(conn, _params) do def relay_following(conn, _params) do
with %{halted: false} = conn <- FederatingPlug.call(conn, []) do with %{halted: false} = conn <- FederatingPlug.call(conn, []) do

View file

@ -97,20 +97,23 @@ defmodule Pleroma.Web.Plugs.Cache do
key = cache_key(conn, opts) key = cache_key(conn, opts)
content_type = content_type(conn) content_type = content_type(conn)
should_cache = not Map.get(conn.assigns, :skip_cache, false)
conn = conn =
cond do unless opts[:tracking_fun] do
Map.get(conn.assigns, :skip_cache, false) -> if should_cache do
conn
!opts[:tracking_fun] ->
@cachex.put(:web_resp_cache, key, {content_type, body}, ttl: ttl) @cachex.put(:web_resp_cache, key, {content_type, body}, ttl: ttl)
conn end
true -> conn
tracking_fun_data = Map.get(conn.assigns, :tracking_fun_data, nil) else
tracking_fun_data = Map.get(conn.assigns, :tracking_fun_data, nil)
if should_cache do
@cachex.put(:web_resp_cache, key, {content_type, body, tracking_fun_data}, ttl: ttl) @cachex.put(:web_resp_cache, key, {content_type, body, tracking_fun_data}, ttl: ttl)
end
opts.tracking_fun.(conn, tracking_fun_data) opts.tracking_fun.(conn, tracking_fun_data)
end end
put_resp_header(conn, "x-cache", "MISS from Pleroma") put_resp_header(conn, "x-cache", "MISS from Pleroma")

View file

@ -291,6 +291,30 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
assert json_response(conn, 200) == ObjectView.render("object.json", %{object: note}) assert json_response(conn, 200) == ObjectView.render("object.json", %{object: note})
end end
test "does not cache authenticated response", %{conn: conn} do
user = insert(:user)
reader = insert(:user)
{:ok, post} =
CommonAPI.post(user, %{status: "test @#{reader.nickname}", visibility: "local"})
object = Object.normalize(post, fetch: false)
uuid = String.split(object.data["id"], "/") |> List.last()
assert response =
conn
|> assign(:user, reader)
|> put_req_header("accept", "application/activity+json")
|> get("/objects/#{uuid}")
json_response(response, 200)
conn
|> put_req_header("accept", "application/activity+json")
|> get("/objects/#{uuid}")
|> json_response(404)
end
test "it returns 404 for non-public messages", %{conn: conn} do test "it returns 404 for non-public messages", %{conn: conn} do
note = insert(:direct_note) note = insert(:direct_note)
uuid = String.split(note.data["id"], "/") |> List.last() uuid = String.split(note.data["id"], "/") |> List.last()