hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make checking blacklisted domains and restricted nicknames case-insenstive

Browse source
This commit is contained in:
Sean King 2022-07-05 20:36:47 -06:00
commit 0d4aceb9b0
No known key found for this signature in database
GPG key ID: 510C52BACD6E7257
2 changed files with 38 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/pleroma/user.ex
View file

@ -758,13 +758,26 @@ defmodule Pleroma.User do
valid? =
Config.get([User, :email_blacklist])
|> Enum.all?(fn blacklisted_domain ->
!String.ends_with?(email, ["@" <> blacklisted_domain, "." <> blacklisted_domain])
blacklisted_domain_downcase = String.downcase(blacklisted_domain)
!String.ends_with?(String.downcase(email), [
"@" <> blacklisted_domain_downcase,
"." <> blacklisted_domain_downcase
])
end)
if valid?, do: [], else: [email: "Invalid email"]
end)
|> unique_constraint(:nickname)
|> validate_exclusion(:nickname, Config.get([User, :restricted_nicknames]))
|> validate_change(:nickname, fn :nickname, nickname ->
valid? =
Config.get([User, :restricted_nicknames])
|> Enum.all?(fn restricted_nickname ->
String.downcase(nickname) != String.downcase(restricted_nickname)
end)
if valid?, do: [], else: [nickname: "Invalid nickname"]
end)
|> validate_format(:nickname, local_nickname_regex())
|> validate_length(:bio, max: bio_limit)
|> validate_length(:name, min: 1, max: name_limit)