mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-12 09:23:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:matrix-org/dendrite into erikj/disable_registartion

Browse source
This commit is contained in:
Erik Johnston 2017-12-04 09:59:23 +00:00
parent 431e1678d1 791a5ee7f4
commit 034f89b18e
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/github.com/matrix-org/dendrite/clientapi/routing/register.go
View file

@ -49,7 +49,7 @@ const (
var ( var (
// TODO: Remove old sessions. Need to do so on a session-specific timeout. // TODO: Remove old sessions. Need to do so on a session-specific timeout.
sessions = make(map[string][]authtypes.LoginType) // Sessions and completed flow stages sessions = make(map[string][]authtypes.LoginType) // Sessions and completed flow stages
validUsernameRegex = regexp.MustCompile(`^[0-9a-zA-Z_\-./]+$`) validUsernameRegex = regexp.MustCompile(`^[0-9a-z_\-./]+$`)
) )
// registerRequest represents the submitted registration request. // registerRequest represents the submitted registration request.
@ -183,6 +183,9 @@ func Register(
} }
} }
// Squash username to all lowercase letters
r.Username = strings.ToLower(r.Username)
if resErr = validateUserName(r.Username); resErr != nil { if resErr = validateUserName(r.Username); resErr != nil {
return *resErr return *resErr
} }
@ -328,6 +331,10 @@ func parseAndValidateLegacyLogin(req *http.Request, r *legacyRegisterRequest) *u
if resErr != nil { if resErr != nil {
return resErr return resErr
} }
// Squash username to all lowercase letters
r.Username = strings.ToLower(r.Username)
if resErr = validateUserName(r.Username); resErr != nil { if resErr = validateUserName(r.Username); resErr != nil {
return resErr return resErr
} }
@ -498,6 +505,9 @@ func RegisterAvailable(
) util.JSONResponse { ) util.JSONResponse {
username := req.URL.Query().Get("username") username := req.URL.Query().Get("username")
// Squash username to all lowercase letters
username = strings.ToLower(username)
if err := validateUserName(username); err != nil { if err := validateUserName(username); err != nil {
return *err return *err
} }