hamlab/mobilizon-frontend
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Handle user gone and fix more public key stuff

Browse Source 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel
2018-11-08 16:11:23 +01:00
parent 04e342c897
commit c7ccbf1c47
3 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/service/http_signatures/http_signatures.ex
View File

@@ -44,14 +44,17 @@ defmodule Mobilizon.Service.HTTPSignatures do
defp prepare_public_key(public_key_code) do
with [public_key_entry] <- :public_key.pem_decode(public_key_code) do
:public_key.pem_entry_decode(public_key_entry)
else
_err ->
{:error, :pem_decode_error}
end
end
def validate_conn(conn) do
# TODO: How to get the right key and see if it is actually valid for that request.
# For now, fetch the key for the actor.
with public_key <-
conn.params["actor"] |> Actor.get_public_key_for_url() |> prepare_public_key() do
with {:ok, public_key} <- conn.params["actor"] |> Actor.get_public_key_for_url(),
{:ok, public_key} <- prepare_public_key(public_key) do
if validate_conn(conn, public_key) do
true
else
@@ -59,7 +62,8 @@ defmodule Mobilizon.Service.HTTPSignatures do
# Fetch user anew and try one more time
with actor_id <- conn.params["actor"],
{:ok, _actor} <- ActivityPub.make_actor_from_url(actor_id),
public_key <- actor_id |> Actor.get_public_key_for_url() |> prepare_public_key() do
{:ok, public_key} <- actor_id |> Actor.get_public_key_for_url(),
{:ok, public_key} <- prepare_public_key(public_key) do
validate_conn(conn, public_key)
end
end