Format the code.
This commit is contained in:
lain
parent
480932c8e5
commit
4afbef39f4
111 changed files with 4912 additions and 2769 deletions
|
|
@ -18,8 +18,9 @@ defmodule Pleroma.Web.Websub.WebsubControllerTest do
|
|||
"hub.lease_seconds": "100"
|
||||
}
|
||||
|
||||
conn = conn
|
||||
|> post(path, data)
|
||||
conn =
|
||||
conn
|
||||
|> post(path, data)
|
||||
|
||||
assert response(conn, 202) == "Accepted"
|
||||
end
|
||||
|
|
@ -34,14 +35,15 @@ defmodule Pleroma.Web.Websub.WebsubControllerTest do
|
|||
"hub.lease_seconds" => "100"
|
||||
}
|
||||
|
||||
conn = conn
|
||||
|> get("/push/subscriptions/#{websub.id}", params)
|
||||
conn =
|
||||
conn
|
||||
|> get("/push/subscriptions/#{websub.id}", params)
|
||||
|
||||
websub = Repo.get(WebsubClientSubscription, websub.id)
|
||||
|
||||
assert response(conn, 200) == "some challenge"
|
||||
assert websub.state == "accepted"
|
||||
assert_in_delta NaiveDateTime.diff(websub.valid_until, NaiveDateTime.utc_now), 100, 5
|
||||
assert_in_delta NaiveDateTime.diff(websub.valid_until, NaiveDateTime.utc_now()), 100, 5
|
||||
end
|
||||
|
||||
test "handles incoming feed updates", %{conn: conn} do
|
||||
|
|
@ -49,10 +51,11 @@ defmodule Pleroma.Web.Websub.WebsubControllerTest do
|
|||
doc = "some stuff"
|
||||
signature = Websub.sign(websub.secret, doc)
|
||||
|
||||
conn = conn
|
||||
|> put_req_header("x-hub-signature", "sha1=" <> signature)
|
||||
|> put_req_header("content-type", "application/atom+xml")
|
||||
|> post("/push/subscriptions/#{websub.id}", doc)
|
||||
conn =
|
||||
conn
|
||||
|> put_req_header("x-hub-signature", "sha1=" <> signature)
|
||||
|> put_req_header("content-type", "application/atom+xml")
|
||||
|> post("/push/subscriptions/#{websub.id}", doc)
|
||||
|
||||
assert response(conn, 200) == "OK"
|
||||
|
||||
|
|
@ -64,10 +67,11 @@ defmodule Pleroma.Web.Websub.WebsubControllerTest do
|
|||
doc = "some stuff"
|
||||
signature = Websub.sign("wrong secret", doc)
|
||||
|
||||
conn = conn
|
||||
|> put_req_header("x-hub-signature", "sha1=" <> signature)
|
||||
|> put_req_header("content-type", "application/atom+xml")
|
||||
|> post("/push/subscriptions/#{websub.id}", doc)
|
||||
conn =
|
||||
conn
|
||||
|> put_req_header("x-hub-signature", "sha1=" <> signature)
|
||||
|> put_req_header("content-type", "application/atom+xml")
|
||||
|> post("/push/subscriptions/#{websub.id}", doc)
|
||||
|
||||
assert response(conn, 500) == "Error"
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ defmodule Pleroma.Web.WebsubTest do
|
|||
sub = insert(:websub_subscription)
|
||||
topic = sub.topic
|
||||
|
||||
getter = fn (_path, _headers, options) ->
|
||||
getter = fn _path, _headers, options ->
|
||||
%{
|
||||
"hub.challenge": challenge,
|
||||
"hub.lease_seconds": seconds,
|
||||
|
|
@ -25,10 +25,11 @@ defmodule Pleroma.Web.WebsubTest do
|
|||
|
||||
assert String.to_integer(seconds) > 0
|
||||
|
||||
{:ok, %HTTPoison.Response{
|
||||
status_code: 200,
|
||||
body: challenge
|
||||
}}
|
||||
{:ok,
|
||||
%HTTPoison.Response{
|
||||
status_code: 200,
|
||||
body: challenge
|
||||
}}
|
||||
end
|
||||
|
||||
{:ok, sub} = Websub.verify(sub, getter)
|
||||
|
|
@ -38,11 +39,12 @@ defmodule Pleroma.Web.WebsubTest do
|
|||
test "a verification of a request that doesn't return 200" do
|
||||
sub = insert(:websub_subscription)
|
||||
|
||||
getter = fn (_path, _headers, _options) ->
|
||||
{:ok, %HTTPoison.Response{
|
||||
status_code: 500,
|
||||
body: ""
|
||||
}}
|
||||
getter = fn _path, _headers, _options ->
|
||||
{:ok,
|
||||
%HTTPoison.Response{
|
||||
status_code: 500,
|
||||
body: ""
|
||||
}}
|
||||
end
|
||||
|
||||
{:error, sub} = Websub.verify(sub, getter)
|
||||
|
|
@ -61,7 +63,7 @@ defmodule Pleroma.Web.WebsubTest do
|
|||
"hub.lease_seconds" => "100"
|
||||
}
|
||||
|
||||
{:ok, subscription } = Websub.incoming_subscription_request(user, data)
|
||||
{:ok, subscription} = Websub.incoming_subscription_request(user, data)
|
||||
assert subscription.topic == Pleroma.Web.OStatus.feed_path(user)
|
||||
assert subscription.state == "requested"
|
||||
assert subscription.secret == "a random secret"
|
||||
|
|
@ -70,7 +72,9 @@ defmodule Pleroma.Web.WebsubTest do
|
|||
|
||||
test "an incoming subscription request for an existing subscription" do
|
||||
user = insert(:user)
|
||||
sub = insert(:websub_subscription, state: "accepted", topic: Pleroma.Web.OStatus.feed_path(user))
|
||||
|
||||
sub =
|
||||
insert(:websub_subscription, state: "accepted", topic: Pleroma.Web.OStatus.feed_path(user))
|
||||
|
||||
data = %{
|
||||
"hub.callback" => sub.callback,
|
||||
|
|
@ -80,7 +84,7 @@ defmodule Pleroma.Web.WebsubTest do
|
|||
"hub.lease_seconds" => "100"
|
||||
}
|
||||
|
||||
{:ok, subscription } = Websub.incoming_subscription_request(user, data)
|
||||
{:ok, subscription} = Websub.incoming_subscription_request(user, data)
|
||||
assert subscription.topic == Pleroma.Web.OStatus.feed_path(user)
|
||||
assert subscription.state == sub.state
|
||||
assert subscription.secret == "a random secret"
|
||||
|
|
@ -90,12 +94,12 @@ defmodule Pleroma.Web.WebsubTest do
|
|||
end
|
||||
|
||||
def accepting_verifier(subscription) do
|
||||
{:ok, %{ subscription | state: "accepted" }}
|
||||
{:ok, %{subscription | state: "accepted"}}
|
||||
end
|
||||
|
||||
test "initiate a subscription for a given user and topic" do
|
||||
subscriber = insert(:user)
|
||||
user = insert(:user, %{info: %{ "topic" => "some_topic", "hub" => "some_hub"}})
|
||||
user = insert(:user, %{info: %{"topic" => "some_topic", "hub" => "some_hub"}})
|
||||
|
||||
{:ok, websub} = Websub.subscribe(subscriber, user, &accepting_verifier/1)
|
||||
assert websub.subscribers == [subscriber.ap_id]
|
||||
|
|
@ -109,12 +113,13 @@ defmodule Pleroma.Web.WebsubTest do
|
|||
test "discovers the hub and canonical url" do
|
||||
topic = "https://mastodon.social/users/lambadalambda.atom"
|
||||
|
||||
getter = fn(^topic) ->
|
||||
getter = fn ^topic ->
|
||||
doc = File.read!("test/fixtures/lambadalambda.atom")
|
||||
{:ok, %{status_code: 200, body: doc}}
|
||||
end
|
||||
|
||||
{:ok, discovered} = Websub.gather_feed_data(topic, getter)
|
||||
|
||||
expected = %{
|
||||
"hub" => "https://mastodon.social/api/push",
|
||||
"uri" => "https://mastodon.social/users/lambadalambda",
|
||||
|
|
@ -122,7 +127,17 @@ defmodule Pleroma.Web.WebsubTest do
|
|||
"name" => "Critical Value",
|
||||
"host" => "mastodon.social",
|
||||
"bio" => "a cool dude.",
|
||||
"avatar" => %{"type" => "Image", "url" => [%{"href" => "https://files.mastodon.social/accounts/avatars/000/000/264/original/1429214160519.gif?1492379244", "mediaType" => "image/gif", "type" => "Link"}]}
|
||||
"avatar" => %{
|
||||
"type" => "Image",
|
||||
"url" => [
|
||||
%{
|
||||
"href" =>
|
||||
"https://files.mastodon.social/accounts/avatars/000/000/264/original/1429214160519.gif?1492379244",
|
||||
"mediaType" => "image/gif",
|
||||
"type" => "Link"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
assert expected == discovered
|
||||
|
|
@ -133,9 +148,16 @@ defmodule Pleroma.Web.WebsubTest do
|
|||
topic = "https://social.heldscal.la/api/statuses/user_timeline/23211.atom"
|
||||
websub = insert(:websub_client_subscription, %{hub: hub, topic: topic})
|
||||
|
||||
poster = fn (^hub, {:form, data}, _headers) ->
|
||||
poster = fn ^hub, {:form, data}, _headers ->
|
||||
assert Keyword.get(data, :"hub.mode") == "subscribe"
|
||||
assert Keyword.get(data, :"hub.callback") == Helpers.websub_url(Pleroma.Web.Endpoint, :websub_subscription_confirmation, websub.id)
|
||||
|
||||
assert Keyword.get(data, :"hub.callback") ==
|
||||
Helpers.websub_url(
|
||||
Pleroma.Web.Endpoint,
|
||||
:websub_subscription_confirmation,
|
||||
websub.id
|
||||
)
|
||||
|
||||
{:ok, %{status_code: 202}}
|
||||
end
|
||||
|
||||
|
|
@ -154,7 +176,7 @@ defmodule Pleroma.Web.WebsubTest do
|
|||
topic = "https://social.heldscal.la/api/statuses/user_timeline/23211.atom"
|
||||
websub = insert(:websub_client_subscription, %{hub: hub, topic: topic})
|
||||
|
||||
poster = fn (^hub, {:form, _data}, _headers) ->
|
||||
poster = fn ^hub, {:form, _data}, _headers ->
|
||||
{:ok, %{status_code: 202}}
|
||||
end
|
||||
|
||||
|
|
@ -162,7 +184,8 @@ defmodule Pleroma.Web.WebsubTest do
|
|||
assert websub.state == "rejected"
|
||||
|
||||
websub = insert(:websub_client_subscription, %{hub: hub, topic: topic})
|
||||
poster = fn (^hub, {:form, _data}, _headers) ->
|
||||
|
||||
poster = fn ^hub, {:form, _data}, _headers ->
|
||||
{:ok, %{status_code: 400}}
|
||||
end
|
||||
|
||||
|
|
@ -172,7 +195,7 @@ defmodule Pleroma.Web.WebsubTest do
|
|||
|
||||
test "sign a text" do
|
||||
signed = Websub.sign("secret", "text")
|
||||
assert signed == "B8392C23690CCF871F37EC270BE1582DEC57A503" |> String.downcase
|
||||
assert signed == "B8392C23690CCF871F37EC270BE1582DEC57A503" |> String.downcase()
|
||||
|
||||
_signed = Websub.sign("secret", [["て"], ['す']])
|
||||
end
|
||||
|
|
@ -180,9 +203,21 @@ defmodule Pleroma.Web.WebsubTest do
|
|||
describe "renewing subscriptions" do
|
||||
test "it renews subscriptions that have less than a day of time left" do
|
||||
day = 60 * 60 * 24
|
||||
now = NaiveDateTime.utc_now
|
||||
still_good = insert(:websub_client_subscription, %{valid_until: NaiveDateTime.add(now, 2 * day), topic: "http://example.org/still_good", state: "accepted"})
|
||||
needs_refresh = insert(:websub_client_subscription, %{valid_until: NaiveDateTime.add(now, day - 100), topic: "http://example.org/needs_refresh", state: "accepted"})
|
||||
now = NaiveDateTime.utc_now()
|
||||
|
||||
still_good =
|
||||
insert(:websub_client_subscription, %{
|
||||
valid_until: NaiveDateTime.add(now, 2 * day),
|
||||
topic: "http://example.org/still_good",
|
||||
state: "accepted"
|
||||
})
|
||||
|
||||
needs_refresh =
|
||||
insert(:websub_client_subscription, %{
|
||||
valid_until: NaiveDateTime.add(now, day - 100),
|
||||
topic: "http://example.org/needs_refresh",
|
||||
state: "accepted"
|
||||
})
|
||||
|
||||
_refresh = Websub.refresh_subscriptions()
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue