diff options
author | lain <lain@soykaf.club> | 2020-11-27 11:51:24 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-11-27 11:51:24 +0000 |
commit | 14a2c1da13a855d2daa1fa19a59964496d271950 (patch) | |
tree | 3128cb73856eedd32b5bed1b21a3e1a7c8406434 /lib | |
parent | bb522bcc44463d258672f35979a2c939e7199e55 (diff) | |
parent | 6aadb1cb409a80632d17bba487cfabfdb0b13d34 (diff) | |
download | pleroma-14a2c1da13a855d2daa1fa19a59964496d271950.tar.gz |
Merge branch 'fix/2322-digest-algorithm-case-insensitive' into 'develop'
Digest algorithm is taken from header
Closes #2322
See merge request pleroma/pleroma!3176
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/web/plugs/digest_plug.ex | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/lib/pleroma/web/plugs/digest_plug.ex b/lib/pleroma/web/plugs/digest_plug.ex index b521b3073..fb2723b97 100644 --- a/lib/pleroma/web/plugs/digest_plug.ex +++ b/lib/pleroma/web/plugs/digest_plug.ex @@ -7,8 +7,22 @@ defmodule Pleroma.Web.Plugs.DigestPlug do require Logger def read_body(conn, opts) do + digest_algorithm = + with [digest_header] <- Conn.get_req_header(conn, "digest") do + digest_header + |> String.split("=", parts: 2) + |> List.first() + else + _ -> "SHA-256" + end + + unless String.downcase(digest_algorithm) == "sha-256" do + raise ArgumentError, + message: "invalid value for digest algorithm, got: #{digest_algorithm}" + end + {:ok, body, conn} = Conn.read_body(conn, opts) - digest = "SHA-256=" <> (:crypto.hash(:sha256, body) |> Base.encode64()) - {:ok, body, Conn.assign(conn, :digest, digest)} + encoded_digest = :crypto.hash(:sha256, body) |> Base.encode64() + {:ok, body, Conn.assign(conn, :digest, "#{digest_algorithm}=#{encoded_digest}")} end end |