diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-12-14 21:44:10 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-12-14 21:44:10 +0300 |
| commit | 67cb46e15dd5fa16da257a9b0e5166266d10c694 (patch) | |
| tree | 6801ecba06ea3aac7086c57834e1413e5bb0c84a /config | |
| parent | 2b821036c4bd84cee51c9fcace5a4b3764c3bba1 (diff) | |
| parent | 8efacfed677ea2f06ac228294faec77a38060976 (diff) | |
| download | pleroma-67cb46e15dd5fa16da257a9b0e5166266d10c694.tar.gz pleroma-67cb46e15dd5fa16da257a9b0e5166266d10c694.zip | |
Merge branch 'develop' into issue/1383
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 11 | ||||
| -rw-r--r-- | config/description.exs | 9 | ||||
| -rw-r--r-- | config/test.exs | 2 |
3 files changed, 17 insertions, 5 deletions
diff --git a/config/config.exs b/config/config.exs index bca1f78ac..a737c98af 100644 --- a/config/config.exs +++ b/config/config.exs @@ -52,9 +52,9 @@ config :pleroma, Pleroma.Repo, migration_lock: nil config :pleroma, Pleroma.Captcha, - enabled: false, + enabled: true, seconds_valid: 60, - method: Pleroma.Captcha.Kocaptcha + method: Pleroma.Captcha.Native config :pleroma, :hackney_pools, federation: [ @@ -70,8 +70,6 @@ config :pleroma, :hackney_pools, timeout: 300_000 ] -config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch" - # Upload configuration config :pleroma, Pleroma.Upload, uploader: Pleroma.Uploaders.Local, @@ -555,7 +553,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 6b89d7c67..94187864c 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: diff --git a/config/test.exs b/config/test.exs index fff709d65..c204bf37f 100644 --- a/config/test.exs +++ b/config/test.exs @@ -91,6 +91,8 @@ config :joken, default_signer: "yU8uHKq+yyAkZ11Hx//jcdacWc8yQ1bxAAGrplzB0Zwwjkp3 config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock +config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch" + if File.exists?("./config/test.secret.exs") do import_config "test.secret.exs" else |