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

Two-step unmarshalling in federation API too

Browse source
This commit is contained in:
Neil Alexander 2021-11-11 16:01:36 +00:00
parent 9ad0a85df9
commit f0c169b2a2
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
federationapi/routing/join.go
View file

@ -144,9 +144,11 @@ func MakeJoin(
provider := gomatrixserverlib.NewAuthEvents(stateEvents) provider := gomatrixserverlib.NewAuthEvents(stateEvents)
// Check the join rules. If it's a restricted join then there are special rules. // Check the join rules. If it's a restricted join then there are special rules.
joinRules := gomatrixserverlib.JoinRuleContent{ // We have to do this in two steps in order to satisfy the Complement tests. The
JoinRule: gomatrixserverlib.Public, // Default join rule if not specified. // first is to get the join rule itself, and the second is to unmarshal the 'allow'
} // key. The tests deliberately set the 'allow' key to some nonsense values, but if
// we try to unmarshal that all in one go, the entire unmarshalling step fails,
// incorrectly leaving the room as the default join rule of 'public'.
joinRuleEvent, err := provider.JoinRules() joinRuleEvent, err := provider.JoinRules()
if err != nil { if err != nil {
return util.JSONResponse{ return util.JSONResponse{
@ -154,23 +156,34 @@ func MakeJoin(
JSON: jsonerror.NotFound("Failed to retrieve join rules"), JSON: jsonerror.NotFound("Failed to retrieve join rules"),
} }
} }
joinRule := struct {
JoinRule string `json:"join_rule"`
}{
JoinRule: gomatrixserverlib.Public, // Default join rule if not specified.
}
if joinRuleEvent != nil { if joinRuleEvent != nil {
if err = json.Unmarshal(joinRuleEvent.Content(), &joinRules); err != nil { if err = json.Unmarshal(joinRuleEvent.Content(), &joinRule); err != nil {
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusBadRequest, Code: http.StatusBadRequest,
JSON: jsonerror.Unknown("Failed to unmarshal room join rules"), JSON: jsonerror.Unknown("Failed to unmarshal room join rule"),
} }
} }
} }
var joinRuleAllow struct {
Allow []gomatrixserverlib.JoinRuleContentAllowRule `json:"allow"`
}
_ = json.Unmarshal(joinRuleEvent.Content(), &joinRuleAllow)
if err = gomatrixserverlib.Allowed(event.Event, &provider); err != nil { if err = gomatrixserverlib.Allowed(event.Event, &provider); err != nil {
if joinRules.JoinRule == gomatrixserverlib.Restricted { if joinRule.JoinRule == gomatrixserverlib.Restricted {
res := attemptMakeJoinForRestrictedMembership( res := attemptMakeJoinForRestrictedMembership(
httpReq, cfg, rsAPI, &verRes, httpReq, cfg, rsAPI, &verRes, provider, &builder,
provider, &builder, joinRules, userID, gomatrixserverlib.JoinRuleContent{
JoinRule: joinRule.JoinRule,
Allow: joinRuleAllow.Allow,
},
userID,
) )
j, _ := json.Marshal(res)
logrus.Info("restricted make_join response:", string(j))
return res return res
} }
return util.JSONResponse{ return util.JSONResponse{