hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2024-12-27 07:28:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ignore invalid room IDs in allow rules

Browse source
This commit is contained in:
Neil Alexander 2021-11-10 12:34:05 +00:00
parent e9bee83b03
commit 3ba7291598
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
federationapi/routing/join.go
View file

@ -225,7 +225,9 @@ func attemptMakeJoinForRestrictedMembership(
for _, allowed := range joinRules.Allow { for _, allowed := range joinRules.Allow {
// Skip types that we don't know about. // Skip types that we don't know about.
if allowed.Type != gomatrixserverlib.MRoomMembership { if allowed.Type != gomatrixserverlib.MRoomMembership {
logger.Infof("Skipping unknown join rule type %q", allowed.Type) continue
}
if _, _, err := gomatrixserverlib.SplitID('!', allowed.RoomID); err != nil {
continue continue
} }
@ -240,7 +242,7 @@ func attemptMakeJoinForRestrictedMembership(
continue continue
} }
logrus.Info("Inspecting room", allowed.RoomID) logrus.Info("Inspecting room ", allowed.RoomID)
// Now have a look and see if any of the joined users match the // Now have a look and see if any of the joined users match the
// user who has initiated this join. // user who has initiated this join.