projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
[akkoma]
/
lib
/
pleroma
/
signature.ex
diff --git
a/lib/pleroma/signature.ex
b/lib/pleroma/signature.ex
index 0bf49fd7c0d2cfcd861f2f6b60f0ccd278877ae3..6b0b2c969645fd93fa3c4716f95a55c0aa2acf08 100644
(file)
--- a/
lib/pleroma/signature.ex
+++ b/
lib/pleroma/signature.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Signature do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Signature do
@@
-15,7
+15,7
@@
defmodule Pleroma.Signature do
|> Map.put(:fragment, nil)
uri =
|> Map.put(:fragment, nil)
uri =
- if String.ends_with?(uri.path, "/publickey") do
+ 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
Map.put(uri, :path, String.replace(uri.path, "/publickey", ""))
else
uri
@@
-48,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