Require admin access for webhooks
This commit is contained in:
parent
9061851fed
commit
27090ad7e6
2 changed files with 23 additions and 10 deletions
|
|
@ -316,6 +316,15 @@ defmodule Pleroma.Web.Router do
|
||||||
post("/rules", RuleController, :create)
|
post("/rules", RuleController, :create)
|
||||||
patch("/rules/:id", RuleController, :update)
|
patch("/rules/:id", RuleController, :update)
|
||||||
delete("/rules/:id", RuleController, :delete)
|
delete("/rules/:id", RuleController, :delete)
|
||||||
|
|
||||||
|
get("/webhooks", WebhookController, :index)
|
||||||
|
get("/webhooks/:id", WebhookController, :show)
|
||||||
|
post("/webhooks", WebhookController, :create)
|
||||||
|
patch("/webhooks/:id", WebhookController, :update)
|
||||||
|
delete("/webhooks/:id", WebhookController, :delete)
|
||||||
|
post("/webhooks/:id/enable", WebhookController, :enable)
|
||||||
|
post("/webhooks/:id/disable", WebhookController, :disable)
|
||||||
|
post("/webhooks/:id/rotate_secret", WebhookController, :rotate_secret)
|
||||||
end
|
end
|
||||||
|
|
||||||
# AdminAPI: admins and mods (staff) can perform these actions (if privileged by role)
|
# AdminAPI: admins and mods (staff) can perform these actions (if privileged by role)
|
||||||
|
|
@ -327,15 +336,6 @@ defmodule Pleroma.Web.Router do
|
||||||
get("/announcements/:id", AnnouncementController, :show)
|
get("/announcements/:id", AnnouncementController, :show)
|
||||||
patch("/announcements/:id", AnnouncementController, :change)
|
patch("/announcements/:id", AnnouncementController, :change)
|
||||||
delete("/announcements/:id", AnnouncementController, :delete)
|
delete("/announcements/:id", AnnouncementController, :delete)
|
||||||
|
|
||||||
get("/webhooks", WebhookController, :index)
|
|
||||||
get("/webhooks/:id", WebhookController, :show)
|
|
||||||
post("/webhooks", WebhookController, :create)
|
|
||||||
patch("/webhooks/:id", WebhookController, :update)
|
|
||||||
delete("/webhooks/:id", WebhookController, :delete)
|
|
||||||
post("/webhooks/:id/enable", WebhookController, :enable)
|
|
||||||
post("/webhooks/:id/disable", WebhookController, :disable)
|
|
||||||
post("/webhooks/:id/rotate_secret", WebhookController, :rotate_secret)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
# AdminAPI: admins and mods (staff) can perform these actions (if privileged by role)
|
# AdminAPI: admins and mods (staff) can perform these actions (if privileged by role)
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
# SPDX-License-Identifier: AGPL-3.0-only
|
# SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
defmodule Pleroma.Web.AdminAPI.WebhookControllerTest do
|
defmodule Pleroma.Web.AdminAPI.WebhookControllerTest do
|
||||||
use Pleroma.Web.ConnCase, async: true
|
use Pleroma.Web.ConnCase, async: false
|
||||||
|
|
||||||
import Pleroma.Factory
|
import Pleroma.Factory
|
||||||
|
|
||||||
|
|
@ -33,6 +33,19 @@ defmodule Pleroma.Web.AdminAPI.WebhookControllerTest do
|
||||||
|
|
||||||
assert length(response) == 2
|
assert length(response) == 2
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "requires an admin even if a moderator can manage announcements" do
|
||||||
|
clear_config([:instance, :moderator_privileges], [:announcements_manage_announcements])
|
||||||
|
|
||||||
|
moderator = insert(:user, is_moderator: true)
|
||||||
|
token = insert(:oauth_admin_token, user: moderator)
|
||||||
|
|
||||||
|
build_conn()
|
||||||
|
|> assign(:user, moderator)
|
||||||
|
|> assign(:token, token)
|
||||||
|
|> get("/api/pleroma/admin/webhooks")
|
||||||
|
|> json_response(:forbidden)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "POST /api/pleroma/admin/webhooks" do
|
describe "POST /api/pleroma/admin/webhooks" do
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue