Do not limit admins

This commit is contained in:
Egor Kislitsyn 2020-09-20 21:06:16 +04:00
parent 17562bf414
commit e4792ce76a
No known key found for this signature in database
GPG key ID: 1B49CB15B71E7805
2 changed files with 30 additions and 4 deletions

View file

@ -30,12 +30,12 @@ defmodule Pleroma.Backup do
timestamps() timestamps()
end end
def create(user, admin_user_id \\ nil) do def create(user, admin_id \\ nil) do
with :ok <- validate_email_enabled(), with :ok <- validate_email_enabled(),
:ok <- validate_user_email(user), :ok <- validate_user_email(user),
:ok <- validate_limit(user), :ok <- validate_limit(user, admin_id),
{:ok, backup} <- user |> new() |> Repo.insert() do {:ok, backup} <- user |> new() |> Repo.insert() do
BackupWorker.process(backup, admin_user_id) BackupWorker.process(backup, admin_id)
end end
end end
@ -59,7 +59,9 @@ defmodule Pleroma.Backup do
end end
end end
defp validate_limit(user) do defp validate_limit(_user, admin_id) when is_binary(admin_id), do: :ok
defp validate_limit(user, nil) do
case get_last(user.id) do case get_last(user.id) do
%__MODULE__{inserted_at: inserted_at} -> %__MODULE__{inserted_at: inserted_at} ->
days = Pleroma.Config.get([Pleroma.Backup, :limit_days]) days = Pleroma.Config.get([Pleroma.Backup, :limit_days])

View file

@ -2044,6 +2044,30 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
assert_email_sent(Pleroma.Emails.UserEmail.backup_is_ready_email(backup, admin.id)) assert_email_sent(Pleroma.Emails.UserEmail.backup_is_ready_email(backup, admin.id))
end end
test "it doesn't limit admins", %{conn: conn} do
admin = insert(:user, is_admin: true)
token = insert(:oauth_admin_token, user: admin)
user = insert(:user)
assert "" ==
conn
|> assign(:user, admin)
|> assign(:token, token)
|> post("/api/pleroma/admin/backups", %{nickname: user.nickname})
|> json_response(200)
assert [_backup] = Repo.all(Pleroma.Backup)
assert "" ==
conn
|> assign(:user, admin)
|> assign(:token, token)
|> post("/api/pleroma/admin/backups", %{nickname: user.nickname})
|> json_response(200)
assert Repo.aggregate(Pleroma.Backup, :count) == 2
end
end end
end end