Commit ef682938 authored by vaartis's avatar vaartis
Browse files

Clean captchas up periodically, not schedule it after theyre created

parent 73576ab6
......@@ -14,6 +14,10 @@ def init(_) do
ets_name = Module.concat(method(), Ets)
^ets_name = :ets.new(Module.concat(method(), Ets), @ets_options)
# Clean up old captchas every few minutes
seconds_retained = Pleroma.Config.get!([__MODULE__, :seconds_retained])
Process.send_after(self(), :cleanup, 1000 * seconds_retained)
{:ok, nil}
end
......@@ -38,13 +42,7 @@ def handle_call(:new, _from, state) do
if !enabled do
{:reply, %{type: :none}, state}
else
new_captcha = method().new()
seconds_retained = Pleroma.Config.get!([__MODULE__, :seconds_retained])
# Wait several minutes and if the captcha is still there, delete it
Process.send_after(self(), {:cleanup, new_captcha.token}, 1000 * seconds_retained)
{:reply, new_captcha, state}
{:reply, method().new(), state}
end
end
......@@ -54,8 +52,12 @@ def handle_call({:validate, token, captcha}, _from, state) do
end
@doc false
def handle_info({:cleanup, token}, state) do
method().cleanup(token)
def handle_info(:cleanup, state) do
:ok = method().cleanup()
seconds_retained = Pleroma.Config.get!([__MODULE__, :seconds_retained])
# Schedule the next clenup
Process.send_after(self(), :cleanup, 1000 * seconds_retained)
{:noreply, state}
end
......
......@@ -24,5 +24,5 @@ defmodule Pleroma.Captcha.Service do
@doc """
This function is called periodically to clean up old captchas
"""
@callback cleanup(token :: String.t()) :: :ok
@callback cleanup() :: :ok
end
defmodule Pleroma.Captcha.Kocaptcha do
alias Calendar.DateTime
alias Pleroma.Captcha.Service
@behaviour Service
......@@ -17,7 +19,7 @@ def new() do
token = json_resp["token"]
true = :ets.insert(@ets, {token, json_resp["md5"]})
true = :ets.insert(@ets, {token, json_resp["md5"], DateTime.now_utc()})
%{type: :kocaptcha, token: token, url: endpoint <> json_resp["url"]}
end
......@@ -26,10 +28,10 @@ def new() do
@impl Service
def validate(token, captcha) do
with false <- is_nil(captcha),
[{^token, saved_md5}] <- :ets.lookup(@ets, token),
[{^token, saved_md5, _}] <- :ets.lookup(@ets, token),
true <- :crypto.hash(:md5, captcha) |> Base.encode16() == String.upcase(saved_md5) do
# Clear the saved value
cleanup(token)
:ets.delete(@ets, token)
true
else
......@@ -38,11 +40,17 @@ def validate(token, captcha) do
end
@impl Service
def cleanup(token) do
# Only delete the entry if it exists in the table, because ets:delete raises an exception if it does not
case :ets.lookup(@ets, token) do
[{^token, _}] -> :ets.delete(@ets, token)
_ -> true
end
def cleanup() do
seconds_retained = Pleroma.Config.get!([Pleroma.Captcha, :seconds_retained])
# Go through captchas and remove expired ones
:ets.tab2list(@ets)
|> Enum.each(fn {token, _, time_inserted} ->
# time created + expiration time = time when the captcha should be removed
remove_time = DateTime.add!(time_inserted, seconds_retained)
if DateTime.after?(DateTime.now_utc(), remove_time), do: :ets.delete(@ets, token)
end)
:ok
end
end
......@@ -9,5 +9,5 @@ def new(), do: %{type: :mock}
def validate(_token, _captcha), do: true
@impl Service
def cleanup(_token), do: true
def cleanup(), do: :ok
end
Supports Markdown
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