Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
91724d16
Commit
91724d16
authored
Dec 25, 2018
by
lain
Browse files
Reserve a few user names
These are all names that are used for domain.com/:route routes or projected to be.
parent
922abcda
Pipeline
#5723
passed with stages
in 8 minutes and 21 seconds
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
config/config.exs
View file @
91724d16
...
...
@@ -220,6 +220,35 @@
credentials:
true
,
headers:
[
"Authorization"
,
"Content-Type"
,
"Idempotency-Key"
]
config
:pleroma
,
Pleroma
.
User
,
restricted_nicknames:
[
"main"
,
"users"
,
"settings"
,
"objects"
,
"activities"
,
"web"
,
"registration"
,
"friend-requests"
,
"pleroma"
,
"api"
,
"tag"
,
"notice"
,
"status"
,
"user-search"
,
"ostatus_subscribe"
,
"oauth"
,
"push"
,
"relay"
,
"inbox"
,
".well-known"
,
"nodeinfo"
,
"auth"
,
"proxy"
,
"dev"
,
"internal"
]
# Import environment specific config. This must remain at the bottom
# of this file so it overrides the configuration defined above.
import_config
"
#{
Mix
.
env
()
}
.exs"
lib/pleroma/user.ex
View file @
91724d16
...
...
@@ -197,6 +197,7 @@ def register_changeset(struct, params \\ %{}, opts \\ []) do
|>
validate_confirmation
(
:password
)
|>
unique_constraint
(
:email
)
|>
unique_constraint
(
:nickname
)
|>
validate_exclusion
(
:nickname
,
Pleroma
.
Config
.
get
([
Pleroma
.
User
,
:restricted_nicknames
]))
|>
validate_format
(
:nickname
,
local_nickname_regex
())
|>
validate_format
(
:email
,
@email_regex
)
|>
validate_length
(
:bio
,
max:
1000
)
...
...
test/user_test.exs
View file @
91724d16
...
...
@@ -153,6 +153,20 @@ test "it requires an email, name, nickname and password, bio is optional" do
end
)
end
test
"it restricts certain nicknames"
do
[
restricted_name
|
_
]
=
Pleroma
.
Config
.
get
([
Pleroma
.
User
,
:restricted_nicknames
])
assert
is_bitstring
(
restricted_name
)
params
=
@full_user_data
|>
Map
.
put
(
:nickname
,
restricted_name
)
changeset
=
User
.
register_changeset
(%
User
{},
params
)
refute
changeset
.
valid?
end
test
"it sets the password_hash, ap_id and following fields"
do
changeset
=
User
.
register_changeset
(%
User
{},
@full_user_data
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment