diff options
| author | feld <feld@feld.me> | 2020-07-14 16:48:26 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-07-14 16:48:26 +0000 |
| commit | 2909dc873b1cf4b2fdfd310d2bb61104d31cea17 (patch) | |
| tree | df0f854766448cb0e286a2024f9a8ea90f33f7c3 /config | |
| parent | 246f49d6858973fbb8fd4d4d9c2e5be7f9ccb283 (diff) | |
| parent | 124b4709dcf12a417f5164e53ef3ba67e538d4c7 (diff) | |
| download | pleroma-2909dc873b1cf4b2fdfd310d2bb61104d31cea17.tar.gz pleroma-2909dc873b1cf4b2fdfd310d2bb61104d31cea17.zip | |
Merge branch '1940-admin-token-oauthless-auth' into 'develop'
[#1940] Reinstated OAuth-less `admin_token` authentication
Closes #1940
See merge request pleroma/pleroma!2760
Diffstat (limited to 'config')
| -rw-r--r-- | config/description.exs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/config/description.exs b/config/description.exs index 84dcdb87e..2b41e7dac 100644 --- a/config/description.exs +++ b/config/description.exs @@ -2008,13 +2008,15 @@ config :pleroma, :config_description, [ label: "Pleroma Admin Token", type: :group, description: - "Allows to set a token that can be used to authenticate with the admin api without using an actual user by giving it as the `admin_token` parameter", + "Allows setting a token that can be used to authenticate requests with admin privileges without a normal user account token. Append the `admin_token` parameter to requests to utilize it. (Please reconsider using HTTP Basic Auth or OAuth-based authentication if possible)", children: [ %{ key: :admin_token, type: :string, description: "Admin token", - suggestions: ["We recommend a secure random string or UUID"] + suggestions: [ + "Please use a high entropy string or UUID" + ] } ] }, |