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

HTTP sig fixes.

Browse Source
This commit is contained in:
lain 2018-11-27 17:42:45 +01:00
parent f983c1d0c6
commit ec464ef20a
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,6 +98,16 @@ defmodule Pleroma.User.Info do
]) ])
end end
def user_upgrade(info, params) do
info
|> cast(params, [
:ap_enabled,
:source_data,
:banner,
:locked
])
end
def set_source_data(info, source_data) do def set_source_data(info, source_data) do
params = %{source_data: source_data} params = %{source_data: source_data}

2
lib/pleroma/web/http_signatures/http_signatures.ex
View File

@ -65,7 +65,7 @@ defmodule Pleroma.Web.HTTPSignatures do
end end
def sign(user, headers) do def sign(user, headers) do
with {:ok, %{info: %{"keys" => keys}}} <- Pleroma.Web.WebFinger.ensure_keys_present(user), with {:ok, %{info: %{keys: keys}}} <- Pleroma.Web.WebFinger.ensure_keys_present(user),
{:ok, private_key, _} = Pleroma.Web.Salmon.keys_from_pem(keys) do {:ok, private_key, _} = Pleroma.Web.Salmon.keys_from_pem(keys) do
sigstring = build_signing_string(headers, Map.keys(headers)) sigstring = build_signing_string(headers, Map.keys(headers))