lovely-projects/mautrix-signal
lovely-projects/mautrix-signal
1
0
Fork 0
mirror of https://github.com/mautrix/signal.git synced 2025-03-14 14:15:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix locking in ACI found handler

Browse source
This commit is contained in:
Tulir Asokan 2024-03-25 21:27:48 +02:00
parent 14a6adc5a2
commit 120eca6dc0
2 changed files with 29 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
portal.go
View file

@ -2460,6 +2460,19 @@ func (portal *Portal) Delete() {
portal.log.Err(err).Msg("Failed to delete portal from db")
}
portal.bridge.portalsLock.Lock()
portal.unlockedDeleteCache()
portal.bridge.portalsLock.Unlock()
}
func (portal *Portal) unlockedDelete() {
err := portal.Portal.Delete(context.TODO())
if err != nil {
portal.log.Err(err).Msg("Failed to delete portal from db")
}
portal.unlockedDeleteCache()
}
func (portal *Portal) unlockedDeleteCache() {
delete(portal.bridge.portalsByID, portal.PortalKey)
if len(portal.MXID) > 0 {
delete(portal.bridge.portalsByMXID, portal.MXID)
@ -2476,7 +2489,6 @@ func (portal *Portal) Delete() {
user.RemoveInSpaceCache(portal.PortalKey)
}
}
portal.bridge.portalsLock.Unlock()
}
func (portal *Portal) Cleanup(ctx context.Context, puppetsOnly bool) {

27
user.go
View file

@ -766,6 +766,9 @@ func (user *User) handleACIFound(evt *events.ACIFound) {
Stringer("pni", evt.PNI.UUID).
Logger()
log.Debug().Msg("Handling ACI found event")
defer func() {
log.Debug().Msg("Finished handling ACI found event")
}()
ctx := log.WithContext(context.TODO())
user.bridge.portalsLock.Lock()
defer user.bridge.portalsLock.Unlock()
@ -781,7 +784,7 @@ func (user *User) handleACIFound(evt *events.ACIFound) {
defer pniPortal.roomCreateLock.Unlock()
if pniPortal.MXID == "" {
log.Info().Msg("PNI portal doesn't have Matrix room, deleting row")
pniPortal.Delete()
pniPortal.unlockedDelete()
return
}
log.UpdateContext(func(c zerolog.Context) zerolog.Context {
@ -805,7 +808,7 @@ func (user *User) handleACIFound(evt *events.ACIFound) {
defer aciPortal.roomCreateLock.Unlock()
if aciPortal.MXID == "" {
log.Info().Msg("ACI portal row exists, but doesn't have a Matrix room. Deleting ACI portal row and re-ID'ing PNI portal")
aciPortal.Delete()
aciPortal.unlockedDelete()
err := pniPortal.unlockedReID(ctx, evt.ACI.String())
if err != nil {
log.Err(err).Msg("Failed to re-ID PNI portal")
@ -817,15 +820,17 @@ func (user *User) handleACIFound(evt *events.ACIFound) {
return c.Stringer("aci_portal_mxid", aciPortal.MXID)
})
log.Info().Msg("Both ACI and PNI portal have Matrix room, tombstoning PNI portal")
_, err := pniPortal.MainIntent().SendStateEvent(ctx, pniPortal.MXID, event.StateTombstone, "", &event.TombstoneEventContent{
Body: fmt.Sprintf("This room has been merged"),
ReplacementRoom: aciPortal.MXID,
})
if err != nil {
log.Err(err).Msg("Failed to send tombstone to PNI portal")
}
pniPortal.Delete()
pniPortal.Cleanup(ctx, err == nil)
pniPortal.unlockedDelete()
go func() {
_, err := pniPortal.MainIntent().SendStateEvent(ctx, pniPortal.MXID, event.StateTombstone, "", &event.TombstoneEventContent{
Body: fmt.Sprintf("This room has been merged"),
ReplacementRoom: aciPortal.MXID,
})
if err != nil {
log.Err(err).Msg("Failed to send tombstone to PNI portal")
}
pniPortal.Cleanup(ctx, err == nil)
}()
}
}