projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Resolve merge conflicts
[akkoma]
/
lib
/
pleroma
/
plugs
/
http_signature.ex
diff --git
a/lib/pleroma/plugs/http_signature.ex
b/lib/pleroma/plugs/http_signature.ex
index 38bcd3a782d688d3748e710bd3de912206cff64d..e2874c469191ff1f8af1582b45fb3a38ccd7ea42 100644
(file)
--- a/
lib/pleroma/plugs/http_signature.ex
+++ b/
lib/pleroma/plugs/http_signature.ex
@@
-1,5
+1,8
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.Web.Plugs.HTTPSignaturePlug do
defmodule Pleroma.Web.Plugs.HTTPSignaturePlug do
- alias Pleroma.Web.HTTPSignatures
alias Pleroma.Web.ActivityPub.Utils
import Plug.Conn
require Logger
alias Pleroma.Web.ActivityPub.Utils
import Plug.Conn
require Logger
@@
-19,6
+22,8
@@
defmodule Pleroma.Web.Plugs.HTTPSignaturePlug do
cond do
signature && String.contains?(signature, user) ->
cond do
signature && String.contains?(signature, user) ->
+ # set (request-target) header to the appropriate value
+ # we also replace the digest header with the one we computed
conn =
conn
|> put_req_header(
conn =
conn
|> put_req_header(
@@
-26,6
+31,14
@@
defmodule Pleroma.Web.Plugs.HTTPSignaturePlug do
String.downcase("#{conn.method}") <> " #{conn.request_path}"
)
String.downcase("#{conn.method}") <> " #{conn.request_path}"
)
+ conn =
+ if conn.assigns[:digest] do
+ conn
+ |> put_req_header("digest", conn.assigns[:digest])
+ else
+ conn
+ end
+
assign(conn, :valid_signature, HTTPSignatures.validate_conn(conn))
signature ->
assign(conn, :valid_signature, HTTPSignatures.validate_conn(conn))
signature ->