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

More logging

Browse source
This commit is contained in:
Neil Alexander 2021-11-09 15:03:35 +00:00
parent 20e96f5332
commit f3e83c1a07
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clientapi/routing/joinroom.go
View file

@ -102,10 +102,6 @@ func JoinRoomByIDOrAlias(
JSON: jsonerror.Unknown("The room join will continue in the background."), JSON: jsonerror.Unknown("The room join will continue in the background."),
} }
case result := <-done: case result := <-done:
if !result.Is2xx() {
// The only error code in the spec for CS /join is 403.
result.Code = http.StatusForbidden
}
return result return result
} }
} }

8
federationapi/routing/join.go
View file

@ -235,6 +235,8 @@ func attemptMakeJoinForRestrictedMembership(
continue continue
} }
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.
found := false found := false
@ -251,6 +253,8 @@ func attemptMakeJoinForRestrictedMembership(
continue continue
} }
logrus.Info("Found user", userID, "in room")
// Now look through all of the join events of the other members. Our goal // Now look through all of the join events of the other members. Our goal
// is to try and find a user from our own server that has a suitable power // is to try and find a user from our own server that has a suitable power
// level to popuate into the `join_authorised_via_users_server` field. // level to popuate into the `join_authorised_via_users_server` field.
@ -266,6 +270,8 @@ func attemptMakeJoinForRestrictedMembership(
continue continue
} }
logrus.Info("Found possibly authorising member", *member.StateKey)
// We have a user who is joined to the room, so we can authorise joins. // We have a user who is joined to the room, so we can authorise joins.
// We will only be able to "grant" joins if any of our users have the // We will only be able to "grant" joins if any of our users have the
// power to invite other users — this flag helps us to return the right // power to invite other users — this flag helps us to return the right
@ -275,6 +281,8 @@ func attemptMakeJoinForRestrictedMembership(
// If the user has the ability to invite to the room then they are a // If the user has the ability to invite to the room then they are a
// suitable candidate for the `join_authorised_via_users_server`. // suitable candidate for the `join_authorised_via_users_server`.
if powerLevels.UserLevel(*member.StateKey) >= powerLevels.Invite { if powerLevels.UserLevel(*member.StateKey) >= powerLevels.Invite {
logrus.Info("Found member", *member.StateKey, "with sufficient invite power")
// We'll set the event content again, this time including the // We'll set the event content again, this time including the
// `join_authorised_via_users_server` field for the chosen user. // `join_authorised_via_users_server` field for the chosen user.
err := builder.SetContent(map[string]interface{}{ err := builder.SetContent(map[string]interface{}{