Browse Source

Add configurable account field name length limit

tags/v1.1.4
Egor Kislitsyn 4 years ago
parent
commit
2c35d4b0b0
4 changed files with 10 additions and 4 deletions
  1. +1
    -0
      config/config.exs
  2. +1
    -0
      docs/config.md
  3. +2
    -1
      lib/pleroma/user/info.ex
  4. +6
    -3
      test/web/mastodon_api/mastodon_api_controller/update_credentials_test.exs

+ 1
- 0
config/config.exs View File

@@ -256,6 +256,7 @@ config :pleroma, :instance,
user_bio_length: 5000,
user_name_length: 100,
max_account_fields: 4,
account_field_name_length: 255,
account_field_value_length: 255,
external_user_synchronization: true



+ 1
- 0
docs/config.md View File

@@ -133,6 +133,7 @@ config :pleroma, Pleroma.Emails.Mailer,
* `limit_to_local_content`: Limit unauthenticated users to search for local statutes and users only. Possible values: `:unauthenticated`, `:all` and `false`. The default is `:unauthenticated`.
* `dynamic_configuration`: Allow transferring configuration to DB with the subsequent customization from Admin api.
* `max_account_fields`: The maximum number of custom fields in the user profile (default: `4`)
* `account_field_name_length`: An account field name maximum length (default: `255`)
* `account_field_value_length`: An account field value maximum length (default: `255`)
* `external_user_synchronization`: Enabling following/followers counters synchronization for external users.



+ 2
- 1
lib/pleroma/user/info.ex View File

@@ -308,11 +308,12 @@ defmodule Pleroma.User.Info do
end

defp valid_field?(%{"name" => name, "value" => value}) do
name_limit = Pleroma.Config.get([:instance, :account_field_name_length], 255)
value_limit = Pleroma.Config.get([:instance, :account_field_value_length], 255)

is_binary(name) &&
is_binary(value) &&
String.length(name) <= 255 &&
String.length(name) <= name_limit &&
String.length(value) <= value_limit
end



+ 6
- 3
test/web/mastodon_api/mastodon_api_controller/update_credentials_test.exs View File

@@ -325,11 +325,12 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController.UpdateCredentialsTest do
%{"name" => "link", "value" => "cofe.io"}
]

name_limit = Pleroma.Config.get([:instance, :account_field_name_length])
value_limit = Pleroma.Config.get([:instance, :account_field_value_length])

long_str = Enum.map(0..value_limit, fn _ -> "x" end) |> Enum.join()
long_value = Enum.map(0..value_limit, fn _ -> "x" end) |> Enum.join()

fields = [%{"name" => "<b>foo<b>", "value" => long_str}]
fields = [%{"name" => "<b>foo<b>", "value" => long_value}]

assert %{"error" => "Invalid request"} ==
conn
@@ -337,7 +338,9 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController.UpdateCredentialsTest do
|> patch("/api/v1/accounts/update_credentials", %{"fields" => fields})
|> json_response(403)

fields = [%{"name" => long_str, "value" => "bar"}]
long_name = Enum.map(0..name_limit, fn _ -> "x" end) |> Enum.join()

fields = [%{"name" => long_name, "value" => "bar"}]

assert %{"error" => "Invalid request"} ==
conn


Loading…
Cancel
Save