Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
user-discovery-bot
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
archives
user-discovery-bot
Commits
6a4130cb
Commit
6a4130cb
authored
Jan 17, 2022
by
Josh Brooks
Browse files
Options
Downloads
Patches
Plain Diff
Clean up MR
parent
b10fcc52
No related branches found
No related tags found
4 merge requests
!50
Revert "update deps"
,
!48
Release
,
!42
Add username field to users table for raw username
,
!41
Xx 3692/banned users
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
io/userRegistration.go
+6
-16
6 additions, 16 deletions
io/userRegistration.go
with
6 additions
and
16 deletions
io/userRegistration.go
+
6
−
16
View file @
6a4130cb
...
@@ -41,26 +41,16 @@ func registerUser(msg *pb.UDBUserRegistration, permPublicKey *rsa.PublicKey,
...
@@ -41,26 +41,16 @@ func registerUser(msg *pb.UDBUserRegistration, permPublicKey *rsa.PublicKey,
"Please try again"
)
"Please try again"
)
}
}
// Check if username is
taken
// Check if
the
username is
banned
err
=
store
.
CheckUser
(
username
,
uid
)
if
bannedManager
.
IsBanned
(
username
)
{
if
err
!=
nil
{
// Return same error message as if the user was already taken
return
&
messages
.
Ack
{},
errors
.
Errorf
(
"Username %s is already taken. "
+
return
&
messages
.
Ack
{},
errors
.
Errorf
(
"Username %s is already taken. "
+
"Please try again"
,
username
)
"Please try again"
,
username
)
}
}
// todo: consider flattening a username
// Check if username is taken
// such that for username "admin" which we want banned,
err
=
store
.
CheckUser
(
username
,
uid
)
// these usernames are also banned: ADMIN, AdMiN, Ádmíñ
if
err
!=
nil
{
// flattenedUsername := flatten(username)
// if store.IsBanned(flattenedUsername) {
// // Return same error message as if the user was already taken
// return &messages.Ack{}, errors.Errorf("Username %s is already taken. "+
// "Please try again", username)
// }
// Check if the username is banned
if
bannedManager
.
IsBanned
(
username
)
{
// Return same error message as if the user was already taken
return
&
messages
.
Ack
{},
errors
.
Errorf
(
"Username %s is already taken. "
+
return
&
messages
.
Ack
{},
errors
.
Errorf
(
"Username %s is already taken. "
+
"Please try again"
,
username
)
"Please try again"
,
username
)
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment