Browse Source

Don't crypt raw iolists.

tags/v0.9.9
Roger Braun 7 years ago
parent
commit
89c1e90eb2
2 changed files with 9 additions and 1 deletions
  1. +2
    -1
      lib/pleroma/web/websub/websub.ex
  2. +7
    -0
      test/web/websub/websub_test.exs

+ 2
- 1
lib/pleroma/web/websub/websub.ex View File

@@ -41,6 +41,7 @@ defmodule Pleroma.Web.Websub do
Enum.each(subscriptions, fn(sub) ->
response = FeedRepresenter.to_simple_form(user, [activity], [user])
|> :xmerl.export_simple(:xmerl_xml)
|> to_string

signature = sign(sub.secret, response)
HTTPoison.post(sub.callback, response, [
@@ -51,7 +52,7 @@ defmodule Pleroma.Web.Websub do
end

def sign(secret, doc) do
:crypto.hmac(:sha, secret, doc) |> Base.encode16
:crypto.hmac(:sha, secret, to_string(doc)) |> Base.encode16
end

def incoming_subscription_request(user, %{"hub.mode" => "subscribe"} = params) do


+ 7
- 0
test/web/websub/websub_test.exs View File

@@ -167,4 +167,11 @@ defmodule Pleroma.Web.WebsubTest do
{:error, websub} = Websub.request_subscription(websub, poster, 1000)
assert websub.state == "rejected"
end

test "sign a text" do
signed = Websub.sign("secret", "text")
assert signed == "B8392C23690CCF871F37EC270BE1582DEC57A503"

signed = Websub.sign("secret", [["て"], ['す']])
end
end

Loading…
Cancel
Save