diff options
| author | lain <lain@soykaf.club> | 2019-12-10 13:44:06 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-12-10 13:44:06 +0000 |
| commit | aac0187ec13078d2756db1671e644d6eb9c0947b (patch) | |
| tree | 1e0b4fa5d7ca5d12ac2d41ee5a077f669f64fb43 /config | |
| parent | 54b1b2c9c0c24165b5b32c352fa684eed28bfa93 (diff) | |
| parent | 1ae976ac51d5ad7c224fa4d1ddee0bbd007d6787 (diff) | |
| download | pleroma-aac0187ec13078d2756db1671e644d6eb9c0947b.tar.gz pleroma-aac0187ec13078d2756db1671e644d6eb9c0947b.zip | |
Merge branch '1427-oauth-admin-scopes' into 'develop'
[#1427] OAuth admin scopes
Closes #1427
See merge request pleroma/pleroma!2025
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 5 | ||||
| -rw-r--r-- | config/description.exs | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 4624bded2..6ed800056 100644 --- a/config/config.exs +++ b/config/config.exs @@ -563,7 +563,10 @@ config :ueberauth, base_path: "/oauth", providers: ueberauth_providers -config :pleroma, :auth, oauth_consumer_strategies: oauth_consumer_strategies +config :pleroma, + :auth, + enforce_oauth_admin_scope_usage: false, + oauth_consumer_strategies: oauth_consumer_strategies config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Sendmail, enabled: false diff --git a/config/description.exs b/config/description.exs index 70e963399..45e4b43f1 100644 --- a/config/description.exs +++ b/config/description.exs @@ -2095,6 +2095,15 @@ config :pleroma, :config_description, [ description: "Authentication / authorization settings", children: [ %{ + key: :enforce_oauth_admin_scope_usage, + type: :boolean, + description: + "OAuth admin scope requirement toggle. " <> + "If `true`, admin actions explicitly demand admin OAuth scope(s) presence in OAuth token " <> + "(client app must support admin scopes). If `false` and token doesn't have admin scope(s)," <> + "`is_admin` user flag grants access to admin-specific actions." + }, + %{ key: :auth_template, type: :string, description: |