diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-09 20:51:44 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-09 20:51:44 +0300 |
| commit | 5fc92deef37dcc4db476520d89dd79e616356e63 (patch) | |
| tree | e9cbf49b1cd01dc145f162d6f1fc8cd334b0a208 /lib/pleroma/web/feed | |
| parent | 027714b519cca63ac943369d0bcc9534ba448a80 (diff) | |
| download | pleroma-5fc92deef37dcc4db476520d89dd79e616356e63.tar.gz | |
[#1560] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring.
Diffstat (limited to 'lib/pleroma/web/feed')
| -rw-r--r-- | lib/pleroma/web/feed/user_controller.ex | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/pleroma/web/feed/user_controller.ex b/lib/pleroma/web/feed/user_controller.ex index 59aabb549..9ba602d9f 100644 --- a/lib/pleroma/web/feed/user_controller.ex +++ b/lib/pleroma/web/feed/user_controller.ex @@ -25,7 +25,12 @@ defmodule Pleroma.Web.Feed.UserController do def feed_redirect(%{assigns: %{format: format}} = conn, _params) when format in ["json", "activity+json"] do - ActivityPubController.call(conn, :user) + with %{halted: false} = conn <- + Pleroma.Plugs.EnsureAuthenticatedPlug.call(conn, + unless_func: &Pleroma.Web.FederatingPlug.federating?/0 + ) do + ActivityPubController.call(conn, :user) + end end def feed_redirect(conn, %{"nickname" => nickname}) do |