moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

activitypub: user view: do not expose oAuth endpoints for instance users

This commit is contained in:
William Pitcock 2019-02-14 02:41:21 +00:00
parent d54c483964
commit 64620d8980
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pleroma/web/activity_pub/views/user_view.ex
View File

@ -17,7 +17,11 @@ defmodule Pleroma.Web.ActivityPub.UserView do
import Ecto.Query import Ecto.Query
def render("endpoints.json", %{user: %User{nickname: _nickname, local: true} = _user}) do def render("endpoints.json", %{user: %User{nickname: nil, local: true} = _user}) do
%{"sharedInbox" => Helpers.activity_pub_url(Endpoint, :inbox)}
end
def render("endpoints.json", %{user: %User{local: true} = _user}) do
%{ %{
"oauthAuthorizationEndpoint" => Helpers.o_auth_url(Endpoint, :authorize), "oauthAuthorizationEndpoint" => Helpers.o_auth_url(Endpoint, :authorize),
"oauthRegistrationEndpoint" => Helpers.mastodon_api_url(Endpoint, :create_app), "oauthRegistrationEndpoint" => Helpers.mastodon_api_url(Endpoint, :create_app),

11
test/web/activity_pub/views/user_view_test.exs
View File

@ -42,5 +42,16 @@ test "remote users have an empty endpoints structure" do
assert result["id"] == user.ap_id assert result["id"] == user.ap_id
assert result["endpoints"] == %{} assert result["endpoints"] == %{}
end end
test "instance users do not expose oAuth endpoints" do
user = insert(:user, nickname: nil, local: true)
{:ok, user} = Pleroma.Web.WebFinger.ensure_keys_present(user)
result = UserView.render("user.json", %{user: user})
refute result["endpoints"]["oauthAuthorizationEndpoint"]
refute result["endpoints"]["oauthRegistrationEndpoint"]
refute result["endpoints"]["oauthTokenEndpoint"]
end
end end
end end