Move config actions to AdminAPI.ConfigController
This commit is contained in:
parent
1d30608e20
commit
d1ee3527ef
|
@ -9,7 +9,6 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
|
||||||
|
|
||||||
alias Pleroma.Activity
|
alias Pleroma.Activity
|
||||||
alias Pleroma.Config
|
alias Pleroma.Config
|
||||||
alias Pleroma.ConfigDB
|
|
||||||
alias Pleroma.MFA
|
alias Pleroma.MFA
|
||||||
alias Pleroma.ModerationLog
|
alias Pleroma.ModerationLog
|
||||||
alias Pleroma.Plugs.OAuthScopesPlug
|
alias Pleroma.Plugs.OAuthScopesPlug
|
||||||
|
@ -24,7 +23,6 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
|
||||||
alias Pleroma.Web.ActivityPub.Utils
|
alias Pleroma.Web.ActivityPub.Utils
|
||||||
alias Pleroma.Web.AdminAPI
|
alias Pleroma.Web.AdminAPI
|
||||||
alias Pleroma.Web.AdminAPI.AccountView
|
alias Pleroma.Web.AdminAPI.AccountView
|
||||||
alias Pleroma.Web.AdminAPI.ConfigView
|
|
||||||
alias Pleroma.Web.AdminAPI.ModerationLogView
|
alias Pleroma.Web.AdminAPI.ModerationLogView
|
||||||
alias Pleroma.Web.AdminAPI.Report
|
alias Pleroma.Web.AdminAPI.Report
|
||||||
alias Pleroma.Web.AdminAPI.ReportView
|
alias Pleroma.Web.AdminAPI.ReportView
|
||||||
|
@ -38,7 +36,6 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
|
||||||
|
|
||||||
require Logger
|
require Logger
|
||||||
|
|
||||||
@descriptions Pleroma.Docs.JSON.compile()
|
|
||||||
@users_page_size 50
|
@users_page_size 50
|
||||||
|
|
||||||
plug(
|
plug(
|
||||||
|
@ -105,11 +102,9 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
|
||||||
OAuthScopesPlug,
|
OAuthScopesPlug,
|
||||||
%{scopes: ["read"], admin: true}
|
%{scopes: ["read"], admin: true}
|
||||||
when action in [
|
when action in [
|
||||||
:config_show,
|
|
||||||
:list_log,
|
:list_log,
|
||||||
:stats,
|
:stats,
|
||||||
:relay_list,
|
:relay_list,
|
||||||
:config_descriptions,
|
|
||||||
:need_reboot
|
:need_reboot
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
@ -119,7 +114,6 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
|
||||||
%{scopes: ["write"], admin: true}
|
%{scopes: ["write"], admin: true}
|
||||||
when action in [
|
when action in [
|
||||||
:restart,
|
:restart,
|
||||||
:config_update,
|
|
||||||
:resend_confirmation_email,
|
:resend_confirmation_email,
|
||||||
:confirm_email,
|
:confirm_email,
|
||||||
:oauth_app_create,
|
:oauth_app_create,
|
||||||
|
@ -821,105 +815,6 @@ def list_log(conn, params) do
|
||||||
|> render("index.json", %{log: log})
|
|> render("index.json", %{log: log})
|
||||||
end
|
end
|
||||||
|
|
||||||
def config_descriptions(conn, _params) do
|
|
||||||
descriptions = Enum.filter(@descriptions, &whitelisted_config?/1)
|
|
||||||
|
|
||||||
json(conn, descriptions)
|
|
||||||
end
|
|
||||||
|
|
||||||
def config_show(conn, %{"only_db" => true}) do
|
|
||||||
with :ok <- configurable_from_database() do
|
|
||||||
configs = Pleroma.Repo.all(ConfigDB)
|
|
||||||
|
|
||||||
conn
|
|
||||||
|> put_view(ConfigView)
|
|
||||||
|> render("index.json", %{configs: configs})
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def config_show(conn, _params) do
|
|
||||||
with :ok <- configurable_from_database() do
|
|
||||||
configs = ConfigDB.get_all_as_keyword()
|
|
||||||
|
|
||||||
merged =
|
|
||||||
Config.Holder.default_config()
|
|
||||||
|> ConfigDB.merge(configs)
|
|
||||||
|> Enum.map(fn {group, values} ->
|
|
||||||
Enum.map(values, fn {key, value} ->
|
|
||||||
db =
|
|
||||||
if configs[group][key] do
|
|
||||||
ConfigDB.get_db_keys(configs[group][key], key)
|
|
||||||
end
|
|
||||||
|
|
||||||
db_value = configs[group][key]
|
|
||||||
|
|
||||||
merged_value =
|
|
||||||
if !is_nil(db_value) and Keyword.keyword?(db_value) and
|
|
||||||
ConfigDB.sub_key_full_update?(group, key, Keyword.keys(db_value)) do
|
|
||||||
ConfigDB.merge_group(group, key, value, db_value)
|
|
||||||
else
|
|
||||||
value
|
|
||||||
end
|
|
||||||
|
|
||||||
setting = %{
|
|
||||||
group: ConfigDB.convert(group),
|
|
||||||
key: ConfigDB.convert(key),
|
|
||||||
value: ConfigDB.convert(merged_value)
|
|
||||||
}
|
|
||||||
|
|
||||||
if db, do: Map.put(setting, :db, db), else: setting
|
|
||||||
end)
|
|
||||||
end)
|
|
||||||
|> List.flatten()
|
|
||||||
|
|
||||||
json(conn, %{configs: merged, need_reboot: Restarter.Pleroma.need_reboot?()})
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def config_update(conn, %{"configs" => configs}) do
|
|
||||||
with :ok <- configurable_from_database() do
|
|
||||||
{_errors, results} =
|
|
||||||
configs
|
|
||||||
|> Enum.filter(&whitelisted_config?/1)
|
|
||||||
|> Enum.map(fn
|
|
||||||
%{"group" => group, "key" => key, "delete" => true} = params ->
|
|
||||||
ConfigDB.delete(%{group: group, key: key, subkeys: params["subkeys"]})
|
|
||||||
|
|
||||||
%{"group" => group, "key" => key, "value" => value} ->
|
|
||||||
ConfigDB.update_or_create(%{group: group, key: key, value: value})
|
|
||||||
end)
|
|
||||||
|> Enum.split_with(fn result -> elem(result, 0) == :error end)
|
|
||||||
|
|
||||||
{deleted, updated} =
|
|
||||||
results
|
|
||||||
|> Enum.map(fn {:ok, config} ->
|
|
||||||
Map.put(config, :db, ConfigDB.get_db_keys(config))
|
|
||||||
end)
|
|
||||||
|> Enum.split_with(fn config ->
|
|
||||||
Ecto.get_meta(config, :state) == :deleted
|
|
||||||
end)
|
|
||||||
|
|
||||||
Config.TransferTask.load_and_update_env(deleted, false)
|
|
||||||
|
|
||||||
if !Restarter.Pleroma.need_reboot?() do
|
|
||||||
changed_reboot_settings? =
|
|
||||||
(updated ++ deleted)
|
|
||||||
|> Enum.any?(fn config ->
|
|
||||||
group = ConfigDB.from_string(config.group)
|
|
||||||
key = ConfigDB.from_string(config.key)
|
|
||||||
value = ConfigDB.from_binary(config.value)
|
|
||||||
Config.TransferTask.pleroma_need_restart?(group, key, value)
|
|
||||||
end)
|
|
||||||
|
|
||||||
if changed_reboot_settings?, do: Restarter.Pleroma.need_reboot()
|
|
||||||
end
|
|
||||||
|
|
||||||
conn
|
|
||||||
|> put_view(ConfigView)
|
|
||||||
|> render("index.json", %{configs: updated, need_reboot: Restarter.Pleroma.need_reboot?()})
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def restart(conn, _params) do
|
def restart(conn, _params) do
|
||||||
with :ok <- configurable_from_database() do
|
with :ok <- configurable_from_database() do
|
||||||
Restarter.Pleroma.restart(Config.get(:env), 50)
|
Restarter.Pleroma.restart(Config.get(:env), 50)
|
||||||
|
@ -940,28 +835,6 @@ defp configurable_from_database do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
defp whitelisted_config?(group, key) do
|
|
||||||
if whitelisted_configs = Config.get(:database_config_whitelist) do
|
|
||||||
Enum.any?(whitelisted_configs, fn
|
|
||||||
{whitelisted_group} ->
|
|
||||||
group == inspect(whitelisted_group)
|
|
||||||
|
|
||||||
{whitelisted_group, whitelisted_key} ->
|
|
||||||
group == inspect(whitelisted_group) && key == inspect(whitelisted_key)
|
|
||||||
end)
|
|
||||||
else
|
|
||||||
true
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
defp whitelisted_config?(%{"group" => group, "key" => key}) do
|
|
||||||
whitelisted_config?(group, key)
|
|
||||||
end
|
|
||||||
|
|
||||||
defp whitelisted_config?(%{:group => group} = config) do
|
|
||||||
whitelisted_config?(group, config[:key])
|
|
||||||
end
|
|
||||||
|
|
||||||
def reload_emoji(conn, _params) do
|
def reload_emoji(conn, _params) do
|
||||||
Pleroma.Emoji.reload()
|
Pleroma.Emoji.reload()
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,150 @@
|
||||||
|
# Pleroma: A lightweight social networking server
|
||||||
|
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
|
||||||
|
# SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
|
defmodule Pleroma.Web.AdminAPI.ConfigController do
|
||||||
|
use Pleroma.Web, :controller
|
||||||
|
|
||||||
|
alias Pleroma.Config
|
||||||
|
alias Pleroma.ConfigDB
|
||||||
|
alias Pleroma.Plugs.OAuthScopesPlug
|
||||||
|
|
||||||
|
@descriptions Pleroma.Docs.JSON.compile()
|
||||||
|
|
||||||
|
plug(
|
||||||
|
OAuthScopesPlug,
|
||||||
|
%{scopes: ["read"], admin: true}
|
||||||
|
when action in [:show, :descriptions]
|
||||||
|
)
|
||||||
|
|
||||||
|
plug(OAuthScopesPlug, %{scopes: ["write"], admin: true} when action == :update)
|
||||||
|
|
||||||
|
action_fallback(Pleroma.Web.AdminAPI.FallbackController)
|
||||||
|
|
||||||
|
def descriptions(conn, _params) do
|
||||||
|
descriptions = Enum.filter(@descriptions, &whitelisted_config?/1)
|
||||||
|
|
||||||
|
json(conn, descriptions)
|
||||||
|
end
|
||||||
|
|
||||||
|
def show(conn, %{"only_db" => true}) do
|
||||||
|
with :ok <- configurable_from_database() do
|
||||||
|
configs = Pleroma.Repo.all(ConfigDB)
|
||||||
|
render(conn, "index.json", %{configs: configs})
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def show(conn, _params) do
|
||||||
|
with :ok <- configurable_from_database() do
|
||||||
|
configs = ConfigDB.get_all_as_keyword()
|
||||||
|
|
||||||
|
merged =
|
||||||
|
Config.Holder.default_config()
|
||||||
|
|> ConfigDB.merge(configs)
|
||||||
|
|> Enum.map(fn {group, values} ->
|
||||||
|
Enum.map(values, fn {key, value} ->
|
||||||
|
db =
|
||||||
|
if configs[group][key] do
|
||||||
|
ConfigDB.get_db_keys(configs[group][key], key)
|
||||||
|
end
|
||||||
|
|
||||||
|
db_value = configs[group][key]
|
||||||
|
|
||||||
|
merged_value =
|
||||||
|
if not is_nil(db_value) and Keyword.keyword?(db_value) and
|
||||||
|
ConfigDB.sub_key_full_update?(group, key, Keyword.keys(db_value)) do
|
||||||
|
ConfigDB.merge_group(group, key, value, db_value)
|
||||||
|
else
|
||||||
|
value
|
||||||
|
end
|
||||||
|
|
||||||
|
setting = %{
|
||||||
|
group: ConfigDB.convert(group),
|
||||||
|
key: ConfigDB.convert(key),
|
||||||
|
value: ConfigDB.convert(merged_value)
|
||||||
|
}
|
||||||
|
|
||||||
|
if db, do: Map.put(setting, :db, db), else: setting
|
||||||
|
end)
|
||||||
|
end)
|
||||||
|
|> List.flatten()
|
||||||
|
|
||||||
|
json(conn, %{configs: merged, need_reboot: Restarter.Pleroma.need_reboot?()})
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def update(conn, %{"configs" => configs}) do
|
||||||
|
with :ok <- configurable_from_database() do
|
||||||
|
results =
|
||||||
|
configs
|
||||||
|
|> Enum.filter(&whitelisted_config?/1)
|
||||||
|
|> Enum.map(fn
|
||||||
|
%{"group" => group, "key" => key, "delete" => true} = params ->
|
||||||
|
ConfigDB.delete(%{group: group, key: key, subkeys: params["subkeys"]})
|
||||||
|
|
||||||
|
%{"group" => group, "key" => key, "value" => value} ->
|
||||||
|
ConfigDB.update_or_create(%{group: group, key: key, value: value})
|
||||||
|
end)
|
||||||
|
|> Enum.reject(fn {result, _} -> result == :error end)
|
||||||
|
|
||||||
|
{deleted, updated} =
|
||||||
|
results
|
||||||
|
|> Enum.map(fn {:ok, config} ->
|
||||||
|
Map.put(config, :db, ConfigDB.get_db_keys(config))
|
||||||
|
end)
|
||||||
|
|> Enum.split_with(fn config ->
|
||||||
|
Ecto.get_meta(config, :state) == :deleted
|
||||||
|
end)
|
||||||
|
|
||||||
|
Config.TransferTask.load_and_update_env(deleted, false)
|
||||||
|
|
||||||
|
if not Restarter.Pleroma.need_reboot?() do
|
||||||
|
changed_reboot_settings? =
|
||||||
|
(updated ++ deleted)
|
||||||
|
|> Enum.any?(fn config ->
|
||||||
|
group = ConfigDB.from_string(config.group)
|
||||||
|
key = ConfigDB.from_string(config.key)
|
||||||
|
value = ConfigDB.from_binary(config.value)
|
||||||
|
Config.TransferTask.pleroma_need_restart?(group, key, value)
|
||||||
|
end)
|
||||||
|
|
||||||
|
if changed_reboot_settings?, do: Restarter.Pleroma.need_reboot()
|
||||||
|
end
|
||||||
|
|
||||||
|
render(conn, "index.json", %{
|
||||||
|
configs: updated,
|
||||||
|
need_reboot: Restarter.Pleroma.need_reboot?()
|
||||||
|
})
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
defp configurable_from_database do
|
||||||
|
if Config.get(:configurable_from_database) do
|
||||||
|
:ok
|
||||||
|
else
|
||||||
|
{:error, "To use this endpoint you need to enable configuration from database."}
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
defp whitelisted_config?(group, key) do
|
||||||
|
if whitelisted_configs = Config.get(:database_config_whitelist) do
|
||||||
|
Enum.any?(whitelisted_configs, fn
|
||||||
|
{whitelisted_group} ->
|
||||||
|
group == inspect(whitelisted_group)
|
||||||
|
|
||||||
|
{whitelisted_group, whitelisted_key} ->
|
||||||
|
group == inspect(whitelisted_group) && key == inspect(whitelisted_key)
|
||||||
|
end)
|
||||||
|
else
|
||||||
|
true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
defp whitelisted_config?(%{"group" => group, "key" => key}) do
|
||||||
|
whitelisted_config?(group, key)
|
||||||
|
end
|
||||||
|
|
||||||
|
defp whitelisted_config?(%{:group => group} = config) do
|
||||||
|
whitelisted_config?(group, config[:key])
|
||||||
|
end
|
||||||
|
end
|
|
@ -194,9 +194,9 @@ defmodule Pleroma.Web.Router do
|
||||||
delete("/statuses/:id", StatusController, :delete)
|
delete("/statuses/:id", StatusController, :delete)
|
||||||
get("/statuses", StatusController, :index)
|
get("/statuses", StatusController, :index)
|
||||||
|
|
||||||
get("/config", AdminAPIController, :config_show)
|
get("/config", ConfigController, :show)
|
||||||
post("/config", AdminAPIController, :config_update)
|
post("/config", ConfigController, :update)
|
||||||
get("/config/descriptions", AdminAPIController, :config_descriptions)
|
get("/config/descriptions", ConfigController, :descriptions)
|
||||||
get("/need_reboot", AdminAPIController, :need_reboot)
|
get("/need_reboot", AdminAPIController, :need_reboot)
|
||||||
get("/restart", AdminAPIController, :restart)
|
get("/restart", AdminAPIController, :restart)
|
||||||
|
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue