diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-12-12 02:16:23 +0300 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-12-12 02:16:23 +0300 |
| commit | 3ecf131511afc1fc366be6402ca94cf0e6c30e11 (patch) | |
| tree | 0e8a59c43ccc344bb7d57c32826675aa706b7e8e /config | |
| parent | cc36a8ea906bd22884101632c6d62c9572e846e1 (diff) | |
| parent | fd697cf2090b61db60a02694c3227850df176e2d (diff) | |
| download | pleroma-3ecf131511afc1fc366be6402ca94cf0e6c30e11.tar.gz pleroma-3ecf131511afc1fc366be6402ca94cf0e6c30e11.zip | |
Merge branch 'develop' into feature/report-notes
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 6 | ||||
| -rw-r--r-- | config/description.exs | 9 |
2 files changed, 14 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index b60ffef7d..6ed800056 100644 --- a/config/config.exs +++ b/config/config.exs @@ -225,6 +225,7 @@ config :pleroma, :instance, notify_email: "noreply@example.com", description: "A Pleroma instance, an alternative fediverse server", limit: 5_000, + chat_limit: 5_000, remote_limit: 100_000, upload_limit: 16_000_000, avatar_upload_limit: 2_000_000, @@ -562,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: |