Unverified Commit ada6f942 authored by Fernando Takagi's avatar Fernando Takagi Committed by GitHub
Browse files

Console user and authentication improvements. (#978)

parent d1e894f3

server/console_authenticate.go

+3 −0
Original line number Diff line number Diff line
@@ -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

	}

server/console_user.go

+6 −3
Original line number Diff line number Diff line
@@ -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"
@@ -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")
@@ -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)
@@ -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