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

Don't remove all alt_alias when removing one alias

Browse source 
Signed-off-by: Colin Weill--Duflos <lieunoir@rezel.net>
This commit is contained in:
Colin Weill--Duflos 2021-07-29 13:38:53 +02:00
parent d002f274a7
commit 11d445cc2e
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
clientapi/routing/directory.go
View file

@ -223,7 +223,7 @@ func RemoveLocalAlias(
} }
} }
//if state contains alias // Check if state contains removed alias
stateTuple := gomatrixserverlib.StateKeyTuple{ stateTuple := gomatrixserverlib.StateKeyTuple{
EventType: gomatrixserverlib.MRoomCanonicalAlias, EventType: gomatrixserverlib.MRoomCanonicalAlias,
StateKey: "", StateKey: "",
@ -241,31 +241,39 @@ func RemoveLocalAlias(
} }
inAliases := false inAliases := false
newAlias := ""
newAltAliases := []string{""}
// We try to get the current canonical_alias state, and if found compare its content
// to the removed alias
if canonicalAliasEvent, ok := stateRes.StateEvents[stateTuple]; ok { if canonicalAliasEvent, ok := stateRes.StateEvents[stateTuple]; ok {
//var canonicalAliasContent *eventutil.CanonicalAlias
canonicalAliasContent := eventutil.CanonicalAlias { canonicalAliasContent := eventutil.CanonicalAlias {
Alias: "", Alias: "",
AltAliases: []string{""}, AltAliases: []string{""},
} }
err := json.Unmarshal(canonicalAliasEvent.Content(), &canonicalAliasContent) err := json.Unmarshal(canonicalAliasEvent.Content(), &canonicalAliasContent)
if err != nil { if err != nil {
util.GetLogger(req.Context()).WithError(err).Error("Get content failed") util.GetLogger(req.Context()).WithError(err).Error("Get canonical_alias event content failed")
resErr := jsonerror.InternalServerError() resErr := jsonerror.InternalServerError()
return resErr return resErr
} }
if alias == canonicalAliasContent.Alias { if alias == canonicalAliasContent.Alias {
inAliases = true inAliases = true
} else { } else {
for _, s := range(canonicalAliasContent.AltAliases) { newAlias = canonicalAliasContent.Alias
if alias == s { }
inAliases = true for _, s := range(canonicalAliasContent.AltAliases) {
break if alias == s {
} inAliases = true
} else {
newAltAliases = append(newAltAliases, s)
} }
} }
} }
// If the alias removed is one of the alt_aliases or the canonical one,
// we need to also remove it from the canonical_alias event
if inAliases { if inAliases {
var stateKey = "" var stateKey = ""
// We create a new canonical_alias event with the new alias and alt_aliase
// May cause some auth problems // May cause some auth problems
builder := gomatrixserverlib.EventBuilder { builder := gomatrixserverlib.EventBuilder {
Sender: device.UserID, Sender: device.UserID,
@ -273,10 +281,9 @@ func RemoveLocalAlias(
Type: gomatrixserverlib.MRoomCanonicalAlias, Type: gomatrixserverlib.MRoomCanonicalAlias,
StateKey: &stateKey, StateKey: &stateKey,
} }
//TODO reconstruct original minus removed
content := eventutil.CanonicalAlias { content := eventutil.CanonicalAlias {
Alias: "", Alias: newAlias,
AltAliases: make([]string, 0), AltAliases: newAltAliases,
} }
err := builder.SetContent(content) err := builder.SetContent(content)
if err != nil { if err != nil {
@ -293,11 +300,13 @@ func RemoveLocalAlias(
} }
} }
// Build the event
e, err := eventutil.QueryAndBuildEvent(req.Context(), &builder, cfg.Matrix, evTime, rsAPI, nil) e, err := eventutil.QueryAndBuildEvent(req.Context(), &builder, cfg.Matrix, evTime, rsAPI, nil)
if err != nil { if err != nil {
util.GetLogger(req.Context()).WithError(err).Errorf("failed to QueryAndBuildEvent") util.GetLogger(req.Context()).WithError(err).Errorf("failed to QueryAndBuildEvent")
return jsonerror.InternalServerError() return jsonerror.InternalServerError()
} }
// Send the event to the room server
err = roomserverAPI.SendEvents(req.Context(), rsAPI, roomserverAPI.KindNew, []*gomatrixserverlib.HeaderedEvent{e}, cfg.Matrix.ServerName, nil) err = roomserverAPI.SendEvents(req.Context(), rsAPI, roomserverAPI.KindNew, []*gomatrixserverlib.HeaderedEvent{e}, cfg.Matrix.ServerName, nil)
if err != nil { if err != nil {
util.GetLogger(req.Context()).WithError(err).Errorf("failed to SendEvents") util.GetLogger(req.Context()).WithError(err).Errorf("failed to SendEvents")