Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix setting of keys.

Browse Source
This commit is contained in:
lain 2018-11-18 19:33:43 +01:00
parent fc3bcf335e
commit e7cd6e9739
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/pleroma/user/info.ex
View File

@ -15,7 +15,7 @@ defmodule Pleroma.User.Info do
field(:no_rich_text, :boolean, default: false) field(:no_rich_text, :boolean, default: false)
field(:ap_enabled, :boolean, default: false) field(:ap_enabled, :boolean, default: false)
field(:is_moderator, :boolean, default: false) field(:is_moderator, :boolean, default: false)
field(:keys, :map, default: %{}) field(:keys, :string, default: nil)
end end
def set_activation_status(info, deactivated) do def set_activation_status(info, deactivated) do
@ -61,4 +61,12 @@ defmodule Pleroma.User.Info do
def remove_from_block(info, blocked) do def remove_from_block(info, blocked) do
set_blocks(info, List.delete(info.blocks, blocked)) set_blocks(info, List.delete(info.blocks, blocked))
end end
def set_keys(info, keys) do
params = %{keys: keys}
info
|> cast(params, [:keys])
|> validate_required([:keys])
end
end end

14
lib/pleroma/web/web_finger/web_finger.ex
View File

@ -113,16 +113,20 @@ defmodule Pleroma.Web.WebFinger do
# This seems a better fit in Salmon # This seems a better fit in Salmon
def ensure_keys_present(user) do def ensure_keys_present(user) do
info = user.info || %{} info = user.info
if info["keys"] do if info.keys do
{:ok, user} {:ok, user}
else else
{:ok, pem} = Salmon.generate_rsa_pem() {:ok, pem} = Salmon.generate_rsa_pem()
info = Map.put(info, "keys", pem)
Ecto.Changeset.change(user, info: info) info_cng = info
|> User.update_and_set_cache() |> Pleroma.User.Info.set_keys(pem)
cng = Ecto.Changeset.change(user)
|> Ecto.Changeset.put_embed(:info, info_cng)
User.update_and_set_cache(cng)
end end
end end