Skip to content
Snippets Groups Projects
Commit 6a4130cb authored by Josh Brooks's avatar Josh Brooks
Browse files

Clean up MR

parent b10fcc52
No related branches found
No related tags found
4 merge requests!50Revert "update deps",!48Release,!42Add username field to users table for raw username,!41Xx 3692/banned users
...@@ -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)
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment