projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
streamer: use direct object for filter checks when there is no valid child object...
[akkoma]
/
lib
/
pleroma
/
signature.ex
diff --git
a/lib/pleroma/signature.ex
b/lib/pleroma/signature.ex
index 2a0823ecf73f4580f9f559ba580da5c639a5880a..1e7c9ae86ffa1ecd3580712c8f27288e16a9f8c4 100644
(file)
--- a/
lib/pleroma/signature.ex
+++ b/
lib/pleroma/signature.ex
@@
-10,9
+10,18
@@
defmodule Pleroma.Signature do
alias Pleroma.Web.ActivityPub.ActivityPub
def key_id_to_actor_id(key_id) do
alias Pleroma.Web.ActivityPub.ActivityPub
def key_id_to_actor_id(key_id) do
- URI.parse(key_id)
- |> Map.put(:fragment, nil)
- |> URI.to_string()
+ uri =
+ URI.parse(key_id)
+ |> Map.put(:fragment, nil)
+
+ uri =
+ if not is_nil(uri.path) and String.ends_with?(uri.path, "/publickey") do
+ Map.put(uri, :path, String.replace(uri.path, "/publickey", ""))
+ else
+ uri
+ end
+
+ URI.to_string(uri)
end
def fetch_public_key(conn) do
end
def fetch_public_key(conn) do
@@
-39,9
+48,15
@@
defmodule Pleroma.Signature do
end
def sign(%User{} = user, headers) do
end
def sign(%User{} = user, headers) do
- with {:ok, %{
info: %{keys: keys}
}} <- User.ensure_keys_present(user),
+ with {:ok, %{
keys: keys
}} <- User.ensure_keys_present(user),
{:ok, private_key, _} <- Keys.keys_from_pem(keys) do
HTTPSignatures.sign(private_key, user.ap_id <> "#main-key", headers)
end
end
{:ok, private_key, _} <- Keys.keys_from_pem(keys) do
HTTPSignatures.sign(private_key, user.ap_id <> "#main-key", headers)
end
end
+
+ def signed_date, do: signed_date(NaiveDateTime.utc_now())
+
+ def signed_date(%NaiveDateTime{} = date) do
+ Timex.format!(date, "{WDshort}, {0D} {Mshort} {YYYY} {h24}:{m}:{s} GMT")
+ end
end
end