Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Console user/login fixes #978

Merged
merged 4 commits into from
Jan 25, 2023
Merged

Console user/login fixes #978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
69a7940
Make both email and username lower case.
ftkg Jan 23, 2023
ba25ec2
Update minimum character length.
ftkg Jan 23, 2023
76b49ea
Obfuscate login response time.
ftkg Jan 23, 2023
8a8e12f
Minor formatting changes.
zyro Jan 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions server/console_authenticate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,9 @@ func (s *ConsoleServer) lookupConsoleUser(ctx context.Context, unameOrEmail, pas
}
err = status.Error(codes.Unauthenticated, "Invalid credentials.")
}
// Call hash function to help obfuscate response time when user does not exist.
var dummyHash = []byte("$2y$10$x8B0hPVxYGDq7bZiYC9jcuwA0B9m4J6vYITYIv0nf.IfYuM1kGI3W")
_ = bcrypt.CompareHashAndPassword(dummyHash, []byte(password))
return
}

Expand Down
9 changes: 6 additions & 3 deletions server/console_user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@ import (
"database/sql"
"encoding/json"
"errors"
"github.com/jackc/pgconn"
"net/http"
"regexp"
"strings"
"unicode"

"github.com/gofrs/uuid"
"github.com/heroiclabs/nakama/v3/console"
"github.com/jackc/pgconn"
"go.uber.org/zap"
"golang.org/x/crypto/bcrypt"
"google.golang.org/grpc/codes"
Expand All @@ -43,6 +44,7 @@ func (s *ConsoleServer) AddUser(ctx context.Context, in *console.AddUserRequest)
} else if len(in.Username) < 3 || len(in.Username) > 20 || !usernameRegex.MatchString(in.Username) {
return nil, status.Error(codes.InvalidArgument, "Username must be 3-20 long sequence of alphanumeric characters _ or . and cannot start and end with _ or .")
}
in.Username = strings.ToLower(in.Username)

if in.Username == "admin" || in.Username == s.config.GetConsole().Username {
return nil, status.Error(codes.InvalidArgument, "Username cannot be the console configured username")
Expand All @@ -53,11 +55,12 @@ func (s *ConsoleServer) AddUser(ctx context.Context, in *console.AddUserRequest)
} else if len(in.Email) < 3 || len(in.Email) > 254 || !emailRegex.MatchString(in.Email) || invalidCharsRegex.MatchString(in.Email) {
return nil, status.Error(codes.InvalidArgument, "Not a valid email address")
}
in.Email = strings.ToLower(in.Email)

if in.Password == "" {
return nil, status.Error(codes.InvalidArgument, "Password is required")
} else if !isValidPassword(in.Password) {
return nil, status.Error(codes.InvalidArgument, "Password must be at least 6 characters long and contain 1 number and 1 upper case character")
return nil, status.Error(codes.InvalidArgument, "Password must be at least 8 characters long and contain 1 number and 1 upper case character")
}

inviterUsername := ctx.Value(ctxConsoleUsernameKey{}).(string)
Expand Down Expand Up @@ -168,7 +171,7 @@ func (s *ConsoleServer) dbDeleteConsoleUser(ctx context.Context, username string
}

func isValidPassword(pwd string) bool {
if len(pwd) < 6 {
if len(pwd) < 8 {
return false
}
var number bool
Expand Down