Commit 535fddd2 authored by rinpatch's avatar rinpatch

Friendship ended with Postgresql now Cachex is my best friend

parent d9f40b05
...@@ -53,6 +53,16 @@ def start(_type, _args) do ...@@ -53,6 +53,16 @@ def start(_type, _args) do
], ],
id: :cachex_object id: :cachex_object
), ),
worker(
Cachex,
[
:scrubber_cache,
[
limit: 2500
]
],
id: :cachex_scrubber
),
worker( worker(
Cachex, Cachex,
[ [
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
defmodule Pleroma.Object do defmodule Pleroma.Object do
use Ecto.Schema use Ecto.Schema
alias Pleroma.{Repo, Object, User, Activity} alias Pleroma.{Repo, Object, User, Activity, HTML}
import Ecto.{Query, Changeset} import Ecto.{Query, Changeset}
schema "objects" do schema "objects" do
...@@ -73,4 +73,36 @@ def delete(%Object{data: %{"id" => id}} = object) do ...@@ -73,4 +73,36 @@ def delete(%Object{data: %{"id" => id}} = object) do
{:ok, object} {:ok, object}
end end
end end
def get_cached_scrubbed_html(content, scrubbers, object) do
key = "#{generate_scrubber_signature(scrubbers)}|#{object.id}"
Cachex.fetch!(:scrubber_cache, key, fn(_key) -> ensure_scrubbed_html(content, scrubbers) end )
end
def get_cached_stripped_html(content, object) do
get_cached_scrubbed_html(content, HtmlSanitizeEx.Scrubber.StripTags, object)
end
def ensure_scrubbed_html(
content,
scrubbers
) do
{:commit, HTML.filter_tags(content, scrubbers)}
end
defp generate_scrubber_signature(scrubber) when is_atom(scrubber) do
generate_scrubber_signature([scrubber])
end
defp generate_scrubber_signature(scrubbers) do
Enum.reduce(scrubbers, "", fn scrubber, signature ->
# If a scrubber does not have a version(e.g HtmlSanitizeEx.Scrubber) it is assumed it is always 0)
version = if Kernel.function_exported?(scrubber, :version, 0) do
scrubber.version
else
0
end
"#{signature}#{to_string(scrubber)}#{version}"
end)
end
end end
...@@ -128,8 +128,7 @@ def post(user, %{"status" => status} = data) do ...@@ -128,8 +128,7 @@ def post(user, %{"status" => status} = data) do
|> Enum.reduce(%{}, fn {name, file}, acc -> |> Enum.reduce(%{}, fn {name, file}, acc ->
Map.put(acc, name, "#{Pleroma.Web.Endpoint.static_url()}#{file}") Map.put(acc, name, "#{Pleroma.Web.Endpoint.static_url()}#{file}")
end) end)
), ) do
object <- Map.put(object, "scrubber_cache", %{}) do
res = res =
ActivityPub.create(%{ ActivityPub.create(%{
to: to, to: to,
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
defmodule Pleroma.Web.CommonAPI.Utils do defmodule Pleroma.Web.CommonAPI.Utils do
alias Calendar.Strftime alias Calendar.Strftime
alias Comeonin.Pbkdf2 alias Comeonin.Pbkdf2
alias Pleroma.{Activity, Formatter, Object, Repo, HTML} alias Pleroma.{Activity, Formatter, Object, Repo}
alias Pleroma.User alias Pleroma.User
alias Pleroma.Web alias Pleroma.Web
alias Pleroma.Web.ActivityPub.Utils alias Pleroma.Web.ActivityPub.Utils
...@@ -262,83 +262,4 @@ def emoji_from_profile(%{info: _info} = user) do ...@@ -262,83 +262,4 @@ def emoji_from_profile(%{info: _info} = user) do
end) end)
end end
def get_scrubbed_html_for_object(content, scrubber, activity) when is_atom(scrubber) do
get_scrubbed_html_for_object(content, [scrubber], activity)
end
@doc """
Get sanitized HTML from cache, or scrub it and save to cache.
"""
def get_scrubbed_html_for_object(
content,
scrubbers,
%{data: %{"object" => object}} = activity
) do
scrubber_cache =
if is_list(object["scrubber_cache"]) do
object["scrubber_cache"]
else
[]
end
signature = generate_scrubber_signature(scrubbers)
{new_scrubber_cache, scrubbed_html} =
Enum.map_reduce(scrubber_cache, nil, fn
entry, content ->
if Map.keys(entry["scrubbers"]) == Map.keys(signature) do
if entry["scrubbers"] == signature do
{entry, entry["content"]}
else
# Remove the entry if scrubber version is outdated
{nil, nil}
end
else
{entry, content}
end
end)
# Remove nil objects
new_scrubber_cache = Enum.reject(new_scrubber_cache, &is_nil/1)
if scrubbed_html == nil or new_scrubber_cache != scrubber_cache do
scrubbed_html = HTML.filter_tags(content, scrubbers)
new_scrubber_cache = [
%{:scrubbers => signature, :content => scrubbed_html} | new_scrubber_cache
]
update_scrubber_cache(activity, new_scrubber_cache)
scrubbed_html
else
scrubbed_html
end
end
defp generate_scrubber_signature(scrubbers) do
Enum.reduce(scrubbers, %{}, fn scrubber, signature ->
Map.put(
signature,
to_string(scrubber),
# If a scrubber does not have a version(e.g HtmlSanitizeEx.Scrubber) it is assumed it is always 0)
if Kernel.function_exported?(scrubber, :version, 0) do
scrubber.version
else
0
end
)
end)
end
defp update_scrubber_cache(activity, scrubber_cache) do
cng =
Object.change(activity, %{
data: Kernel.put_in(activity.data, ["object", "scrubber_cache"], scrubber_cache)
})
{:ok, _struct} = Repo.update(cng)
end
def get_stripped_html_for_object(content, activity) do
get_scrubbed_html_for_object(content, [HtmlSanitizeEx.Scrubber.StripTags], activity)
end
end end
...@@ -9,6 +9,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do ...@@ -9,6 +9,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
alias Pleroma.HTML alias Pleroma.HTML
alias Pleroma.Repo alias Pleroma.Repo
alias Pleroma.User alias Pleroma.User
alias Pleroma.Object
alias Pleroma.Web.CommonAPI.Utils alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.MediaProxy alias Pleroma.Web.MediaProxy
alias Pleroma.Web.MastodonAPI.AccountView alias Pleroma.Web.MastodonAPI.AccountView
...@@ -120,7 +121,7 @@ def render("status.json", %{activity: %{data: %{"object" => object}} = activity} ...@@ -120,7 +121,7 @@ def render("status.json", %{activity: %{data: %{"object" => object}} = activity}
content = content =
object object
|> render_content() |> render_content()
|> Utils.get_scrubbed_html_for_object(User.html_filter_policy(opts[:for]), activity) |> Object.get_cached_scrubbed_html(User.html_filter_policy(opts[:for]), activity)
%{ %{
id: to_string(activity.id), id: to_string(activity.id),
......
...@@ -244,14 +244,14 @@ def render( ...@@ -244,14 +244,14 @@ def render(
html = html =
content content
|> Utils.get_scrubbed_html_for_object(User.html_filter_policy(opts[:for]), activity) |> Object.get_cached_scrubbed_html(User.html_filter_policy(opts[:for]), activity)
|> Formatter.emojify(object["emoji"]) |> Formatter.emojify(object["emoji"])
text = text =
if content do if content do
content content
|> String.replace(~r/<br\s?\/?>/, "\n") |> String.replace(~r/<br\s?\/?>/, "\n")
|> Utils.get_stripped_html_for_object(activity) |> Object.get_cached_stripped_html(activity)
end end
reply_parent = Activity.get_in_reply_to_activity(activity) reply_parent = Activity.get_in_reply_to_activity(activity)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment