sigb.us/dendrite
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Fix #661 appservice can't set aliases in its own namespace (#731)

Browse source 
Fixes #661.
This commit is contained in:
Alex Chen 2019-07-12 21:36:17 +08:00 committed by GitHub
parent 7edf197ecc
commit f8463063ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
clientapi/routing/directory.go
View file

@ -117,12 +117,16 @@ 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 { // Don't prevent AS from creating aliases in its own namespace
for _, namespace := range aliasNamespaces { // Note that Dendrite uses SenderLocalpart as UserID for AS users
if namespace.Exclusive && namespace.RegexpObject.MatchString(alias) { if device.UserID != appservice.SenderLocalpart {
return util.JSONResponse{ if aliasNamespaces, ok := appservice.NamespaceMap["aliases"]; ok {
Code: http.StatusBadRequest, for _, namespace := range aliasNamespaces {
JSON: jsonerror.ASExclusive("Alias is reserved by an application service"), if namespace.Exclusive && namespace.RegexpObject.MatchString(alias) {
return util.JSONResponse{
Code: http.StatusBadRequest,
JSON: jsonerror.ASExclusive("Alias is reserved by an application service"),
}
} }
} }
} }