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

Do not check if a username is exclusive if the request is for an appservice in /register

Browse source
This commit is contained in:
Will Hunt 2020-12-17 14:24:22 +00:00
parent 9a1ef81fa2
commit b3ba38bd87
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
clientapi/routing/register.go
View file

@ -488,10 +488,16 @@ func Register(
return *resErr return *resErr
} }
// Extract access token here
accessToken, _ := auth.ExtractAccessToken(req)
// Make sure normal user isn't registering under an exclusive application // Make sure normal user isn't registering under an exclusive application
// service namespace. Skip this check if no app services are registered. // service namespace. Skip this check if no app services are registered.
// If an access token is provided, ignore this check this is an appservice
// request and we will validate in validateApplicationService
if r.Auth.Type != authtypes.LoginTypeApplicationService && if r.Auth.Type != authtypes.LoginTypeApplicationService &&
len(cfg.Derived.ApplicationServices) != 0 && len(cfg.Derived.ApplicationServices) != 0 &&
accessToken == "" &&
UsernameMatchesExclusiveNamespaces(cfg, r.Username) { UsernameMatchesExclusiveNamespaces(cfg, r.Username) {
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusBadRequest, Code: http.StatusBadRequest,