hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-04-24 04:33:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tweak requirement checking for send join

Browse source
This commit is contained in:
Neil Alexander 2021-11-15 14:05:52 +00:00
parent 61e14ba3e7
commit 2890218c4b
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
federationapi/routing/join.go
View file

@ -530,10 +530,10 @@ func SendJoin(
} }
} }
if joinRule.JoinRule == gomatrixserverlib.Restricted { if joinRule.JoinRule == gomatrixserverlib.Restricted {
if ev, err := verifyRestrictedMembershipForSendJoin( if signedEvent, err := verifyRestrictedMembershipForSendJoin(
httpReq.Context(), cfg, rsAPI, provider, event, joinRule, httpReq.Context(), cfg, rsAPI, provider, event, joinRule,
); err == nil { ); err == nil {
event = ev event = signedEvent
} else { } else {
logrus.WithError(err).Error("Failed to verify restricted join") logrus.WithError(err).Error("Failed to verify restricted join")
return util.JSONResponse{ return util.JSONResponse{
@ -603,6 +603,13 @@ func verifyRestrictedMembershipForSendJoin(
return nil, fmt.Errorf("json.Unmarshal(memberContent): %w", err) return nil, fmt.Errorf("json.Unmarshal(memberContent): %w", err)
} }
// If there's no `join_authorised_via_users_server` key then there's
// nothing else to do. Return the original event and it'll either
// succeed for some other reason or it will fail auth.
if memberContent.AuthorisedVia == "" {
return event, nil
}
// As a last effort, see if any of the restricted join rules match. // As a last effort, see if any of the restricted join rules match.
// If so, we might be able to modify and sign the event so that it // If so, we might be able to modify and sign the event so that it
// does pass auth. // does pass auth.
@ -649,9 +656,7 @@ func verifyRestrictedMembershipForSendJoin(
continue continue
} }
// Now look through all of the join events of the other members. Our goal // Now look through all of the join events of the nominated user.
// 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.
for _, member := range queryRes.JoinEvents { for _, member := range queryRes.JoinEvents {
// Check if the user is the selected user from the join event. // Check if the user is the selected user from the join event.
if *member.StateKey != memberContent.AuthorisedVia { if *member.StateKey != memberContent.AuthorisedVia {
@ -669,7 +674,7 @@ func verifyRestrictedMembershipForSendJoin(
} }
} }
return event, nil return nil, fmt.Errorf("the required memberships were not satisfied")
} }
type eventsByDepth []*gomatrixserverlib.HeaderedEvent type eventsByDepth []*gomatrixserverlib.HeaderedEvent