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

Directly access namespace map instead of searching for key

Browse source
This commit is contained in:
Andrew Morgan 2018-06-08 15:02:05 +01:00
parent 1aa6a9d33a
commit 63ec8a4884
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/github.com/matrix-org/dendrite/clientapi/routing/directory.go
View file

@ -116,14 +116,12 @@ func SetLocalAlias(
// Check that the alias does not fall within an exclusive namespace of an // Check that the alias does not fall within an exclusive namespace of an
// application service // application service
for _, appservice := range cfg.Derived.ApplicationServices { for _, appservice := range cfg.Derived.ApplicationServices {
for key, namespaceMaps := range appservice.NamespaceMap { if userNamespaces, ok := appservice.NamespaceMap["users"]; ok {
if key == "aliases" { for _, namespace := range userNamespaces {
for _, namespace := range namespaceMaps { if namespace.Exclusive && namespace.RegexpObject.MatchString(alias) {
if namespace.Exclusive && namespace.RegexpObject.MatchString(alias) { return util.JSONResponse{
return util.JSONResponse{ Code: http.StatusBadRequest,
Code: http.StatusBadRequest, JSON: jsonerror.ASExclusive("Alias is reserved by an application service"),
JSON: jsonerror.ASExclusive("Alias is reserved by an application service"),
}
} }
} }
} }