Page MenuHomePhorge
Files F85830640

No OneTemporary
Actions

Authored By
Unknown
Size
10 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/lib/pleroma/web/ostatus/feed_representer.ex b/lib/pleroma/web/ostatus/feed_representer.ex
index def684405..1576b4710 100644
--- a/lib/pleroma/web/ostatus/feed_representer.ex
+++ b/lib/pleroma/web/ostatus/feed_representer.ex
@@ -1,28 +1,28 @@
defmodule Pleroma.Web.OStatus.FeedRepresenter do
alias Pleroma.Web.OStatus
alias Pleroma.Web.OStatus.{UserRepresenter, ActivityRepresenter}
def to_simple_form(user, activities, users) do
most_recent_update = List.first(activities).updated_at
|> NaiveDateTime.to_iso8601
h = fn(str) -> [to_charlist(str)] end
entries = Enum.map(activities, fn(activity) ->
{:entry, ActivityRepresenter.to_simple_form(activity, user)}
end)
[{
:feed, [
xmlns: 'http://www.w3.org/2005/Atom',
"xmlns:activity": 'http://activitystrea.ms/spec/1.0/'
], [
{:id, h.(OStatus.feed_path(user))},
{:title, ['#{user.nickname}\'s timeline']},
{:updated, h.(most_recent_update)},
- {:link, [rel: 'hub', href: h.(OStatus.pubsub_path)], []},
+ {:link, [rel: 'hub', href: h.(OStatus.pubsub_path(user))], []},
{:author, UserRepresenter.to_simple_form(user)}
] ++ entries
}]
end
end
diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex
index 9fcbe6cb0..d21b9078f 100644
--- a/lib/pleroma/web/ostatus/ostatus.ex
+++ b/lib/pleroma/web/ostatus/ostatus.ex
@@ -1,14 +1,14 @@
defmodule Pleroma.Web.OStatus do
alias Pleroma.Web
def feed_path(user) do
"#{user.ap_id}/feed.atom"
end
- def pubsub_path() do
- "#{Web.base_url}/push/hub"
+ def pubsub_path(user) do
+ "#{Web.base_url}/push/hub/#{user.nickname}"
end
def user_path(user) do
end
end
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 0264d8d3f..33e395218 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -1,84 +1,84 @@
defmodule Pleroma.Web.Router do
use Pleroma.Web, :router
alias Pleroma.{Repo, User}
def user_fetcher(username) do
{:ok, Repo.get_by(User, %{nickname: username})}
end
pipeline :api do
plug :accepts, ["json"]
plug :fetch_session
plug Pleroma.Plugs.AuthenticationPlug, %{fetcher: &Pleroma.Web.Router.user_fetcher/1, optional: true}
end
pipeline :authenticated_api do
plug :accepts, ["json"]
plug :fetch_session
plug Pleroma.Plugs.AuthenticationPlug, %{fetcher: &Pleroma.Web.Router.user_fetcher/1}
end
pipeline :well_known do
plug :accepts, ["xml", "xrd+xml"]
end
scope "/api", Pleroma.Web do
pipe_through :api
get "/help/test", TwitterAPI.Controller, :help_test
get "/statuses/public_timeline", TwitterAPI.Controller, :public_timeline
get "/statuses/public_and_external_timeline", TwitterAPI.Controller, :public_timeline
get "/statuses/show/:id", TwitterAPI.Controller, :fetch_status
get "/statusnet/conversation/:id", TwitterAPI.Controller, :fetch_conversation
get "/statusnet/config", TwitterAPI.Controller, :config
post "/account/register", TwitterAPI.Controller, :register
end
scope "/api", Pleroma.Web do
pipe_through :authenticated_api
get "/account/verify_credentials", TwitterAPI.Controller, :verify_credentials
post "/account/verify_credentials", TwitterAPI.Controller, :verify_credentials
post "/statuses/update", TwitterAPI.Controller, :status_update
get "/statuses/home_timeline", TwitterAPI.Controller, :friends_timeline
get "/statuses/friends_timeline", TwitterAPI.Controller, :friends_timeline
post "/friendships/create", TwitterAPI.Controller, :follow
post "/friendships/destroy", TwitterAPI.Controller, :unfollow
post "/statusnet/media/upload", TwitterAPI.Controller, :upload
post "/media/upload", TwitterAPI.Controller, :upload_json
post "/favorites/create/:id", TwitterAPI.Controller, :favorite
post "/favorites/create", TwitterAPI.Controller, :favorite
post "/favorites/destroy/:id", TwitterAPI.Controller, :unfavorite
post "/statuses/retweet/:id", TwitterAPI.Controller, :retweet
post "/qvitter/update_avatar", TwitterAPI.Controller, :update_avatar
end
pipeline :ostatus do
plug :accepts, ["xml", "atom"]
end
scope "/", Pleroma.Web do
pipe_through :ostatus
get "/users/:nickname/feed", OStatus.OStatusController, :feed
- post "/push/hub", OStatus.OStatusController, :temp
+ post "/push/hub/:nickname", Websub.WebsubController, :websub_subscription_request
end
scope "/.well-known", Pleroma.Web do
pipe_through :well_known
get "/host-meta", WebFinger.WebFingerController, :host_meta
get "/webfinger", WebFinger.WebFingerController, :webfinger
end
scope "/", Fallback do
get "/*path", RedirectController, :redirector
end
end
defmodule Fallback.RedirectController do
use Pleroma.Web, :controller
def redirector(conn, _params), do: send_file(conn, 200, "priv/static/index.html")
end
diff --git a/lib/pleroma/web/websub/websub_controller.ex b/lib/pleroma/web/websub/websub_controller.ex
new file mode 100644
index 000000000..09305c337
--- /dev/null
+++ b/lib/pleroma/web/websub/websub_controller.ex
@@ -0,0 +1,48 @@
+defmodule Pleroma.Web.Websub.WebsubController do
+ use Pleroma.Web, :controller
+ alias Pleroma.Web.Websub.WebsubServerSubscription
+ alias Pleroma.{Repo, User}
+ alias Pleroma.Web.OStatus
+ def websub_subscription_request(conn, %{"nickname" => nickname} = params) do
+ user = User.get_cached_by_nickname(nickname)
+
+ with {:ok, topic} <- valid_topic(params, user),
+ {:ok, lease_time} <- lease_time(params),
+ secret <- params["hub.secret"]
+ do
+ data = %{
+ state: "requested",
+ topic: topic,
+ secret: secret
+ }
+
+ change = Ecto.Changeset.change(%WebsubServerSubscription{}, data)
+ websub = Repo.insert!(change)
+
+ change = Ecto.Changeset.change(websub, %{valid_until: NaiveDateTime.add(websub.inserted_at, lease_time)})
+ websub = Repo.update!(change)
+
+ conn
+ |> send_resp(202, "Accepted")
+ else {:error, reason} ->
+ conn
+ |> send_resp(500, reason)
+ end
+ end
+
+ defp lease_time(%{"hub.lease_seconds" => lease_seconds}) do
+ {:ok, lease_seconds}
+ end
+
+ defp lease_time(_) do
+ {:ok, 60 * 60 * 24 * 3} # three days
+ end
+
+ defp valid_topic(%{"hub.topic" => topic}, user) do
+ if topic == OStatus.feed_path(user) do
+ {:ok, topic}
+ else
+ {:error, "Wrong topic requested, expected #{OStatus.feed_path(user)}, got #{topic}"}
+ end
+ end
+end
diff --git a/lib/pleroma/web/websub/websub_server_subscription.ex b/lib/pleroma/web/websub/websub_server_subscription.ex
index 2562239ad..a29dd5860 100644
--- a/lib/pleroma/web/websub/websub_server_subscription.ex
+++ b/lib/pleroma/web/websub/websub_server_subscription.ex
@@ -1,11 +1,13 @@
defmodule Pleroma.Web.Websub.WebsubServerSubscription do
use Ecto.Schema
schema "websub_server_subscriptions" do
field :topic, :string
field :callback, :string
field :secret, :string
field :valid_until, :naive_datetime
field :state, :string
+
+ timestamps()
end
end
diff --git a/test/web/ostatus/feed_representer_test.exs b/test/web/ostatus/feed_representer_test.exs
index dddc63ebf..3d8eaac6e 100644
--- a/test/web/ostatus/feed_representer_test.exs
+++ b/test/web/ostatus/feed_representer_test.exs
@@ -1,44 +1,44 @@
defmodule Pleroma.Web.OStatus.FeedRepresenterTest do
use Pleroma.DataCase
import Pleroma.Factory
alias Pleroma.User
alias Pleroma.Web.OStatus.{FeedRepresenter, UserRepresenter, ActivityRepresenter}
alias Pleroma.Web.OStatus
test "returns a feed of the last 20 items of the user" do
note_activity = insert(:note_activity)
user = User.get_cached_by_ap_id(note_activity.data["actor"])
tuple = FeedRepresenter.to_simple_form(user, [note_activity], [user])
most_recent_update = note_activity.updated_at
|> NaiveDateTime.to_iso8601
res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary
user_xml = UserRepresenter.to_simple_form(user)
|> :xmerl.export_simple_content(:xmerl_xml)
entry_xml = ActivityRepresenter.to_simple_form(note_activity, user)
|> :xmerl.export_simple_content(:xmerl_xml)
expected = """
<feed xmlns="http://www.w3.org/2005/Atom" xmlns:activity="http://activitystrea.ms/spec/1.0/">
<id>#{OStatus.feed_path(user)}</id>
<title>#{user.nickname}'s timeline</title>
<updated>#{most_recent_update}</updated>
- <link rel="hub" href="#{OStatus.pubsub_path}" />
+ <link rel="hub" href="#{OStatus.pubsub_path(user)}" />
<author>
#{user_xml}
</author>
<entry>
#{entry_xml}
</entry>
</feed>
"""
assert clean(res) == clean(expected)
end
defp clean(string) do
String.replace(string, ~r/\s/, "")
end
end
diff --git a/test/web/websub/websub_controller_test.exs b/test/web/websub/websub_controller_test.exs
new file mode 100644
index 000000000..4eff598d6
--- /dev/null
+++ b/test/web/websub/websub_controller_test.exs
@@ -0,0 +1,30 @@
+defmodule Pleroma.Web.Websub.WebsubControllerTest do
+ use Pleroma.Web.ConnCase
+ import Pleroma.Factory
+ alias Pleroma.Repo
+ alias Pleroma.Web.Websub.WebsubServerSubscription
+
+ test "websub subscription request", %{conn: conn} do
+ user = insert(:user)
+
+ path = Pleroma.Web.OStatus.pubsub_path(user)
+
+ data = %{
+ "hub.callback": "http://example.org/sub",
+ "hub.mode": "subscription",
+ "hub.topic": Pleroma.Web.OStatus.feed_path(user),
+ "hub.secret": "a random secret",
+ "hub.lease_seconds": 100
+ }
+
+ conn = conn
+ |> post(path, data)
+
+ assert response(conn, 202) == "Accepted"
+ subscription = Repo.one!(WebsubServerSubscription)
+ assert subscription.topic == Pleroma.Web.OStatus.feed_path(user)
+ assert subscription.state == "requested"
+ assert subscription.secret == "a random secret"
+ assert subscription.valid_until == NaiveDateTime.add(subscription.inserted_at, 100)
+ end
+end

File Metadata

Mime Type
text/x-diff
Expires
Sun, Nov 1, 5:45 AM (14 h, 37 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1802594
Default Alt Text
(10 KB)

Event Timeline