Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Thu, 16 Apr 2020 21:58:57 +0000 (21:58 +0000)
committerrinpatch <rinpatch@sdf.org>
Thu, 30 Apr 2020 21:58:40 +0000 (00:58 +0300)
commitda4923f2e59aac7f97812a756593602083f17626
treed1005de73b478574d129abeb29c90c87168bac5e
parent1ebf8db2a595c04da0e0ecbcd9c78b8833deecda
Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'

Enforcement of OAuth scopes check for authenticated API endpoints

See merge request pleroma/pleroma!2349
17 files changed:
lib/pleroma/plugs/auth_expected_plug.ex [new file with mode: 0644]
lib/pleroma/plugs/oauth_scopes_plug.ex
lib/pleroma/plugs/plug_helper.ex [new file with mode: 0644]
lib/pleroma/tests/oauth_test_controller.ex [new file with mode: 0644]
lib/pleroma/web/masto_fe_controller.ex
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
lib/pleroma/web/mastodon_api/controllers/suggestion_controller.ex
lib/pleroma/web/oauth/oauth_controller.ex
lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
lib/pleroma/web/router.ex
lib/pleroma/web/twitter_api/twitter_api_controller.ex
lib/pleroma/web/web.ex
test/plugs/oauth_scopes_plug_test.exs
test/web/auth/oauth_test_controller_test.exs [new file with mode: 0644]
test/web/mastodon_api/controllers/suggestion_controller_test.exs
test/web/pleroma_api/controllers/pleroma_api_controller_test.exs