hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#3053] No auth check in StaticFEController, even on non-federating instances. Adjusted tests.

Browse source
This commit is contained in:
Ivan Tashkinov 2020-10-02 22:18:02 +03:00
commit f6024252ae
9 changed files with 162 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/web/feed/tag_controller.ex
View file

@ -10,14 +10,14 @@ defmodule Pleroma.Web.Feed.TagController do
alias Pleroma.Web.Feed.FeedView
def feed(conn, params) do
unless Pleroma.Config.restrict_unauthenticated_access?(:activities, :local) do
unless Config.restrict_unauthenticated_access?(:activities, :local) do
render_feed(conn, params)
else
render_error(conn, :not_found, "Not found")
end
end
def render_feed(conn, %{"tag" => raw_tag} = params) do
defp render_feed(conn, %{"tag" => raw_tag} = params) do
{format, tag} = parse_tag(raw_tag)
activities =

4
lib/pleroma/web/feed/user_controller.ex
View file

@ -40,11 +40,11 @@ defmodule Pleroma.Web.Feed.UserController do
end
end
def render_feed(conn, %{"nickname" => nickname} = params) do
defp render_feed(conn, %{"nickname" => nickname} = params) do
format = get_format(conn)
format =
if format in ["rss", "atom"] do
if format in ["atom", "rss"] do
format
else
"atom"