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

Fix #661 appservice can't set aliases in its namespace

Browse source 
Signed-off-by: Alex Chen <minecnly@gmail.com>
This commit is contained in:
Cnly 2019-07-09 01:47:16 +08:00
parent da0dd06475
commit 9a989686e5
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
clientapi/routing/directory.go
View file

@ -117,12 +117,14 @@ func SetLocalAlias(
// 1. The new method for checking for things matching an AS's namespace // 1. The new method for checking for things matching an AS's namespace
// 2. Using an overall Regex object for all AS's just like we did for usernames // 2. Using an overall Regex object for all AS's just like we did for usernames
for _, appservice := range cfg.Derived.ApplicationServices { for _, appservice := range cfg.Derived.ApplicationServices {
if aliasNamespaces, ok := appservice.NamespaceMap["aliases"]; ok { if device.UserID != appservice.SenderLocalpart {
for _, namespace := range aliasNamespaces { if aliasNamespaces, ok := appservice.NamespaceMap["aliases"]; ok {
if namespace.Exclusive && namespace.RegexpObject.MatchString(alias) { for _, namespace := range aliasNamespaces {
return util.JSONResponse{ if namespace.Exclusive && namespace.RegexpObject.MatchString(alias) {
Code: http.StatusBadRequest, return util.JSONResponse{
JSON: jsonerror.ASExclusive("Alias is reserved by an application service"), Code: http.StatusBadRequest,
JSON: jsonerror.ASExclusive("Alias is reserved by an application service"),
}
} }
} }
} }