projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
9b85592
)
Merge branch 'fix/admin-controller-atom-leak' into 'develop'
author
rinpatch
<rinpatch@sdf.org>
Mon, 7 Sep 2020 11:38:15 +0000
(11:38 +0000)
committer
rinpatch
<rinpatch@sdf.org>
Tue, 8 Sep 2020 11:00:00 +0000
(14:00 +0300)
Fix atom leak in AdminAPIController
See merge request pleroma/secteam/pleroma!6
lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
patch
|
blob
|
history
diff --git
a/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
index aa2af1ab5495a4715f79d11c0a8a2bffc1ae01e5..f5e4d49f9ac2aaa8445188933dc9bb7909328187 100644
(file)
--- a/
lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
+++ b/
lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
@@
-379,8
+379,7
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
filters
|> String.split(",")
|> Enum.filter(&Enum.member?(@filters, &1))
- |> Enum.map(&String.to_atom/1)
- |> Map.new(&{&1, true})
+ |> Map.new(&{String.to_existing_atom(&1), true})
end
def right_add_multiple(%{assigns: %{user: admin}} = conn, %{